Skip to content

Commit 5ab84f9

Browse files
fatfat
committed
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2 parents 8545fe9 + 369b972 commit 5ab84f9

19 files changed

+2093
-1243
lines changed

‎bootstrap.css

+358-172
Large diffs are not rendered by default.

‎bootstrap.min.css

+90-92
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/css/docs.css

+167-128
Original file line numberDiff line numberDiff line change
@@ -8,183 +8,161 @@
88
/* Body and structure
99
-------------------------------------------------- */
1010
body {
11-
background-color: #fff;
1211
position: relative;
12+
padding-top: 90px;
13+
background-color: #fff;
14+
background-image: url(../img/grid-18px-masked.png);
15+
background-repeat: repeat-x;
1316
}
1417
section {
1518
padding-top: 60px;
1619
}
17-
section > .row {
18-
margin-bottom: 10px;
19-
}
2020

21+
/* Tweak topbar brand link to be super sleek
22+
-------------------------------------------------- */
23+
body > .navbar-fixed .brand {
24+
float: right;
25+
font-weight: bold;
26+
color: #000;
27+
text-shadow: 0 1px 0 rgba(255,255,255,.1);
28+
}
29+
body > .navbar-fixed .brand:hover {
30+
text-decoration: none;
31+
}
2132

2233
/* Jumbotrons
2334
-------------------------------------------------- */
2435
.jumbotron {
25-
min-width: 940px;
26-
padding-top: 40px;
27-
}
28-
.jumbotron .inner {
29-
background: transparent url(../img/grid-18px.png) top center;
30-
padding: 45px 0;
31-
-webkit-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
32-
-moz-box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
33-
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3);
34-
*/}
35-
.jumbotron h1,
36-
.jumbotron p {
37-
margin-bottom: 9px;
38-
color: #fff;
39-
text-align: center;
40-
text-shadow: 0 1px 1px rgba(0,0,0,.3);
36+
position: relative;
37+
text-shadow: 0 1px 0 #fff;
4138
}
4239
.jumbotron h1 {
43-
font-size: 54px;
40+
margin-right: 40%;
41+
margin-bottom: 10px;
42+
font-size: 90px;
43+
letter-spacing: -1px;
4444
line-height: 1;
45-
text-shadow: 0 1px 2px rgba(0,0,0,.5);
4645
}
4746
.jumbotron p {
47+
margin-right: 32%;
48+
margin-bottom: 20px;
49+
font-size: 25px;
4850
font-weight: 300;
51+
line-height: 36px;
4952
}
50-
.jumbotron .lead {
53+
.jumbotron .btn {
5154
font-size: 20px;
52-
line-height: 27px;
55+
padding: 14px 24px;
56+
margin-right: 5px;
57+
-webkit-border-radius: 6px;
58+
-moz-border-radius: 6px;
59+
border-radius: 6px;
5360
}
54-
.jumbotron p a {
55-
color: #fff;
56-
font-weight: bold;
61+
.jumbotron .download-info {
62+
font-size: 16px;
63+
color: #999;
64+
}
65+
66+
/* Benefits list in masthead */
67+
.benefits {
68+
width: 250px;
69+
position: absolute;
70+
right: 0;
71+
bottom: 0;
72+
}
73+
.benefits ul {
74+
list-style: none;
75+
margin: 0;
5776
}
77+
.benefits li {
78+
font-size: 16px;
79+
font-weight: 300;
80+
line-height: 35px;
81+
color: #555;
82+
}
83+
.benefits li + li {
84+
border-top: 1px solid #f5f5f5;
85+
}
86+
.benefits h4 {
87+
color: #555;
88+
}
89+
.benefits span {
90+
position: relative;
91+
top: -2px;
92+
padding-right: 5px;
93+
color: #999;
94+
}
95+
5896

5997
/* Specific jumbotrons
6098
------------------------- */
61-
/* main docs page */
62-
.masthead {
63-
background-color: #049cd9;
64-
background-repeat: no-repeat;
65-
background-image: -webkit-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9));
66-
background-image: -webkit-linear-gradient(#004D9F, #049cd9);
67-
background-image: -moz-linear-gradient(#004D9F, #049cd9);
68-
background-image: -o-linear-gradient(top, #004D9F, #049cd9);
69-
background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9));
70-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */
71-
}
7299
/* supporting docs pages */
73100
.subhead {
74-
background-color: #767d80;
75-
background-repeat: no-repeat;
76-
background-image: -webkit-gradient(linear, left top, left bottom, from(#565d60), to(#767d80));
77-
background-image: -webkit-linear-gradient(#565d60, #767d80);
78-
background-image: -moz-linear-gradient(#565d60, #767d80);
79-
background-image: -o-linear-gradient(top, #565d60, #767d80);
80-
background-image: -khtml-gradient(linear, left top, left bottom, from(#565d60), to(#767d80));
81-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#565d60', endColorstr='#767d80', GradientType=0); /* IE8 and down */
82-
}
83-
.subhead .inner {
84-
padding: 36px 0 27px;
101+
padding-bottom: 18px;
102+
border-bottom: 3px solid #eee;
85103
}
86104
.subhead h1,
87105
.subhead p {
88-
text-align: left;
106+
margin-right: 0;
89107
}
90108
.subhead h1 {
91109
font-size: 40px;
92110
}
93-
.subhead p a {
111+
112+
113+
/* Quick links
114+
-------------------------------------------------- */
115+
.quick-links {
116+
padding: 5px 20px;
117+
margin: 60px 0;
118+
list-style: none;
119+
text-align: center;
120+
background-color: #eee;
121+
-webkit-border-radius: 3px;
122+
-moz-border-radius: 3px;
123+
border-radius: 3px;
124+
-webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
125+
-moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
126+
box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
127+
}
128+
.quick-links li {
129+
display: inline;
130+
margin: 0 5px;
131+
line-height: 30px;
132+
}
133+
.quick-links .divider {
134+
color: #999;
135+
}
136+
.quick-links strong {
94137
font-weight: normal;
138+
color: #999;
139+
}
140+
.quick-links .tweet-btn,
141+
.quick-links .follow-btn {
142+
position: relative;
143+
top: 5px;
95144
}
96145

97146

98147
/* Footer
99148
-------------------------------------------------- */
100149
.footer {
101-
background-color: #eee;
102-
min-width: 940px;
103150
padding: 30px 0;
104-
text-shadow: 0 1px 0 #fff;
105151
border-top: 1px solid #e5e5e5;
106-
-webkit-box-shadow: inset 0 5px 15px rgba(0,0,0,.025);
107-
-moz-box-shadow: inset 0 5px 15px rgba(0,0,0,.025);
108-
/* box-shadow: inset 0 5px 15px rgba(0,0,0,.025);
109-
*/}
152+
}
110153
.footer p {
111154
color: #555;
112155
}
113156

114157

115-
/* Quickstart section for getting le code
116-
-------------------------------------------------- */
117-
.quickstart {
118-
background-color: #f5f5f5;
119-
background-repeat: repeat-x;
120-
background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
121-
background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5);
122-
background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5);
123-
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));
124-
background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5);
125-
background-image: -o-linear-gradient(#f9f9f9, #f5f5f5);
126-
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
127-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
128-
background-image: linear-gradient(#f9f9f9, #f5f5f5);
129-
border-top: 1px solid #fff;
130-
border-bottom: 1px solid #eee;
131-
}
132-
.quickstart .container {
133-
margin-bottom: 0;
134-
}
135-
.quickstart .row {
136-
margin: 0 -20px;
137-
-webkit-box-shadow: 1px 0 0 #f9f9f9;
138-
-moz-box-shadow: 1px 0 0 #f9f9f9;
139-
box-shadow: 1px 0 0 #f9f9f9;
140-
}
141-
.quickstart [class*="span"] {
142-
width: 285px;
143-
height: 117px;
144-
margin-left: 0;
145-
padding: 17px 20px 26px;
146-
border-left: 1px solid #eee;
147-
-webkit-box-shadow: inset 1px 0 0 #f9f9f9;
148-
-moz-box-shadow: inset 1px 0 0 #f9f9f9;
149-
box-shadow: inset 1px 0 0 #f9f9f9;
150-
}
151-
.quickstart [class*="span"]:last-child {
152-
border-right: 1px solid #eee;
153-
width: 286px;
154-
}
155-
.quickstart h6,
156-
.quickstart p {
157-
line-height: 18px;
158-
text-align: center;
159-
margin-bottom: 9px;
160-
color: #333;
161-
}
162-
.quickstart .current-version,
163-
.quickstart .current-version a {
164-
color: #999;
165-
}
166-
.quickstart h6 {
167-
color: #999;
168-
}
169-
.quickstart textarea {
170-
display: block;
171-
width: 275px;
172-
height: auto;
173-
margin: 0 0 9px;
174-
line-height: 21px;
175-
white-space: nowrap;
176-
overflow: hidden;
177-
}
178-
179-
180158
/* Special grid styles
181159
-------------------------------------------------- */
182160
.show-grid {
183161
margin-top: 10px;
184-
margin-bottom: 10px;
162+
margin-bottom: 20px;
185163
}
186164
.show-grid [class*="span"] {
187-
background: #eee;
165+
background-color: #eee;
188166
text-align: center;
189167
-webkit-border-radius: 3px;
190168
-moz-border-radius: 3px;
@@ -228,7 +206,7 @@ section > .row {
228206
.mini-layout .mini-layout-body {
229207
background-color: #dceaf4;
230208
margin: 0 auto;
231-
width: 240px;
209+
width: 70%;
232210
height: 240px;
233211
}
234212
.mini-layout.fluid .mini-layout-sidebar,
@@ -238,11 +216,11 @@ section > .row {
238216
}
239217
.mini-layout.fluid .mini-layout-sidebar {
240218
background-color: #bbd8e9;
241-
width: 90px;
219+
width: 20%;
242220
height: 240px;
243221
}
244222
.mini-layout.fluid .mini-layout-body {
245-
width: 300px;
223+
width: 60%;
246224
margin-left: 10px;
247225
}
248226

@@ -323,3 +301,64 @@ pre.prettyprint {
323301
.well form {
324302
margin-bottom: 0;
325303
}
304+
305+
306+
.browser-support {
307+
max-width: 100%;
308+
}
309+
310+
/* Make tables spaced out a bit more */
311+
h2 + table {
312+
margin-top: 5px;
313+
}
314+
315+
/* Responsive Docs
316+
-------------------------------------------------- */
317+
@media (max-width: 480px) {
318+
319+
body > .navbar-fixed .nav {
320+
display: none;
321+
}
322+
323+
.large-bird {
324+
display: none;
325+
}
326+
327+
.jumbotron h1 {
328+
font-size: 36px;
329+
margin-right: 0;
330+
}
331+
.jumbotron p {
332+
margin-right: 0;
333+
font-size: 18px;
334+
line-height: 24px;
335+
}
336+
.jumbotron .benefits {
337+
position: relative;
338+
width: auto;
339+
margin: 36px 0;
340+
}
341+
}
342+
343+
@media (min-width: 768px) and (max-width: 900px) {
344+
.footer,
345+
.jumbotron {
346+
min-width: 748px;
347+
}
348+
}
349+
350+
351+
352+
.supported-devices {
353+
margin-bottom: 9px;
354+
color: #777;
355+
}
356+
.supported-devices strong {
357+
display: block;
358+
font-size: 14px;
359+
line-height: 18px;
360+
}
361+
.supported-devices small {
362+
font-size: 12px;
363+
}
364+

‎docs/assets/img/grid-18px-masked.png

1.58 KB
Loading

‎docs/assets/img/responsive-illustrations.png

2.2 KB
Loading

0 commit comments

Comments
 (0)