From: RafiBomb <rafi@zurb.com>
Date: Tue, 8 Mar 2016 17:53:36 +0000 (-0800)
Subject: changes grid variable names and adds button variables
X-Git-Tag: v2.0.0-rc.4~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c886204a04ecafa8ab488fcb3b9950e5e166727;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

changes grid variable names and adds button variables
---

diff --git a/package.json b/package.json
index bab4c09e..17e3059a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "gulp-webserver": "^0.9.1",
     "handlebars": "^3.0.3",
     "highlight.js": "^8.7.0",
-    "inky": "^1.2.1",
+    "inky": "^1.2.2",
     "lazypipe": "^1.0.1",
     "marked": "^0.3.5",
     "media-query-extractor": "^0.1.1",
diff --git a/scss/_global.scss b/scss/_global.scss
index f7ba60b8..d6fc968b 100755
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -12,7 +12,7 @@ $primary-color: #2199e8 !default;
 
 /// Secondary color, used with components that support the `.secondary` class.
 /// @type Color
-$secondary-color: #777 !default;
+$secondary-color: #777777 !default;
 
 /// Color to indicate a positive status or action, used with the `.success` class.
 /// @type Color
@@ -80,7 +80,7 @@ $global-padding: 16px !default;
 
 /// Global margin. Margin requires a capital 'M' to workin Outlook.com
 /// @type Number
-$global-margin: 32px !default;
+$global-margin: 16px !default;
 
 /// Global raidus of radius-corners.
 /// @type Number
diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index d903b919..b4e9e764 100755
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -74,7 +74,7 @@ table.button {
   width: auto !important;
 
   table {
-    margin-bottom: $button-margin;
+    Margin-bottom: $button-margin;
 
     td {
       width: auto !important;
diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index 6112a07d..37ec36e9 100755
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -32,8 +32,7 @@ table {
   }
 
   &.container {
-    background: $container-background-color;
-
+    background: $container-background;
     width: $global-width;
     margin: 0 auto;
     text-align: inherit;
diff --git a/testing/src/assets/scss/_settings.scss b/testing/src/assets/scss/_settings.scss
index e99bda58..64565a85 100644
--- a/testing/src/assets/scss/_settings.scss
+++ b/testing/src/assets/scss/_settings.scss
@@ -17,7 +17,7 @@
 // ---------
 
 $primary-color: #2199e8;
-$secondary-color: #777;
+$secondary-color: #777777;
 $success-color: #3adb76;
 $warning-color: #ffae00;
 $alert-color: #ec5840;
@@ -30,7 +30,7 @@ $pre-color: #ff6908;
 $global-width: 580px;
 $global-width-small: 95%;
 $body-background: $light-gray;
-$container-background-color: $white;
+$container-background: $white;
 $global-font-color: $black;
 $body-font-family: Helvetica, Arial, sans-serif;
 $global-padding: 16px;
diff --git a/testing/src/assets/scss/app.scss b/testing/src/assets/scss/app.scss
index ae721c36..fe9a8672 100644
--- a/testing/src/assets/scss/app.scss
+++ b/testing/src/assets/scss/app.scss
@@ -23,4 +23,54 @@
       display: block !important;
     }
   }
-}
\ No newline at end of file
+}
+
+.header {
+  background: $light-gray;
+  border-radius: 10px;
+  Margin-bottom: $global-margin * 2;
+
+  .columns {
+    padding-bottom: 0;
+  }
+
+  p {
+    margin-bottom: 0;
+  }
+
+  img {
+    padding-top: $global-padding;
+    padding-bottom: $global-padding;
+  }
+}
+
+.container {
+  border-radius: 10px;
+}
+
+.feature-block {
+  background: $light-gray;
+  Margin-bottom: $global-padding * 2;
+
+  .columns {
+    padding-top: $global-padding * 2;
+    padding-bottom: $global-padding * 2;
+  }
+}
+
+.gallery {
+  img {
+    Margin-bottom: $global-margin;
+  }
+
+  .gallery-name {
+    text-align: center;
+    font-weight: bold;
+    Margin-bottom: 0;
+  }
+
+  .gallery-age {
+    color: $secondary-color;
+    text-align: center;
+  }
+}
diff --git a/testing/src/pages/kitcat.html b/testing/src/pages/kitcat.html
index bbacf0c9..fbc9db9c 100644
--- a/testing/src/pages/kitcat.html
+++ b/testing/src/pages/kitcat.html
@@ -1,26 +1,27 @@
 <container>
+  <div class="header">
+    <row>
+      <columns small="12" large="12">
+        <center>
+          <img class="float-center" src="http://placehold.it/150x50" alt="">
+        </center>
+      </columns>
+    </row>
 
-  <row>
-    <columns small="12" large="12">
-      <center>
-        <img align="center" class="float-center" src="http://placehold.it/150x50" alt="">
-      </center>
-    </columns>
-  </row>
-
-  <row>
-    <columns small="6" large="6">
-      <p>Monthly Pawprint</p>
-    </columns>
-    <columns small="6" large="6">
-      <p class="text-right">April 1, 2016</p>
-    </columns>
-  </row>
+    <row>
+      <columns small="6" large="6">
+        <p>Monthly Pawprint</p>
+      </columns>
+      <columns small="6" large="6">
+        <p class="text-right">April 1, 2016</p>
+      </columns>
+    </row>
+  </div>
 
   <row>
     <columns small="12" large="12">
       <center>
-        <img align="center" class="float-center" src="http://placehold.it/450x250" alt="">
+        <img class="float-center" src="http://placehold.it/450x250" alt="">
       </center>
     </columns>
   </row>
@@ -31,71 +32,73 @@
       <p class="text-center">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
       quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
       <center>
-        <button class="primary small" href="http://zurb.com">Find out more</button>
+        <button class="primary tiny" href="http://zurb.com">Find out more</button>
       </center>
     </columns>
   </row>
 
-  <row>
-    <columns small="12" large="3" class="large-offset-1">
-      <img class="small-float-center" src="http://placehold.it/120" alt="question mark image">
-    </columns>
-    <columns small="12" large="8">
-      <h4>what type are you?</h4>
-      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris.</p>
-      <button class="primary small" href="http://zurb.com">Check it out</button>
-    </columns>
-  </row>
+  <div class="feature-block">
+    <row>
+      <columns small="12" large="3" class="large-offset-1">
+        <img class="small-float-center" src="http://placehold.it/120" alt="question mark image">
+      </columns>
+      <columns small="12" large="8">
+        <h4>what type are you?</h4>
+        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+        quis nostrud exercitation ullamco laboris.</p>
+        <button class="primary small" href="http://zurb.com">Check it out</button>
+      </columns>
+    </row>
+  </div>
 
-  <row>
+  <row class="gallery">
     <columns small="12" large="12">
       <h4 class="text-center">furry friends</h4>
       <block-grid up="3">
         <td>
           <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
         <td>
-          <img align="center" class="float-center" src="http://placehold.it/120" alt="image of a cute kitty">
-          <p class="text-center">name</p>
-          <p class="text-center">age</p>
+          <img align="center" class="float-center" src="http://placehold.it/120" alt="imgallery-age of a cute kitty">
+          <p class="gallery-name">gallery-name</p>
+          <p class="gallery-age">gallery-age</p>
         </td>
       </block-grid>
     </columns>