Fix for proper syntax.

jonesiscoding · jonesiscoding · commit d2eaa35405f2 · 2022-06-08T15:44:31.000-05:00
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "css"
   ],
   "homepage": "https://www.github.com/deviscoding/buttons",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "authors": [
     {
       "name": "Aaron M Jones",
diff --git a/scss/_buttons-mixins.scss b/scss/_buttons-mixins.scss
@@ -62,12 +62,12 @@
   }
   &:hover {
     @if($background != $hover-background) { background-color: $hover-background; }
-    @if($hover-border != $border && $btn-border-width > 0) { border-color: $hover-border; }
+    @if($hover-border != $border and $btn-border-width > 0) { border-color: $hover-border; }
     color: $hover-color;
   }
   .active > &, &.active {
     @if($background != $active-background) { background-color: $active-background; }
-    @if($active-border != $border && $btn-border-width > 0) { border-color: $active-border; }
+    @if($active-border != $border and $btn-border-width > 0) { border-color: $active-border; }
     color: $active-color;
   }
   &:focus {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"css"`
`13`	`13`	`],`
`14`	`14`	`"homepage": "https://www.github.com/deviscoding/buttons",`
`15`		`- "version": "1.1.3",`
	`15`	`+ "version": "1.1.4",`
`16`	`16`	`"authors": [`
`17`	`17`	`{`
`18`	`18`	`"name": "Aaron M Jones",`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@`
`62`	`62`	`}`
`63`	`63`	`&:hover {`
`64`	`64`	`@if($background != $hover-background) { background-color: $hover-background; }`
`65`		`- @if($hover-border != $border && $btn-border-width > 0) { border-color: $hover-border; }`
	`65`	`+ @if($hover-border != $border and $btn-border-width > 0) { border-color: $hover-border; }`
`66`	`66`	`color: $hover-color;`
`67`	`67`	`}`
`68`	`68`	`.active > &, &.active {`
`69`	`69`	`@if($background != $active-background) { background-color: $active-background; }`
`70`		`- @if($active-border != $border && $btn-border-width > 0) { border-color: $active-border; }`
	`70`	`+ @if($active-border != $border and $btn-border-width > 0) { border-color: $active-border; }`
`71`	`71`	`color: $active-color;`
`72`	`72`	`}`
`73`	`73`	`&:focus {`