merge

kenwheeler · Mar 12, 2014 · 5a823b3 · 5a823b3
2 parents 0884e4d + de30b82
commit 5a823b3
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 131 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -9,6 +9,9 @@
         <meta name="description" content="Structure Style Guide">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" href="styles/main.css">
+        <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js
+
+"></script>
     </head>
     <body>
         <header class="primary">
@@ -206,6 +209,10 @@ <h2>Helper Mixins</h2>
 
 @include clear;
 
+// clear(boolean) : Use false inside media queries to use mixin instead of placeholder
+
+@include clear(false);
+
 // Ellipsis Mixin - ellipsis($width)
 //
 // display: inline-block;
@@ -226,6 +233,10 @@ <h2>Helper Mixins</h2>
 
 @include hide-text;
 
+// hide-text(boolean) : Use false inside media queries to use mixin instead of placeholder
+
+@include hide-text(false);
+
 // Inline List (use on &lt;ul&gt;)
 //
 // list-style-type:none;

diff --git a/demo/styles/main.css b/demo/styles/main.css
@@ -1,3 +1,7 @@
+main:after, main section:after, main section header:after, main section .container:after {
+  content: "";
+  display: table;
+  clear: both; }
 
 
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
@@ -8,12 +12,15 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
   font: inherit;
   vertical-align: baseline; }
 
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section {
   display: block; }
 
 ol, ul {
   list-style: none; }
 
+a {
+  text-decoration: none; }
+
 blockquote, q {
   quotes: none; }
 
@@ -133,26 +140,14 @@ main {
   width: 100%;
   max-width: 600px;
   margin: auto; }
-  main:after {
-    content: "";
-    display: table;
-    clear: both; }
   main section {
     padding-left: 20px;
     padding-right: 20px;
     width: 100%;
     float: left; }
-    main section:after {
-      content: "";
-      display: table;
-      clear: both; }
     main section header {
       margin: 0px 0px 20px 0px;
       text-align: center; }
-      main section header:after {
-        content: "";
-        display: table;
-        clear: both; }
       main section header h2 {
         background: none;
         font-size: 1.5rem;
@@ -170,10 +165,6 @@ main {
       width: 100%;
       max-width: 600px;
       margin-bottom: 20px; }
-      main section .container:after {
-        content: "";
-        display: table;
-        clear: both; }
     main section .float-tile {
       padding-left: 20px;
       padding-right: 20px;