fix(scaffolding) line-height generated

bq · Apr 15, 2015 · 1650361 · 1650361
1 parent adad813
commit 1650361
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,3 @@
-<a name"0.0.4"></a>
-### 0.0.4 (2015-04-13)
-
-
-<a name"0.0.3"></a>
-### 0.0.3 (2015-04-13)
-
-
 <a name"0.0.2"></a>
 ### 0.0.2 (2015-04-13)
 

diff --git a/README.md b/README.md
@@ -692,4 +692,4 @@ Just add [data-tab] attribute to a tab.
 
 
 --------
-<small>_This readme has been automatically generated by [readme generator](https://github.com/aponxi/grunt-readme-generator) on Mon Apr 13 2015 21:46:36 GMT+0200 (CEST)._</small>
+<small>_This readme has been automatically generated by [readme generator](https://github.com/aponxi/grunt-readme-generator) on Wed Apr 15 2015 14:43:46 GMT+0200 (CEST)._</small>
diff --git a/lib/css/penguin.css b/lib/css/penguin.css
@@ -142,7 +142,7 @@ article, aside, audio, canvas, figcaption, figure, footer, header, hgroup, outpu
 @media print {
   * {
     background: transparent !important;
-    color: #000 !important;
+    color: #333333 !important;
     text-shadow: none !important;
     filter: none !important;
     -ms-filter: none !important;
@@ -232,7 +232,7 @@ html {
 body {
   font-family: "Arial", Helvetica, Sans-serif;
   font-size: 1em;
-  line-height: 0.72727em;
+  line-height: 1.375em;
   color: #8F908A;
   background-color: white;
   height: 100%;
@@ -1558,7 +1558,7 @@ a:hover, a:focus {
   font-size: 1em;
 }
 
-.text p, .text ul, .text ol {
+.text > p, .text > ul, .text > ol {
   font-size: 0.875em;
 }
 
@@ -1897,6 +1897,9 @@ a:hover, a:focus {
 .form .input:not(.input--checkbox):not(.input--radio) textarea {
   vertical-align: top;
 }
+.form .input:not(.input--checkbox):not(.input--radio) input[type="file"] {
+  line-height: 1rem;
+}
 
 .input--radio,
 .input--checkbox {

diff --git a/lib/css/penguin.min.css b/lib/css/penguin.min.css
diff --git a/lib/js/penguin.js b/lib/js/penguin.js
@@ -1,4 +1,4 @@
-/*! penguin - v0.0.2 - 2015-04-13 */
+/*! penguin - v0.0.4 - 2015-04-15 */
 /* global define, module, require */
 
 'use strict';

diff --git a/lib/js/penguin.min.js b/lib/js/penguin.min.js
diff --git a/src/css/base/_scaffolding.scss b/src/css/base/_scaffolding.scss
@@ -34,7 +34,7 @@ html {
 body {
     font-family: $font-family-base;
     font-size: em($body-font-size, 16);
-    line-height: em($font-size-base, $line-height-base);
+    line-height: em($line-height-base, $font-size-base);
     color: $body-color;
     background-color: $body-bg;
     height: 100%;

diff --git a/src/css/base/_variables.scss b/src/css/base/_variables.scss
@@ -4,7 +4,7 @@
 
 // Brand colors
 $brand-primary            : #272822 !default;
-$brand-primary-text       : #000 !default;
+$brand-primary-text       : #333333 !default;
 $brand-secondary          : #dddddd !default;
 $brand-secondary-text     : #dddddd !default;
 

diff --git a/src/css/components/_form.scss b/src/css/components/_form.scss
@@ -23,7 +23,6 @@
             display: inline-block;
         }
 
-
         .input:not(.input--checkbox):not(.input--radio) {
             display: block;
 
@@ -41,6 +40,10 @@
                     vertical-align: top;
                 }
 
+                input[type="file"] {
+                    line-height: rem($font-size-base);
+                }
+
             }
 
         }

diff --git a/src/css/components/_text.scss b/src/css/components/_text.scss
@@ -37,7 +37,7 @@
     }
 
     .text {
-        p, ul, ol {
+        > p, > ul, > ol {
             font-size: em($text-size-base);
         }
     }