updating button tests

diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index b4e9e764feb324126fc3c4c46406031b62948fd7..6b6a0c6c3eea9677bb2c4531a65c5a97936835ed 100755 (executable)
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -197,7 +197,7 @@ table.button.secondary {
   table {
     td {
       background: $secondary-color;
-      color: $button-color-alt;
+      color: $button-color;
       border: 2px solid $secondary-color;
     }
 

diff --git a/scss/components/_media-query.scss b/scss/components/_media-query.scss
index 0a516366f0d18c3ff5c59745cf90056350413860..ecb0fe4bff9b4579368c943b35c46419853dc28d 100755 (executable)
--- a/scss/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@ -30,7 +30,8 @@
     box-sizing: border-box;
     padding-left: $global-gutter !important;
     padding-right: $global-gutter !important;
-
+    
+    // Nested columns won't double the padding
     .column,
     .columns {
       padding-left: 0 !important;
@@ -38,7 +39,7 @@
     }
   }
 
-  //If it's collapsed make it so.
+  // Collpased columns have no gutter.
   .collapse {
     table.body & .columns,
     table.body & .column {

diff --git a/testing/src/assets/scss/app.scss b/testing/src/assets/scss/app.scss
index 0120cf40654fd6c9bd30c8cfd2f466d26c88f92c..2f225265328d99b9f67acea69210572215431afa 100644 (file)
--- a/testing/src/assets/scss/app.scss
+++ b/testing/src/assets/scss/app.scss
@@ -89,12 +89,6 @@
     } 
   }
 
-  table.feature-list-image {
-    @media only screen and (max-width: #{$global-breakpoint}) {
-      display: none !important;
-    }
-  }
-
   .feature-list-item-info {
     font-size: 14px; 
     line-height: 21px; 

diff --git a/testing/src/pages/button-inky.html b/testing/src/pages/button-inky.html
index 3f665f62ee2b0fdf17d84a8354dc496f252c6eeb..ea4605ab7fbee45e0a307849151c1b50a01bd477 100644 (file)
--- a/testing/src/pages/button-inky.html
+++ b/testing/src/pages/button-inky.html
@@ -1,42 +1,59 @@
 <container>
   <row>
     <columns small="12" large="12">
-      <button class="large" href="http://zurb.com">I am a large button</button>
+      <button href="http://zurb.com" class="tiny" href="http://zurb.com">I am a tiny button</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button href="http://zurb.com">I am a button</button>
+      <button href="http://zurb.com" class="small" href="http://zurb.com">I am a small button</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button class="small" href="http://zurb.com">I am a small button</button>
+      <button href="http://zurb.com" class="" href="http://zurb.com">I am a default button</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button class="tiny" href="http://zurb.com">I am a tiny button</button>
+      <button href="http://zurb.com" class="large" href="http://zurb.com">I am a large button</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button class="secondary" href="http://zurb.com">I am secondary</button>
+      <button href="http://zurb.com" class="secondary" href="http://zurb.com">I am secondary</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button class="success" href="http://zurb.com">I am successful</button>
+      <button href="http://zurb.com" class="success" href="http://zurb.com">I am successful</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button class="alert" href="http://zurb.com">I alert</button>
+      <button href="http://zurb.com" class="alert" href="http://zurb.com">I alert</button>
     </columns>
   </row>
   <row>
     <columns small="12" large="12">
-      <button class="expand">I expand</button>
+      <button href="http://zurb.com" href="http://zurb.com" class="expand">Button</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button href="http://zurb.com" class="radius">I expand</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <button href="http://zurb.com" class="rounded">I am round</button>
+    </columns>
+  </row>
+  <row>
+    <columns small="12" large="12">
+      <center>
+        <button href="http://zurb.com" class="radius">I am centered</button>
+      </center>
     </columns>
   </row>
 </container>
\ No newline at end of file