Auto merge of #21962 - vrinek:printable-book, r=steveklabnik

Tested on: * Safari on OSX * Firefox on OSX
rust-lang · Feb 6, 2015 · 0b56e9b · 0b56e9b
2 parents f3573aa + a40df9d
commit 0b56e9b
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 100 deletions.
diff --git a/src/doc/trpl/rust-book.css b/src/doc/trpl/rust-book.css
diff --git a/src/rustbook/css.rs b/src/rustbook/css.rs
@@ -17,31 +17,55 @@ body {
     max-width:none;
 }
 
-#toc {
-    position: absolute;
-    left: 0px;
-    top: 0px;
-    bottom: 0px;
-    width: 250px;
-    overflow-y: auto;
-    border-right: 1px solid rgba(0, 0, 0, 0.07);
-    padding: 10px 10px;
-    font-size: 16px;
-    background: none repeat scroll 0% 0% #FFF;
-    box-sizing: border-box;
-    -webkit-overflow-scrolling: touch;
+@media only screen {
+    #toc {
+        position: absolute;
+        left: 0px;
+        top: 0px;
+        bottom: 0px;
+        width: 250px;
+        overflow-y: auto;
+        border-right: 1px solid rgba(0, 0, 0, 0.07);
+        padding: 10px 10px;
+        font-size: 16px;
+        background: none repeat scroll 0% 0% #FFF;
+        box-sizing: border-box;
+        -webkit-overflow-scrolling: touch;
+    }
+
+    #page-wrapper {
+        position: absolute;
+        overflow-y: auto;
+        left: 260px;
+        right: 0px;
+        top: 0px;
+        bottom: 0px;
+        box-sizing: border-box;
+        background: none repeat scroll 0% 0% #FFF;
+        -webkit-overflow-scrolling: touch;
+    }
 }
 
-#page-wrapper {
-    position: absolute;
-    overflow-y: auto;
-    left: 260px;
-    right: 0px;
-    top: 0px;
-    bottom: 0px;
-    box-sizing: border-box;
-    background: none repeat scroll 0% 0% #FFF;
-    -webkit-overflow-scrolling: touch;
+@media only print {
+    #toc, #nav {
+        display: none;
+    }
+}
+
+@media only screen and (max-width: 1060px) {
+    #toc {
+        width: 100%;
+        margin-right: 0;
+        top: 40px;
+    }
+    #page-wrapper {
+        top: 40px;
+        left: 15px;
+        padding-right: 15px;
+    }
+    .mobile-hidden {
+        display: none;
+    }
 }
 
 #page {
@@ -73,23 +97,6 @@ body {
     color: #000000;
 }
 
-@media only screen and (max-width: 1060px) {
-    #toc {
-        width: 100%;
-        margin-right: 0;
-        top: 40px;
-    }
-    #page-wrapper {
-        top: 40px;
-        left: 15px;
-        padding-right: 15px;
-    }
-    .mobile-hidden {
-        display: none;
-    }
-}
-
-
 #toggle-nav {
     height: 20px;
     width:  30px;
@@ -133,5 +140,4 @@ body {
 .right {
     float: right;
 }
-
 "#;