Merge branch 'release/v1.1.0'

Jeroen Ooms · Jeroen Ooms · commit e3f02af9fbd0 · 2016-01-18T15:12:48.000+01:00
diff --git a/README.md b/README.md
@@ -50,4 +50,8 @@ $initialize-block-margins: 0 0 0.75em;
 $initialize-heading-color: #000;
 $initialize-heading-font-family: sans-serif;
 $initialize-heading-margins: 1em 0 0.75em;
+```
+
+```
+$initialize-print-styles: true;
 ```
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "initialize-css",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "homepage": "http://jeroenoomsnl.github.io/initialize-css/",
   "authors": [
     "Jeroen Ooms (@jeroenooms)"
diff --git a/dist/_initialize.scss b/dist/_initialize.scss
@@ -18,6 +18,7 @@ $initialize-line-height: 1.4 !default;
 // Options
 //
 $initialize-dinosaur-mode: false !default; // toggle support for IE8, IE9 & IE10
+$initialize-print-styles: false !default; // toggle HTML5 Boilerplate print styles
 
 //
 // Optional values
@@ -350,3 +351,75 @@ h1, h2, h3, h4, h5, h6 {
 p, table, ul, ol, fieldset, blockquote, dl {
   @include optional-prop('margin', $initialize-block-margins);
 }
+
+//
+// Print styles
+//
+@if $initialize-print-styles == true {
+  @media print {
+      *,
+      *:before,
+      *:after,
+      *:first-letter,
+      *:first-line {
+          background: transparent !important;
+          color: #000 !important; // Black prints faster: http://www.sanbeiji.com/archives/953
+          box-shadow: none !important;
+          text-shadow: none !important;
+      }
+
+      a,
+      a:visited {
+          text-decoration: underline;
+      }
+
+      a[href]:after {
+          content: " (" attr(href) ")";
+      }
+
+      abbr[title]:after {
+          content: " (" attr(title) ")";
+      }
+
+      // Don't show links that are fragment identifiers,
+      // or use the `javascript:` pseudo protocol
+      a[href^="#"]:after,
+      a[href^="javascript:"]:after {
+          content: "";
+      }
+
+      pre,
+      blockquote {
+          border: 1px solid #999;
+          page-break-inside: avoid;
+      }
+
+      // Printing Tables:
+      // http://css-discuss.incutio.com/wiki/Printing_Tables
+      thead {
+          display: table-header-group;
+      }
+
+      tr,
+      img {
+          page-break-inside: avoid;
+      }
+
+      img {
+          max-width: 100% !important;
+      }
+
+      p,
+      h2,
+      h3 {
+          orphans: 3;
+          widows: 3;
+      }
+
+      h2,
+      h3 {
+          page-break-after: avoid;
+      }
+  }
+}
+
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "initialize-css",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "homepage": "http://jeroenoomsnl.github.io/initialize-css/",
   "description": "Initialize.css is a complete and customizable collection of CSS best practices based on Normalize.css and HTML5 Boilerplate. Available in CSS and configurable SASS (SCSS) format.",
   "author": {
diff --git a/src/index.html b/src/index.html
@@ -13,7 +13,7 @@
         <link rel="stylesheet" href="styles/demo.css">
     </head>
     <body>
-        <!--[if lte IE 10]>
+        <!--[if lt IE 10]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience and your life.</p>
         <![endif]-->
 
@@ -36,27 +36,30 @@ <h2>Initialize.css is a complete and customizable collection of CSS best practic
 
             <h2>Install</h2>
             <p>
-                <strong>npm</strong><br>
-                <code>npm install initialize-css</code>
+                <strong>npm</strong>
             </p>
+            <pre>npm install initialize-css</pre>
+
             <p>
-                <strong>bower</strong><br>
-                <code>bower install initialize-css</code>
+                <strong>bower</strong>
             </p>
+            <pre>bower install initialize-css</pre>
 
             <h2>Usage</h2>
             <p>
-                <strong>sass / scss (from node_modules or bower_components)</strong><br>
-                <code>@import: "module_folder_name/initialize-css/dist/initialize";</code>
+                <strong>sass / scss (from node_modules or bower_components)</strong>
             </p>
+            <pre>@import: "module_folder_name/initialize-css/dist/initialize";</pre>
+
             <p>
-                <strong>sass with browserify</strong><br>
-                <code>@import: "initialize";</code>
+                <strong>sass with browserify</strong>
             </p>
+            <pre>@import: "initialize";</pre>
+
             <p>
-                <strong>or just copy the generated css files (with vendor prefixes)</strong><br>
-                <code>&lt;link rel=&quot;stylesheet&quot; href=&quot;styles/initialize.min.css&quot;&gt;</code>
+                <strong>or just copy the generated css files (with vendor prefixes)</strong>
             </p>
+            <pre>&lt;link rel=&quot;stylesheet&quot; href=&quot;styles/initialize.min.css&quot;&gt;</pre>
 
             <h2>Configure</h2>
             <p>Overwrite default values for generic typography:</p>
@@ -79,7 +82,9 @@ <h2>Configure</h2>
 
 $initialize-heading-color: #000;
 $initialize-heading-font-family: sans-serif;
-$initialize-heading-margins: 1em 0 0.75em; 
+$initialize-heading-margins: 1em 0 0.75em;
+
+$initialize-print-styles: true;
 </pre>
 
 
diff --git a/src/styles/initialize.scss b/src/styles/initialize.scss
@@ -18,6 +18,7 @@ $initialize-line-height: 1.4 !default;
 // Options
 //
 $initialize-dinosaur-mode: false !default; // toggle support for IE8, IE9 & IE10
+$initialize-print-styles: false !default; // toggle HTML5 Boilerplate print styles
 
 //
 // Optional values
@@ -350,3 +351,75 @@ h1, h2, h3, h4, h5, h6 {
 p, table, ul, ol, fieldset, blockquote, dl {
   @include optional-prop('margin', $initialize-block-margins);
 }
+
+//
+// Print styles
+//
+@if $initialize-print-styles == true {
+  @media print {
+      *,
+      *:before,
+      *:after,
+      *:first-letter,
+      *:first-line {
+          background: transparent !important;
+          color: #000 !important; // Black prints faster: http://www.sanbeiji.com/archives/953
+          box-shadow: none !important;
+          text-shadow: none !important;
+      }
+
+      a,
+      a:visited {
+          text-decoration: underline;
+      }
+
+      a[href]:after {
+          content: " (" attr(href) ")";
+      }
+
+      abbr[title]:after {
+          content: " (" attr(title) ")";
+      }
+
+      // Don't show links that are fragment identifiers,
+      // or use the `javascript:` pseudo protocol
+      a[href^="#"]:after,
+      a[href^="javascript:"]:after {
+          content: "";
+      }
+
+      pre,
+      blockquote {
+          border: 1px solid #999;
+          page-break-inside: avoid;
+      }
+
+      // Printing Tables:
+      // http://css-discuss.incutio.com/wiki/Printing_Tables
+      thead {
+          display: table-header-group;
+      }
+
+      tr,
+      img {
+          page-break-inside: avoid;
+      }
+
+      img {
+          max-width: 100% !important;
+      }
+
+      p,
+      h2,
+      h3 {
+          orphans: 3;
+          widows: 3;
+      }
+
+      h2,
+      h3 {
+          page-break-after: avoid;
+      }
+  }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "initialize-css",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"homepage": "http://jeroenoomsnl.github.io/initialize-css/",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Jeroen Ooms (@jeroenooms)"`