Merge remote-tracking branch 'fork/issue-21-22'

yegor256 · May 14, 2015 · 95ab3ef · 95ab3ef
2 parents 4e593da + c43469e
commit 95ab3ef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -70,6 +70,14 @@ <h2>Forms</h2>
             <button type="reset">Reset</button>
           </fieldset>
         </form>
+        <h2>Buttons</h2>
+        <form action="#">
+          <p>
+            Default:
+          </p>
+          <button>Enabled</button>
+          <button disabled>Disabled</button>
+        </form>
         <h2>Tables</h2>
         <p>
           A simple table would look like this:

diff --git a/scss/_forms.scss b/scss/_forms.scss
@@ -38,9 +38,9 @@ label {
 input[type="submit"],
 input[type="reset"],
 button {
-  background: darken($gray, 10);
+  background: darken($white, 5);
   border-radius: .2 * $em;
-  color: $white;
+  color: darken($gray, 25);
   cursor: pointer;
   display: inline;
   margin-bottom: $em;
@@ -49,9 +49,15 @@ button {
   text-align: center;
 
   &:hover {
-    background: darken($gray, 15);
-    color: darken($white, 25);
+    background: darken($white, 15);
+    color: $black;
+  }
+
+  &[disabled] {
+    background: darken($white, 10);
+    color: darken($gray, 10);
   }
+
 }
 
 input[type="submit"],
@@ -63,6 +69,7 @@ button[type="submit"] {
     background: darken($blue, 15);
     color: darken($white, 25);
   }
+
 }
 
 input[type="text"],