Fix button

perichus · Feb 16, 2016 · a8b7493 · a8b7493
1 parent 1e44274
commit a8b7493
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1,568 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "wire.css",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "homepage": "http://wirecss.com",
   "authors": [
     "Pedro Garcia <pedro@pedrogarcia.me> (http://pedrogarcia.me)"

diff --git a/dist/_wire.scss b/dist/_wire.scss
@@ -69,11 +69,11 @@ $wire-color-alt: #E0E0E0 !default;
 $wire-link-color: $wire-color-primary !default;
 $wire-link-color-hover: darken($wire-color-primary, 30%) !default;
 
-$wire-button-color: #FFF !default;
 $wire-button-bg: $wire-color-primary !default;
-$wire-button-border: "1px solid ${$wire-color-alt}" !default;
-$wire-button-alt-bg: darken($wire-color-primary, 30%) !default;
-$wire-button-alt-color: #FFF !default;
+$wire-button-color: #FFF !default;
+
+$wire-button-alt-bg: $wire-color-alt !default;
+$wire-button-alt-color: $wire-color-secundary !default;
 
 $wire-form-input-border: #E0E0E0 !default;
 $wire-form-input-bg: #FFF !default;
@@ -759,7 +759,7 @@ body {
 %button{
   color: $wire-button-color;
   background-color: $wire-button-bg;
-  border: $wire-button-border;
+  border: 0;
   border-radius: $wire-border-radius;
   line-height: inherit;
   display: inline-block;
@@ -768,7 +768,7 @@ body {
   padding: em(7, 10) em(14, 10);
   transition: background-color .2s ease-out;
   &:hover {
-    color: inherit;
+    color: #FFF;
     background-color: darken($wire-button-bg, 15%);
   }
   &.small {

diff --git a/dist/wire.css b/dist/wire.css
@@ -455,7 +455,7 @@ input[type="submit"],
 input[type="button"] {
   color: #FFF;
   background-color: #48A8CE;
-  border: "1px solid ${$wire-color-alt}";
+  border: 0;
   border-radius: 3px;
   line-height: inherit;
   display: inline-block;
@@ -470,7 +470,7 @@ input[type="button"] {
   .btn:hover,
   input[type="submit"]:hover,
   input[type="button"]:hover {
-    color: inherit;
+    color: #FFF;
     background-color: #2b7e9f; }
   .small.button,
   .small.btn,
@@ -491,13 +491,13 @@ input[type="button"] {
   .alt.btn,
   input.alt[type="submit"],
   input.alt[type="button"] {
-    color: #FFF;
-    background-color: #1a4e63; }
+    color: #7C7C7C;
+    background-color: #E0E0E0; }
     .alt.button:hover,
     .alt.btn:hover,
     input.alt[type="submit"]:hover,
     input.alt[type="button"]:hover {
-      background-color: #0a1e26; }
+      background-color: #bababa; }
 
 input[type="submit"][disabled],
 input[type="button"][disabled],
@@ -506,16 +506,16 @@ input[type="button"][disabled],
 .button.disabled,
 .btn.disabled {
   cursor: not-allowed;
-  color: white;
-  background-color: #206079; }
+  color: #8a8a8a;
+  background-color: #eeeeee; }
   input[type="submit"][disabled]:hover,
   input[type="button"][disabled]:hover,
   .button[disabled]:hover,
   .btn[disabled]:hover,
   .button.disabled:hover,
   .btn.disabled:hover {
-    color: white;
-    background-color: #206079; }
+    color: #8a8a8a;
+    background-color: #eeeeee; }
 
 .container {
   width: 100%;

diff --git a/dist/wire.min.css b/dist/wire.min.css
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "Wire.css",
   "name": "wire.css",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Simple and responsive flexbox based Sass Framework",
   "keywords": [
     "sass",

diff --git a/src/scss/_config.scss b/src/scss/_config.scss
@@ -56,11 +56,11 @@ $wire-color-alt: #E0E0E0 !default;
 $wire-link-color: $wire-color-primary !default;
 $wire-link-color-hover: darken($wire-color-primary, 30%) !default;
 
-$wire-button-color: #FFF !default;
 $wire-button-bg: $wire-color-primary !default;
-$wire-button-border: "1px solid ${$wire-color-alt}" !default;
-$wire-button-alt-bg: darken($wire-color-primary, 30%) !default;
-$wire-button-alt-color: #FFF !default;
+$wire-button-color: #FFF !default;
+
+$wire-button-alt-bg: $wire-color-alt !default;
+$wire-button-alt-color: $wire-color-secundary !default;
 
 $wire-form-input-border: #E0E0E0 !default;
 $wire-form-input-bg: #FFF !default;

diff --git a/src/scss/components/_buttons.scss b/src/scss/components/_buttons.scss
@@ -10,7 +10,7 @@
 %button{
   color: $wire-button-color;
   background-color: $wire-button-bg;
-  border: $wire-button-border;
+  border: 0;
   border-radius: $wire-border-radius;
   line-height: inherit;
   display: inline-block;
@@ -19,7 +19,7 @@
   padding: em(7, 10) em(14, 10);
   transition: background-color .2s ease-out;
   &:hover {
-    color: inherit;
+    color: #FFF;
     background-color: darken($wire-button-bg, 15%);
   }
   &.small {