Skip to content

Commit 68cfedb

Browse files
fatfat
committed
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2 parents f113622 + bf10a43 commit 68cfedb

File tree

4 files changed

+92
-30
lines changed

4 files changed

+92
-30
lines changed

‎docs/assets/css/bootstrap.css

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,7 +2830,7 @@ table th[class*="span"],
28302830
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
28312831
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
28322832
background-repeat: repeat-x;
2833-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
2833+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
28342834
}
28352835

28362836
.dropdown-menu .active > a,
@@ -2845,7 +2845,7 @@ table th[class*="span"],
28452845
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
28462846
background-repeat: repeat-x;
28472847
outline: 0;
2848-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
2848+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
28492849
}
28502850

28512851
.dropdown-menu .disabled > a,
@@ -3073,8 +3073,8 @@ button.close {
30733073
-webkit-border-radius: 4px;
30743074
-moz-border-radius: 4px;
30753075
border-radius: 4px;
3076-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
3077-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3076+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
3077+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
30783078
*zoom: 1;
30793079
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
30803080
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -3224,8 +3224,8 @@ input[type="button"].btn-block {
32243224
background-repeat: repeat-x;
32253225
border-color: #0044cc #0044cc #002a80;
32263226
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3227-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
3228-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3227+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
3228+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
32293229
}
32303230

32313231
.btn-primary:hover,
@@ -3256,8 +3256,8 @@ input[type="button"].btn-block {
32563256
background-repeat: repeat-x;
32573257
border-color: #f89406 #f89406 #ad6704;
32583258
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3259-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
3260-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3259+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
3260+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
32613261
}
32623262

32633263
.btn-warning:hover,
@@ -3288,8 +3288,8 @@ input[type="button"].btn-block {
32883288
background-repeat: repeat-x;
32893289
border-color: #bd362f #bd362f #802420;
32903290
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3291-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
3292-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3291+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
3292+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
32933293
}
32943294

32953295
.btn-danger:hover,
@@ -3320,8 +3320,8 @@ input[type="button"].btn-block {
33203320
background-repeat: repeat-x;
33213321
border-color: #51a351 #51a351 #387038;
33223322
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3323-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
3324-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3323+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
3324+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
33253325
}
33263326

33273327
.btn-success:hover,
@@ -3352,8 +3352,8 @@ input[type="button"].btn-block {
33523352
background-repeat: repeat-x;
33533353
border-color: #2f96b4 #2f96b4 #1f6377;
33543354
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3355-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
3356-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3355+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
3356+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
33573357
}
33583358

33593359
.btn-info:hover,
@@ -3384,8 +3384,8 @@ input[type="button"].btn-block {
33843384
background-repeat: repeat-x;
33853385
border-color: #222222 #222222 #000000;
33863386
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3387-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
3388-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3387+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
3388+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
33893389
}
33903390

33913391
.btn-inverse:hover,
@@ -4188,7 +4188,7 @@ input[type="submit"].btn.btn-mini {
41884188
-webkit-border-radius: 4px;
41894189
-moz-border-radius: 4px;
41904190
border-radius: 4px;
4191-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
4191+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
41924192
*zoom: 1;
41934193
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
41944194
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
@@ -4457,8 +4457,8 @@ input[type="submit"].btn.btn-mini {
44574457
background-repeat: repeat-x;
44584458
border-color: #e5e5e5 #e5e5e5 #bfbfbf;
44594459
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
4460-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
4461-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
4460+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
4461+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
44624462
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
44634463
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
44644464
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -4595,7 +4595,7 @@ input[type="submit"].btn.btn-mini {
45954595
background-image: linear-gradient(to bottom, #222222, #111111);
45964596
background-repeat: repeat-x;
45974597
border-color: #252525;
4598-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
4598+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
45994599
}
46004600

46014601
.navbar-inverse .brand,
@@ -4705,8 +4705,8 @@ input[type="submit"].btn.btn-mini {
47054705
background-repeat: repeat-x;
47064706
border-color: #040404 #040404 #000000;
47074707
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
4708-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
4709-
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
4708+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
4709+
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
47104710
}
47114711

47124712
.navbar-inverse .btn-navbar:hover,
@@ -4981,11 +4981,10 @@ input[type="submit"].btn.btn-mini {
49814981
border: 1px solid #999;
49824982
border: 1px solid rgba(0, 0, 0, 0.3);
49834983
*border: 1px solid #999;
4984-
/* IE6-7 */
4985-
49864984
-webkit-border-radius: 6px;
49874985
-moz-border-radius: 6px;
49884986
border-radius: 6px;
4987+
outline: none;
49894988
-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
49904989
-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
49914990
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
@@ -5544,7 +5543,7 @@ a.badge:hover {
55445543
-webkit-border-radius: 4px;
55455544
-moz-border-radius: 4px;
55465545
border-radius: 4px;
5547-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
5546+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
55485547
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
55495548
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
55505549
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
@@ -5565,7 +5564,7 @@ a.badge:hover {
55655564
background-image: -o-linear-gradient(top, #149bdf, #0480be);
55665565
background-image: linear-gradient(to bottom, #149bdf, #0480be);
55675566
background-repeat: repeat-x;
5568-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
5567+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
55695568
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
55705569
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
55715570
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
@@ -5614,7 +5613,7 @@ a.badge:hover {
56145613
background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
56155614
background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
56165615
background-repeat: repeat-x;
5617-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
5616+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
56185617
}
56195618

56205619
.progress-danger.progress-striped .bar,
@@ -5636,7 +5635,7 @@ a.badge:hover {
56365635
background-image: -o-linear-gradient(top, #62c462, #57a957);
56375636
background-image: linear-gradient(to bottom, #62c462, #57a957);
56385637
background-repeat: repeat-x;
5639-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
5638+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
56405639
}
56415640

56425641
.progress-success.progress-striped .bar,
@@ -5658,7 +5657,7 @@ a.badge:hover {
56585657
background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
56595658
background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
56605659
background-repeat: repeat-x;
5661-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
5660+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
56625661
}
56635662

56645663
.progress-info.progress-striped .bar,
@@ -5680,7 +5679,7 @@ a.badge:hover {
56805679
background-image: -o-linear-gradient(top, #fbb450, #f89406);
56815680
background-image: linear-gradient(to bottom, #fbb450, #f89406);
56825681
background-repeat: repeat-x;
5683-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
5682+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
56845683
}
56855684

56865685
.progress-warning.progress-striped .bar,

‎docs/customize.html

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ <h3>Components</h3>
133133
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
134134
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
135135
<label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label>
136+
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media component</label>
136137
<h3>JS Components</h3>
137138
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
138139
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
@@ -298,12 +299,14 @@ <h3>Typography</h3>
298299
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
299300
<label>@monoFontFamily</label>
300301
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
302+
301303
<label>@baseFontSize</label>
302304
<input type="text" class="span3" placeholder="14px">
303305
<label>@baseFontFamily</label>
304306
<input type="text" class="span3" placeholder="@sansFontFamily">
305307
<label>@baseLineHeight</label>
306308
<input type="text" class="span3" placeholder="20px">
309+
307310
<label>@altFontFamily</label>
308311
<input type="text" class="span3" placeholder="@serifFontFamily">
309312
<label>@headingsFontFamily</label>
@@ -312,6 +315,28 @@ <h3>Typography</h3>
312315
<input type="text" class="span3" placeholder="bold">
313316
<label>@headingsColor</label>
314317
<input type="text" class="span3" placeholder="inherit">
318+
319+
<label>@fontSizeLarge</label>
320+
<input type="text" class="span3" placeholder="@baseFontSize * 1.25">
321+
<label>@fontSizeSmall</label>
322+
<input type="text" class="span3" placeholder="@baseFontSize * 0.85">
323+
<label>@fontSizeMini</label>
324+
<input type="text" class="span3" placeholder="@baseFontSize * 0.75">
325+
326+
<label>@paddingLarge</label>
327+
<input type="text" class="span3" placeholder="11px 19px">
328+
<label>@paddingSmall</label>
329+
<input type="text" class="span3" placeholder="2px 10px">
330+
<label>@paddingMini</label>
331+
<input type="text" class="span3" placeholder="1px 6px">
332+
333+
<label>@baseBorderRadius</label>
334+
<input type="text" class="span3" placeholder="4px">
335+
<label>@borderRadiusLarge</label>
336+
<input type="text" class="span3" placeholder="6px">
337+
<label>@borderRadiusSmall</label>
338+
<input type="text" class="span3" placeholder="3px">
339+
315340
<label>@heroUnitBackground</label>
316341
<input type="text" class="span3" placeholder="@grayLighter">
317342
<label>@heroUnitHeadingColor</label>
@@ -398,6 +423,11 @@ <h3>Navbar</h3>
398423
<label>@navbarSearchPlaceholderColor</label>
399424
<input type="text" class="span3" placeholder="#ccc">
400425

426+
<label>@navbarCollapseWidth</label>
427+
<input type="text" class="span3" placeholder="979px">
428+
<label>@navbarCollapseDesktopWidth</label>
429+
<input type="text" class="span3" placeholder="@navbarCollapseWidth + 1">
430+
401431
<h3>Dropdowns</h3>
402432
<label>@dropdownBackground</label>
403433
<input type="text" class="span3" placeholder="@white">

‎docs/templates/pages/customize.mustache

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> {{_i}}Alerts{{/i}}</label>
6363
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> {{_i}}Progress bars{{/i}}</label>
6464
<label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> {{_i}}Hero unit{{/i}}</label>
65+
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> {{_i}}Media component{{/i}}</label>
6566
<h3>{{_i}}JS Components{{/i}}</h3>
6667
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> {{_i}}Tooltips{{/i}}</label>
6768
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> {{_i}}Popovers{{/i}}</label>
@@ -227,12 +228,14 @@
227228
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
228229
<label>@monoFontFamily</label>
229230
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
231+
230232
<label>@baseFontSize</label>
231233
<input type="text" class="span3" placeholder="14px">
232234
<label>@baseFontFamily</label>
233235
<input type="text" class="span3" placeholder="@sansFontFamily">
234236
<label>@baseLineHeight</label>
235237
<input type="text" class="span3" placeholder="20px">
238+
236239
<label>@altFontFamily</label>
237240
<input type="text" class="span3" placeholder="@serifFontFamily">
238241
<label>@headingsFontFamily</label>
@@ -241,6 +244,28 @@
241244
<input type="text" class="span3" placeholder="bold">
242245
<label>@headingsColor</label>
243246
<input type="text" class="span3" placeholder="inherit">
247+
248+
<label>@fontSizeLarge</label>
249+
<input type="text" class="span3" placeholder="@baseFontSize * 1.25">
250+
<label>@fontSizeSmall</label>
251+
<input type="text" class="span3" placeholder="@baseFontSize * 0.85">
252+
<label>@fontSizeMini</label>
253+
<input type="text" class="span3" placeholder="@baseFontSize * 0.75">
254+
255+
<label>@paddingLarge</label>
256+
<input type="text" class="span3" placeholder="11px 19px">
257+
<label>@paddingSmall</label>
258+
<input type="text" class="span3" placeholder="2px 10px">
259+
<label>@paddingMini</label>
260+
<input type="text" class="span3" placeholder="1px 6px">
261+
262+
<label>@baseBorderRadius</label>
263+
<input type="text" class="span3" placeholder="4px">
264+
<label>@borderRadiusLarge</label>
265+
<input type="text" class="span3" placeholder="6px">
266+
<label>@borderRadiusSmall</label>
267+
<input type="text" class="span3" placeholder="3px">
268+
244269
<label>@heroUnitBackground</label>
245270
<input type="text" class="span3" placeholder="@grayLighter">
246271
<label>@heroUnitHeadingColor</label>
@@ -327,6 +352,11 @@
327352
<label>@navbarSearchPlaceholderColor</label>
328353
<input type="text" class="span3" placeholder="#ccc">
329354

355+
<label>@navbarCollapseWidth</label>
356+
<input type="text" class="span3" placeholder="979px">
357+
<label>@navbarCollapseDesktopWidth</label>
358+
<input type="text" class="span3" placeholder="@navbarCollapseWidth + 1">
359+
330360
<h3>{{_i}}Dropdowns{{/i}}</h3>
331361
<label>@dropdownBackground</label>
332362
<input type="text" class="span3" placeholder="@white">

‎less/modals.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
.border-radius(6px);
3636
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
3737
.background-clip(padding-box);
38+
// Remove focus outline from opened modal
39+
outline: none;
40+
3841
&.fade {
3942
.transition(e('opacity .3s linear, top .3s ease-out'));
4043
top: -25%;

0 commit comments

Comments
 (0)