removed the overrides file

diff --git a/scss/ink.scss b/scss/ink.scss
index 3bbf50f62443fcc800adf6c87af258c38f810831..e040b16f9c0770cd23d0169b32b831d3f52dc222 100755 (executable)
--- a/scss/ink.scss
+++ b/scss/ink.scss
@@ -19,5 +19,4 @@ $foundation-version: '1.0.0-alpha';
   "ink/components/thumbnail",
        "ink/components/inline-list",
        "ink/components/outlook-first",
-       "ink/components/media-query",
-  "ink/override";
\ No newline at end of file
+       "ink/components/media-query";
\ No newline at end of file

diff --git a/scss/ink/_override.scss b/scss/ink/_override.scss
deleted file mode 100644 (file)
index 4a940fa..0000000
--- a/scss/ink/_override.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-      /*Styles and overrides*/
-    h1.main {margin-bottom: 0;}
-    .feature h2 {margin: 0 0 30px;}
-    p.metadata { font-weight:700; font-size:11px; margin-bottom:0px; text-transform:uppercase; letter-spacing: 1px; color: #999; }
-    p.lead.gray { color: #999;}
-    p.lead.dark-gray { color: #777;}
-    img.thumbnail { border: 1px solid #d9d9d9; margin: 20px 0; }
-    img.thumbnail.sm { margin: 0 0 20px 0; }
-    h5 { margin-bottom: 10px; font-size: 12px; font-weight: 700; text-transform: uppercase; letter-spacing: 1px;}
-    h5 a { color: #222 !important; }
-    .copyright p { margin-bottom: 0px; font-size: 11px; color: #999;}
-    .copyright a { color: #999; font-weight: bold;}
-    
-    .copyright p.dark, .copyright p.dark a { color: #222; }
-    ul.steps { list-style: none; padding-left: 0px;}
-    ul.steps li, ul.steps p { margin-bottom: 0; }
-    .flush { margin: 0 !important; }
-    p.comment { background: #f5f5f5; padding: 16px 20px; margin-bottom: 0; padding-left: 80px; }
-    p.next.comment { border-top: 2px solid #fff; }
-    div.triangle {
-      margin-left: 12px;
-      border-left: 10px transparent solid;
-      border-right: 10px transparent solid;
-      border-bottom: 10px solid #f5f5f5;
-      width: 0px;
-    }
-    .cite { font-size: 12px; color: #999; font-weight: bold; margin: 8px 0 0 0; display: block;}
-    img.avatar { margin: 20px auto 0; border-radius: 50%; height: 80px; width: 80px;}
-    p.comment.note { padding-left: 80px; }
-    .note-pip { width: 22px; height: 22px; border-radius: 50%; background: #333; color: white; font-size: 10px; font-weight: bold; text-align: center; line-height: 22px; float: left; }
-    .post-note { padding-left: 40px; }
-    .post-note a, .post-note a:hover { color: #222 !important; }
-    table.button.influence td { background: #2badbe; }
-    table.button.influence:hover td { background: #27a1aa !important; }
-    table.button.verify td { background: #b6d133; }
-    table.button.verify:hover td { background: #b0c130 !important; }
-    table.button.solidify td { background: #c71d5e; }
-    table.button.solidify:hover td { background: #ba1c5d !important; }
-    table.button.hosted td { background: #078cba; }
-    table.button.hosted:hover td { background: #0786a8 !important; }
-    table.button.university td { background: #ff6908; }
-    table.button.university:hover td { background: #e55e07 !important; }
-
-    table.set-thumbs td.wrapper { padding: 10px 5px; }
-    table.set-thumbs td img { margin: 0; }
-    table.set-thumbs .cite { float: right; }
-    
-    table.share-news p { margin: 0; }
-    table.share-news .button { margin: 0; }
-    table.share-news .button td { padding: 0; }
-    table.share-news .button a { padding: 12px 0; display: block; }
-    .panel.light-gray { background: #f9f9f9; padding: 20px 30px !important;}
-    .panel.light-gray p { padding: 0 20px; }
-    pre {background: #f9f9f9; margin: 30px 0;}
-    pre code { color: #777;}
-    pre code span.callout {color: #555; font-weight: bold;}
-    pre code span.callout-strong {color: #ff6908; font-weight: bold;}
-
-    hr { color: #efefef; background-color: #efefef; }
-
-    td.wrapper-small-left {padding-left: 0 !important;}
-
-    /* Tweets Yo */
-
-    td.tweet-pad {padding-top: 5px !important; padding-bottom: 0px !important;}
-    td.tweet-head {padding-top: 30px !important; padding-bottom: 10px !important;}
-    td.tweet-foot {padding-top: 0 !important; padding-bottom: 10px !important;}
-    td.tweet-foot p {margin-bottom: 0 !important; padding-bottom: 15px !important;}
-    .tweet-date, .tweet-handle {color: #999999; font-size: 16px !important}
-    .tweet-pad h3 {margin-bottom: 0;}
-    .tweet-pad h3, .tweet-pad h6 {margin-left: 60px !important;}
-    .panel a .tweet-avatar {width: 50px !important; height: auto !important;}
-    .panel {  padding: 25px !important; padding-top: 25px !important}
-
-    table[class="body"] .thumb-caption {
-        margin-top: 110px !important;
-    }
-
-    @media only screen and (max-width: 600px) {
-        td.wrapper {
-          padding-left: 0;
-        }
-        table[class="body"] .columns.stay-4 {
-            width: 180px !important;
-        }
-        table[class="body"] .thin-row {
-            width: 180px !important;
-            margin: 0 auto !important;
-        }
-
-    }
-

diff --git a/scss/ink/components/_global.scss b/scss/ink/components/_global.scss
index 61efbd665b8860036a3095cbfa951570ed7ad4bf..12bf6bad9f24c95fe4adb3b717b447bda16c4818 100755 (executable)
--- a/scss/ink/components/_global.scss
+++ b/scss/ink/components/_global.scss
@@ -49,6 +49,10 @@ $black: #0a0a0a !default;
 /// @type Color
 $white: #fefefe !default;
 
+/// Color used code.
+/// @type Color
+$pre-color: #ff6908 !default;
+
 
 $column-gutter: 20px !default;
 
@@ -63,9 +67,3 @@ $paragraph-margin-bottom: 10px !default;
 // We use these to make sure border radius matches unless we want it different.
 $global-radius: 3px !default;
 $global-rounded: 500px !default;
-
-@include exports("global") {
-  @if $include-html-global-classes {
-
-  }
-}
\ No newline at end of file

diff --git a/scss/ink/components/_grid.scss b/scss/ink/components/_grid.scss
index cb014a644890cbcb523b24764df2d9e1a30443e3..958995737b66c8a8e38e7a6ff643ac3142e1836c 100755 (executable)
--- a/scss/ink/components/_grid.scss
+++ b/scss/ink/components/_grid.scss
@@ -2,28 +2,27 @@
 // zurb.com/ink/
 // Licensed under MIT Open Source
 
-@import "global";
+@import 'global';
 
-//
-// @variables
-//
+////
+/// @group grid
+////
 
-$include-html-media-query-classes: $include-html-classes;
-
-$small-range: (0px, $container-width * (600px / 580px));
-$include-html-grid-classes: $include-html-classes !default;
-$include-html-sub-colums-grid-classes: $include-html-grid-classes !default;
-
-$total-columns: 12 !default;
+/// Default number of columns for an email.
+/// @type Number
+$grid-column-count: 12 !default;
 
+/// Default padding for the top of the wrapper.
+/// @type Number
 $wrapper-padding-top: 10px !default;
-$column-cell-padding-bottom: 10px !default;
 
-$sub-column-padding-right: $column-gutter / 2 !default;
+/// Default padding for the bottom of a column.
+/// @type Number
+$column-padding-bottom: 10px !default;
 
-@include exports("grid") {
-  @if $include-html-grid-classes {
-    /* Responsive Grid */
+/// Default padding for the right of a sub-column.
+/// @type Number
+$sub-column-padding-right: $column-gutter / 2 !default;
 
     table.body {
       height: 100%;
@@ -58,7 +57,7 @@ $sub-column-padding-right: $column-gutter / 2 !default;
 
     table.columns td,
     table.column td {
-      padding: 0px 0px $column-cell-padding-bottom;  
+      padding: 0px 0px $column-padding-bottom;  
     }
 
     table.row td.last,
@@ -66,34 +65,34 @@ $sub-column-padding-right: $column-gutter / 2 !default;
       padding-right: 0px;
     }
 
-    @for $i from 1 through $total-columns {
+    @for $i from 1 through $grid-column-count {
       table.large-#{$i} {
-        width: grid-calc-px($i, $total-columns, $container-width, $column-gutter);
+        width: grid-calc-px($i, $grid-column-count, $container-width, $column-gutter);
       }
     }
 
-    @for $i from 1 through $total-columns {
+    @for $i from 1 through $grid-column-count {
       table.large-#{$i} center {
-        min-width: grid-calc-px($i, $total-columns, $container-width, $column-gutter);
+        min-width: grid-calc-px($i, $grid-column-count, $container-width, $column-gutter);
       }
     }
 
-    @for $i from 1 through $total-columns {
+    @for $i from 1 through $grid-column-count {
       table.large-#{$i} .panel center {
-        min-width: grid-calc-px($i, $total-columns, $container-width, $column-gutter) - 2 * $panel-padding;
+        min-width: grid-calc-px($i, $grid-column-count, $container-width, $column-gutter) - 2 * $panel-padding;
       }
     }
 
-    @for $i from 1 through $total-columns {
+    @for $i from 1 through $grid-column-count {
       .body .columns td.large-#{$i},
       .body .column td.large-#{$i} {
-        width: grid-calc-pct($i, $total-columns);
+        width: grid-calc-pct($i, $grid-column-count);
       }
     }
 
-    @for $i from 1 through ($total-columns - 1) {
+    @for $i from 1 through ($grid-column-count - 1) {
       td.offset-by-#{$i} {
-        padding-left: grid-calc-px($i, $total-columns, $container-width, $column-gutter) + $column-gutter;
+        padding-left: grid-calc-px($i, $grid-column-count, $container-width, $column-gutter) + $column-gutter;
       }
     }  
     td.expander {
@@ -121,5 +120,3 @@ $sub-column-padding-right: $column-gutter / 2 !default;
     table.column .text-pad-right {
       padding-right: $text-padding;
     }  
-  }  
-}
\ No newline at end of file

diff --git a/scss/ink/components/_type.scss b/scss/ink/components/_type.scss
index cf2d9add53bd71574fe5d1288f065278fe575a3f..9779c2006e3c1a39f314956358c860e0c6dacf4b 100755 (executable)
--- a/scss/ink/components/_type.scss
+++ b/scss/ink/components/_type.scss
@@ -201,3 +201,19 @@ h5 a:active,
 h6 a:active {
   color: $header-anchor-font-color-active !important;
 }
+
+pre {
+  background: $light-gray; 
+  margin: 30px 0;
+}
+pre code {
+  color: $medium-gray;
+}
+pre code span.callout {
+  color: $dark-gray; 
+  font-weight: bold;
+}
+pre code span.callout-strong {
+  color: $pre-color; 
+  font-weight: bold;
+}