sass-twitter-bootstrap 2.2.1 → 2.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/sass/twitter/bootstrap/version.rb +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap-affix.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-alert.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-button.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-carousel.js +11 -2
- data/vendor/assets/javascripts/twitter/bootstrap-collapse.js +15 -4
- data/vendor/assets/javascripts/twitter/bootstrap-dropdown.js +16 -3
- data/vendor/assets/javascripts/twitter/bootstrap-modal.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-popover.js +14 -3
- data/vendor/assets/javascripts/twitter/bootstrap-scrollspy.js +13 -2
- data/vendor/assets/javascripts/twitter/bootstrap-tab.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-tooltip.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-transition.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap-typeahead.js +23 -10
- data/{lib → vendor/assets/stylesheets}/tests/buttons.html +3 -3
- data/vendor/assets/stylesheets/tests/css-tests.html +71 -22
- data/{lib → vendor/assets/stylesheets}/tests/forms-responsive.html +3 -3
- data/{lib → vendor/assets/stylesheets}/tests/navbar-fixed-top.html +3 -3
- data/{lib → vendor/assets/stylesheets}/tests/navbar-static-top.html +3 -3
- data/vendor/assets/stylesheets/tests/navbar.html +3 -3
- data/vendor/assets/stylesheets/twitter/_alerts.scss +14 -0
- data/vendor/assets/stylesheets/twitter/_breadcrumbs.scss +5 -5
- data/vendor/assets/stylesheets/twitter/_button-groups.scss +27 -42
- data/vendor/assets/stylesheets/twitter/_buttons.scss +5 -7
- data/vendor/assets/stylesheets/twitter/_carousel.scss +15 -15
- data/vendor/assets/stylesheets/twitter/_code.scss +3 -0
- data/vendor/assets/stylesheets/twitter/_dropdowns.scss +5 -9
- data/vendor/assets/stylesheets/twitter/_forms.scss +12 -8
- data/vendor/assets/stylesheets/twitter/_labels-badges.scss +25 -15
- data/{lib → vendor/assets/stylesheets/twitter}/_media.scss +0 -0
- data/vendor/assets/stylesheets/twitter/_mixins.scss +3 -3
- data/vendor/assets/stylesheets/twitter/_modals.scss +1 -1
- data/vendor/assets/stylesheets/twitter/_navbar.scss +22 -4
- data/vendor/assets/stylesheets/twitter/_navs.scss +6 -0
- data/vendor/assets/stylesheets/twitter/_popovers.scss +50 -38
- data/vendor/assets/stylesheets/twitter/_reset.scss +82 -4
- data/vendor/assets/stylesheets/twitter/_tables.scss +36 -35
- data/vendor/assets/stylesheets/twitter/_type.scss +29 -21
- data/vendor/assets/stylesheets/twitter/_variables.scss +7 -7
- data/vendor/assets/stylesheets/twitter/bootstrap.scss +1 -1
- data/vendor/assets/stylesheets/twitter/responsive.scss +10 -1
- metadata +66 -52
@@ -14,7 +14,6 @@
|
|
14
14
|
margin-bottom: 0; // For input.btn
|
15
15
|
font-size: $baseFontSize;
|
16
16
|
line-height: $baseLineHeight;
|
17
|
-
*line-height: $baseLineHeight;
|
18
17
|
text-align: center;
|
19
18
|
vertical-align: middle;
|
20
19
|
cursor: pointer;
|
@@ -30,8 +29,6 @@
|
|
30
29
|
&:hover {
|
31
30
|
color: $grayDark;
|
32
31
|
text-decoration: none;
|
33
|
-
background-color: darken($white, 10%);
|
34
|
-
*background-color: darken($white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
|
35
32
|
background-position: 0 -15px;
|
36
33
|
|
37
34
|
// transition is only when going to hover, otherwise the background
|
@@ -47,8 +44,6 @@
|
|
47
44
|
// Active state
|
48
45
|
&.active,
|
49
46
|
&:active {
|
50
|
-
background-color: darken($white, 10%);
|
51
|
-
background-color: darken($white, 15%) \9;
|
52
47
|
background-image: none;
|
53
48
|
outline: 0;
|
54
49
|
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
|
@@ -58,7 +53,6 @@
|
|
58
53
|
&.disabled,
|
59
54
|
&[disabled] {
|
60
55
|
cursor: default;
|
61
|
-
background-color: darken($white, 10%);
|
62
56
|
background-image: none;
|
63
57
|
@include opacity(65);
|
64
58
|
@include box-shadow(none);
|
@@ -79,7 +73,7 @@
|
|
79
73
|
}
|
80
74
|
.btn-large [class^="icon-"],
|
81
75
|
.btn-large [class*=" icon-"] {
|
82
|
-
margin-top:
|
76
|
+
margin-top: 4px;
|
83
77
|
}
|
84
78
|
|
85
79
|
// Small
|
@@ -92,6 +86,10 @@
|
|
92
86
|
.btn-small [class*=" icon-"] {
|
93
87
|
margin-top: 0;
|
94
88
|
}
|
89
|
+
.btn-mini [class^="icon-"],
|
90
|
+
.btn-mini [class*=" icon-"] {
|
91
|
+
margin-top: -1px;
|
92
|
+
}
|
95
93
|
|
96
94
|
// Mini
|
97
95
|
.btn-mini {
|
@@ -15,50 +15,50 @@
|
|
15
15
|
position: relative;
|
16
16
|
}
|
17
17
|
|
18
|
-
.carousel {
|
18
|
+
.carousel-inner {
|
19
19
|
|
20
|
-
.item {
|
20
|
+
> .item {
|
21
21
|
display: none;
|
22
22
|
position: relative;
|
23
23
|
@include transition(.6s ease-in-out left);
|
24
24
|
}
|
25
25
|
|
26
26
|
// Account for jankitude on images
|
27
|
-
.item > img {
|
27
|
+
> .item > img {
|
28
28
|
display: block;
|
29
29
|
line-height: 1;
|
30
30
|
}
|
31
31
|
|
32
|
-
.active,
|
33
|
-
.next,
|
34
|
-
.prev { display: block; }
|
32
|
+
> .active,
|
33
|
+
> .next,
|
34
|
+
> .prev { display: block; }
|
35
35
|
|
36
|
-
.active {
|
36
|
+
> .active {
|
37
37
|
left: 0;
|
38
38
|
}
|
39
39
|
|
40
|
-
.next,
|
41
|
-
.prev {
|
40
|
+
> .next,
|
41
|
+
> .prev {
|
42
42
|
position: absolute;
|
43
43
|
top: 0;
|
44
44
|
width: 100%;
|
45
45
|
}
|
46
46
|
|
47
|
-
.next {
|
47
|
+
> .next {
|
48
48
|
left: 100%;
|
49
49
|
}
|
50
|
-
.prev {
|
50
|
+
> .prev {
|
51
51
|
left: -100%;
|
52
52
|
}
|
53
|
-
.next.left,
|
54
|
-
.prev.right {
|
53
|
+
> .next.left,
|
54
|
+
> .prev.right {
|
55
55
|
left: 0;
|
56
56
|
}
|
57
57
|
|
58
|
-
.active.left {
|
58
|
+
> .active.left {
|
59
59
|
left: -100%;
|
60
60
|
}
|
61
|
-
.active.right {
|
61
|
+
> .active.right {
|
62
62
|
left: 100%;
|
63
63
|
}
|
64
64
|
|
@@ -19,6 +19,7 @@ code {
|
|
19
19
|
color: #d14;
|
20
20
|
background-color: #f7f7f9;
|
21
21
|
border: 1px solid #e1e1e8;
|
22
|
+
white-space: nowrap;
|
22
23
|
}
|
23
24
|
|
24
25
|
// Blocks of code
|
@@ -46,6 +47,8 @@ pre {
|
|
46
47
|
code {
|
47
48
|
padding: 0;
|
48
49
|
color: inherit;
|
50
|
+
white-space: pre;
|
51
|
+
white-space: pre-wrap;
|
49
52
|
background-color: transparent;
|
50
53
|
border: 0;
|
51
54
|
}
|
@@ -115,6 +115,7 @@
|
|
115
115
|
text-decoration: none;
|
116
116
|
background-color: transparent;
|
117
117
|
background-image: none; // Remove CSS gradient
|
118
|
+
@include reset-filter();
|
118
119
|
cursor: default;
|
119
120
|
}
|
120
121
|
|
@@ -168,9 +169,7 @@
|
|
168
169
|
left: 100%;
|
169
170
|
margin-top: -6px;
|
170
171
|
margin-left: -1px;
|
171
|
-
|
172
|
-
-moz-border-radius: 0 6px 6px 6px;
|
173
|
-
border-radius: 0 6px 6px 6px;
|
172
|
+
@include border-radius(0 6px 6px 6px);
|
174
173
|
}
|
175
174
|
.dropdown-submenu:hover > .dropdown-menu {
|
176
175
|
display: block;
|
@@ -182,9 +181,7 @@
|
|
182
181
|
bottom: 0;
|
183
182
|
margin-top: 0;
|
184
183
|
margin-bottom: -2px;
|
185
|
-
|
186
|
-
-moz-border-radius: 5px 5px 5px 0;
|
187
|
-
border-radius: 5px 5px 5px 0;
|
184
|
+
@include border-radius(5px 5px 5px 0);
|
188
185
|
}
|
189
186
|
|
190
187
|
// Caret to indicate there is a submenu
|
@@ -215,9 +212,7 @@
|
|
215
212
|
> .dropdown-menu {
|
216
213
|
left: -100%;
|
217
214
|
margin-left: 10px;
|
218
|
-
|
219
|
-
-moz-border-radius: 6px 0 6px 6px;
|
220
|
-
border-radius: 6px 0 6px 6px;
|
215
|
+
@include border-radius(6px 0 6px 6px);
|
221
216
|
}
|
222
217
|
}
|
223
218
|
|
@@ -232,6 +227,7 @@
|
|
232
227
|
// Typeahead
|
233
228
|
// ---------
|
234
229
|
.typeahead {
|
230
|
+
z-index: 1051;
|
235
231
|
margin-top: 2px; // give it some space to breathe
|
236
232
|
@include border-radius($baseBorderRadius);
|
237
233
|
}
|
@@ -138,7 +138,6 @@ input[type="checkbox"] {
|
|
138
138
|
*margin-top: 0; /* IE7 */
|
139
139
|
margin-top: 1px \9; /* IE8-9 */
|
140
140
|
line-height: normal;
|
141
|
-
cursor: pointer;
|
142
141
|
}
|
143
142
|
|
144
143
|
// Reset width of input images, buttons, radios, checkboxes
|
@@ -367,9 +366,9 @@ input[type="checkbox"][readonly] {
|
|
367
366
|
|
368
367
|
// HTML5 invalid states
|
369
368
|
// Shares styles with the .control-group.error above
|
370
|
-
input:focus:
|
371
|
-
textarea:focus:
|
372
|
-
select:focus:
|
369
|
+
input:focus:invalid,
|
370
|
+
textarea:focus:invalid,
|
371
|
+
select:focus:invalid {
|
373
372
|
color: #b94a48;
|
374
373
|
border-color: #ee5f5b;
|
375
374
|
&:focus {
|
@@ -462,7 +461,8 @@ select:focus:required:invalid {
|
|
462
461
|
border: 1px solid #ccc;
|
463
462
|
}
|
464
463
|
.add-on,
|
465
|
-
.btn
|
464
|
+
.btn,
|
465
|
+
.btn-group > .dropdown-toggle {
|
466
466
|
vertical-align: top;
|
467
467
|
@include border-radius(0);
|
468
468
|
}
|
@@ -489,7 +489,7 @@ select:focus:required:invalid {
|
|
489
489
|
select,
|
490
490
|
.uneditable-input {
|
491
491
|
@include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
|
492
|
-
+ .btn-group .btn {
|
492
|
+
+ .btn-group .btn:last-child {
|
493
493
|
@include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
|
494
494
|
}
|
495
495
|
}
|
@@ -499,7 +499,8 @@ select:focus:required:invalid {
|
|
499
499
|
margin-left: -1px;
|
500
500
|
}
|
501
501
|
.add-on:last-child,
|
502
|
-
.btn:last-child
|
502
|
+
.btn:last-child,
|
503
|
+
.btn-group:last-child > .dropdown-toggle {
|
503
504
|
@include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
|
504
505
|
}
|
505
506
|
}
|
@@ -670,7 +671,10 @@ legend + .control-group {
|
|
670
671
|
// And apply it only to .help-block instances that follow a form control
|
671
672
|
input,
|
672
673
|
select,
|
673
|
-
textarea
|
674
|
+
textarea,
|
675
|
+
.uneditable-input,
|
676
|
+
.input-prepend,
|
677
|
+
.input-append {
|
674
678
|
+ .help-block {
|
675
679
|
margin-top: $baseLineHeight / 2;
|
676
680
|
}
|
@@ -27,6 +27,14 @@
|
|
27
27
|
@include border-radius(9px);
|
28
28
|
}
|
29
29
|
|
30
|
+
// Empty labels/badges collapse
|
31
|
+
.label,
|
32
|
+
.badge {
|
33
|
+
&:empty {
|
34
|
+
display: none;
|
35
|
+
}
|
36
|
+
}
|
37
|
+
|
30
38
|
// Hover state, but only for links
|
31
39
|
a {
|
32
40
|
&.label:hover,
|
@@ -39,21 +47,23 @@ a {
|
|
39
47
|
|
40
48
|
// Colors
|
41
49
|
// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
50
|
+
@each $item in label, badge {
|
51
|
+
// Important (red)
|
52
|
+
.#{$item}-important { background-color: $errorText; }
|
53
|
+
.#{$item}-important[href] { background-color: darken($errorText, 10%); }
|
54
|
+
// Warnings (orange)
|
55
|
+
.#{$item}-warning { background-color: $orange; }
|
56
|
+
.#{$item}-warning[href] { background-color: darken($orange, 10%); }
|
57
|
+
// Success (green)
|
58
|
+
.#{$item}-success { background-color: $successText; }
|
59
|
+
.#{$item}-success[href] { background-color: darken($successText, 10%); }
|
60
|
+
// Info (turquoise)
|
61
|
+
.#{$item}-info { background-color: $infoText; }
|
62
|
+
.#{$item}-info[href] { background-color: darken($infoText, 10%); }
|
63
|
+
// Inverse (black)
|
64
|
+
.#{$item}-inverse { background-color: $grayDark; }
|
65
|
+
.#{$item}-inverse[href] { background-color: darken($grayDark, 10%); }
|
66
|
+
}
|
57
67
|
|
58
68
|
// Quick fix for labels/badges in buttons
|
59
69
|
.btn {
|
File without changes
|
@@ -111,6 +111,7 @@
|
|
111
111
|
border: 0;
|
112
112
|
}
|
113
113
|
|
114
|
+
|
114
115
|
// FONTS
|
115
116
|
// --------------------------------------------------
|
116
117
|
|
@@ -158,7 +159,7 @@
|
|
158
159
|
// Mixin for form field states
|
159
160
|
@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
|
160
161
|
// Set the text color
|
161
|
-
|
162
|
+
.control-label,
|
162
163
|
.help-block,
|
163
164
|
.help-inline {
|
164
165
|
color: $textColor;
|
@@ -256,7 +257,6 @@
|
|
256
257
|
-o-transition: $transition;
|
257
258
|
transition: $transition;
|
258
259
|
}
|
259
|
-
|
260
260
|
@mixin transition-delay($transition-delay) {
|
261
261
|
-webkit-transition-delay: $transition-delay;
|
262
262
|
-moz-transition-delay: $transition-delay;
|
@@ -413,7 +413,7 @@
|
|
413
413
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down
|
414
414
|
}
|
415
415
|
@mixin gradient-vertical($startColor: #555, $endColor: #333) {
|
416
|
-
background-color: mix($startColor, $endColor,
|
416
|
+
background-color: mix($startColor, $endColor, 60%);
|
417
417
|
background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+
|
418
418
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
|
419
419
|
background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
|
@@ -26,7 +26,6 @@
|
|
26
26
|
top: 50%;
|
27
27
|
left: 50%;
|
28
28
|
z-index: $zindexModal;
|
29
|
-
overflow: auto;
|
30
29
|
width: 560px;
|
31
30
|
margin: -250px 0 0 -280px;
|
32
31
|
background-color: $white;
|
@@ -59,6 +58,7 @@
|
|
59
58
|
|
60
59
|
// Body (where all modal content resides)
|
61
60
|
.modal-body {
|
61
|
+
position: relative;
|
62
62
|
overflow-y: auto;
|
63
63
|
max-height: 400px;
|
64
64
|
padding: 15px;
|
@@ -10,7 +10,6 @@
|
|
10
10
|
.navbar {
|
11
11
|
overflow: visible;
|
12
12
|
margin-bottom: $baseLineHeight;
|
13
|
-
color: $navbarText;
|
14
13
|
|
15
14
|
// Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
|
16
15
|
*position: relative;
|
@@ -67,6 +66,7 @@
|
|
67
66
|
.navbar-text {
|
68
67
|
margin-bottom: 0;
|
69
68
|
line-height: $navbarHeight;
|
69
|
+
color: $navbarText;
|
70
70
|
}
|
71
71
|
|
72
72
|
// Janky solution for now to account for links outside the .nav
|
@@ -123,7 +123,7 @@
|
|
123
123
|
}
|
124
124
|
.input-append,
|
125
125
|
.input-prepend {
|
126
|
-
margin-top:
|
126
|
+
margin-top: 5px;
|
127
127
|
white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left
|
128
128
|
input {
|
129
129
|
margin-top: 0; // remove the margin on top since it's on the parent
|
@@ -245,6 +245,7 @@
|
|
245
245
|
}
|
246
246
|
.navbar .nav .dropdown-toggle .caret {
|
247
247
|
margin-top: 8px;
|
248
|
+
|
248
249
|
}
|
249
250
|
|
250
251
|
// Hover
|
@@ -273,7 +274,7 @@
|
|
273
274
|
padding: 7px 10px;
|
274
275
|
margin-left: 5px;
|
275
276
|
margin-right: 5px;
|
276
|
-
@include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5
|
277
|
+
@include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5%));
|
277
278
|
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075));
|
278
279
|
}
|
279
280
|
.navbar .btn-navbar .icon-bar {
|
@@ -334,6 +335,12 @@
|
|
334
335
|
}
|
335
336
|
}
|
336
337
|
|
338
|
+
// Caret should match text color on hover
|
339
|
+
.navbar .nav li.dropdown > a:hover .caret {
|
340
|
+
border-top-color: $navbarLinkColorActive;
|
341
|
+
border-bottom-color: $navbarLinkColorActive;
|
342
|
+
}
|
343
|
+
|
337
344
|
// Remove background color from open dropdown
|
338
345
|
.navbar .nav li.dropdown.open > .dropdown-toggle,
|
339
346
|
.navbar .nav li.dropdown.active > .dropdown-toggle,
|
@@ -379,7 +386,6 @@
|
|
379
386
|
// -------------------------
|
380
387
|
|
381
388
|
.navbar-inverse {
|
382
|
-
color: $navbarInverseText;
|
383
389
|
|
384
390
|
.navbar-inner {
|
385
391
|
@include gradient-vertical($navbarInverseBackgroundHighlight, $navbarInverseBackground);
|
@@ -395,6 +401,14 @@
|
|
395
401
|
}
|
396
402
|
}
|
397
403
|
|
404
|
+
.brand {
|
405
|
+
color: $navbarInverseBrandColor;
|
406
|
+
}
|
407
|
+
|
408
|
+
.navbar-text {
|
409
|
+
color: $navbarInverseText;
|
410
|
+
}
|
411
|
+
|
398
412
|
.nav > li > a:focus,
|
399
413
|
.nav > li > a:hover {
|
400
414
|
background-color: $navbarInverseLinkBackgroundHover;
|
@@ -429,6 +443,10 @@
|
|
429
443
|
background-color: $navbarInverseLinkBackgroundActive;
|
430
444
|
color: $navbarInverseLinkColorActive;
|
431
445
|
}
|
446
|
+
.nav li.dropdown > a:hover .caret {
|
447
|
+
border-top-color: $navbarInverseLinkColorActive;
|
448
|
+
color: $navbarInverseLinkColorActive;
|
449
|
+
}
|
432
450
|
.nav li.dropdown > .dropdown-toggle .caret {
|
433
451
|
border-top-color: $navbarInverseLinkColor;
|
434
452
|
border-bottom-color: $navbarInverseLinkColor;
|
@@ -21,6 +21,12 @@
|
|
21
21
|
background-color: $grayLighter;
|
22
22
|
}
|
23
23
|
|
24
|
+
// Prevent IE8 from misplacing imgs
|
25
|
+
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
|
26
|
+
.nav > li > a > img {
|
27
|
+
max-width: none;
|
28
|
+
}
|
29
|
+
|
24
30
|
// Redeclare pull classes because of specifity
|
25
31
|
.nav > .pull-right {
|
26
32
|
float: right;
|