Skip to content

Commit 0b56e9b

Browse files
committed
Auto merge of #21962 - vrinek:printable-book, r=steveklabnik
Tested on: * Safari on OSX * Firefox on OSX
2 parents f3573aa + a40df9d commit 0b56e9b

File tree

2 files changed

+47
-100
lines changed

2 files changed

+47
-100
lines changed

src/doc/trpl/rust-book.css

-59
This file was deleted.

src/rustbook/css.rs

+47-41
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,55 @@ body {
1717
max-width:none;
1818
}
1919
20-
#toc {
21-
position: absolute;
22-
left: 0px;
23-
top: 0px;
24-
bottom: 0px;
25-
width: 250px;
26-
overflow-y: auto;
27-
border-right: 1px solid rgba(0, 0, 0, 0.07);
28-
padding: 10px 10px;
29-
font-size: 16px;
30-
background: none repeat scroll 0% 0% #FFF;
31-
box-sizing: border-box;
32-
-webkit-overflow-scrolling: touch;
20+
@media only screen {
21+
#toc {
22+
position: absolute;
23+
left: 0px;
24+
top: 0px;
25+
bottom: 0px;
26+
width: 250px;
27+
overflow-y: auto;
28+
border-right: 1px solid rgba(0, 0, 0, 0.07);
29+
padding: 10px 10px;
30+
font-size: 16px;
31+
background: none repeat scroll 0% 0% #FFF;
32+
box-sizing: border-box;
33+
-webkit-overflow-scrolling: touch;
34+
}
35+
36+
#page-wrapper {
37+
position: absolute;
38+
overflow-y: auto;
39+
left: 260px;
40+
right: 0px;
41+
top: 0px;
42+
bottom: 0px;
43+
box-sizing: border-box;
44+
background: none repeat scroll 0% 0% #FFF;
45+
-webkit-overflow-scrolling: touch;
46+
}
3347
}
3448
35-
#page-wrapper {
36-
position: absolute;
37-
overflow-y: auto;
38-
left: 260px;
39-
right: 0px;
40-
top: 0px;
41-
bottom: 0px;
42-
box-sizing: border-box;
43-
background: none repeat scroll 0% 0% #FFF;
44-
-webkit-overflow-scrolling: touch;
49+
@media only print {
50+
#toc, #nav {
51+
display: none;
52+
}
53+
}
54+
55+
@media only screen and (max-width: 1060px) {
56+
#toc {
57+
width: 100%;
58+
margin-right: 0;
59+
top: 40px;
60+
}
61+
#page-wrapper {
62+
top: 40px;
63+
left: 15px;
64+
padding-right: 15px;
65+
}
66+
.mobile-hidden {
67+
display: none;
68+
}
4569
}
4670
4771
#page {
@@ -73,23 +97,6 @@ body {
7397
color: #000000;
7498
}
7599
76-
@media only screen and (max-width: 1060px) {
77-
#toc {
78-
width: 100%;
79-
margin-right: 0;
80-
top: 40px;
81-
}
82-
#page-wrapper {
83-
top: 40px;
84-
left: 15px;
85-
padding-right: 15px;
86-
}
87-
.mobile-hidden {
88-
display: none;
89-
}
90-
}
91-
92-
93100
#toggle-nav {
94101
height: 20px;
95102
width: 30px;
@@ -133,5 +140,4 @@ body {
133140
.right {
134141
float: right;
135142
}
136-
137143
"#;

0 commit comments

Comments
 (0)