bootstrap-generators 2.0.4 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +211 -63
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +102 -28
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +104 -31
- data/vendor/assets/images/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/bootstrap-affix.js +104 -0
- data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
- data/vendor/assets/javascripts/bootstrap-button.js +2 -2
- data/vendor/assets/javascripts/bootstrap-carousel.js +12 -5
- data/vendor/assets/javascripts/bootstrap-collapse.js +4 -3
- data/vendor/assets/javascripts/bootstrap-dropdown.js +66 -16
- data/vendor/assets/javascripts/bootstrap-modal.js +95 -74
- data/vendor/assets/javascripts/bootstrap-popover.js +9 -4
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +9 -9
- data/vendor/assets/javascripts/bootstrap-tab.js +2 -2
- data/vendor/assets/javascripts/bootstrap-tooltip.js +15 -15
- data/vendor/assets/javascripts/bootstrap-transition.js +2 -3
- data/vendor/assets/javascripts/bootstrap-typeahead.js +51 -36
- data/vendor/assets/javascripts/bootstrap.js +1 -1
- data/vendor/assets/stylesheets/bootstrap-responsive.css +1058 -0
- data/vendor/assets/stylesheets/bootstrap-responsive.min.css +9 -0
- data/vendor/assets/stylesheets/bootstrap.css +5774 -0
- data/vendor/assets/stylesheets/bootstrap.min.css +9 -0
- data/vendor/twitter/bootstrap/less/accordion.less +3 -2
- data/vendor/twitter/bootstrap/less/alerts.less +16 -9
- data/vendor/twitter/bootstrap/less/bootstrap.less +1 -1
- data/vendor/twitter/bootstrap/less/breadcrumbs.less +10 -10
- data/vendor/twitter/bootstrap/less/button-groups.less +79 -25
- data/vendor/twitter/bootstrap/less/buttons.less +107 -67
- data/vendor/twitter/bootstrap/less/carousel.less +13 -3
- data/vendor/twitter/bootstrap/less/close.less +4 -2
- data/vendor/twitter/bootstrap/less/code.less +6 -5
- data/vendor/twitter/bootstrap/less/component-animations.less +4 -2
- data/vendor/twitter/bootstrap/less/dropdowns.less +82 -15
- data/vendor/twitter/bootstrap/less/forms.less +124 -57
- data/vendor/twitter/bootstrap/less/grid.less +17 -1
- data/vendor/twitter/bootstrap/less/hero-unit.less +4 -2
- data/vendor/twitter/bootstrap/less/labels-badges.less +19 -2
- data/vendor/twitter/bootstrap/less/layouts.less +1 -2
- data/vendor/twitter/bootstrap/less/mixins.less +112 -77
- data/vendor/twitter/bootstrap/less/modals.less +12 -4
- data/vendor/twitter/bootstrap/less/navbar.less +245 -128
- data/vendor/twitter/bootstrap/less/navs.less +38 -17
- data/vendor/twitter/bootstrap/less/pager.less +11 -7
- data/vendor/twitter/bootstrap/less/pagination.less +23 -15
- data/vendor/twitter/bootstrap/less/popovers.less +101 -33
- data/vendor/twitter/bootstrap/less/progress-bars.less +18 -13
- data/vendor/twitter/bootstrap/less/reset.less +10 -4
- data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +9 -7
- data/vendor/twitter/bootstrap/less/responsive-767px-max.less +95 -70
- data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +7 -5
- data/vendor/twitter/bootstrap/less/responsive-navbar.less +30 -6
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +17 -15
- data/vendor/twitter/bootstrap/less/responsive.less +5 -5
- data/vendor/twitter/bootstrap/less/scaffolding.less +27 -4
- data/vendor/twitter/bootstrap/less/sprites.less +21 -19
- data/vendor/twitter/bootstrap/less/tables.less +81 -12
- data/vendor/twitter/bootstrap/less/thumbnails.less +9 -4
- data/vendor/twitter/bootstrap/less/tooltip.less +47 -12
- data/vendor/twitter/bootstrap/less/type.less +75 -86
- data/vendor/twitter/bootstrap/less/utilities.less +9 -2
- data/vendor/twitter/bootstrap/less/variables.less +104 -31
- data/vendor/twitter/bootstrap/less/wells.less +7 -5
- data/vendor/twitter/bootstrap/sass/_accordion.scss +3 -2
- data/vendor/twitter/bootstrap/sass/_alerts.scss +15 -8
- data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +10 -10
- data/vendor/twitter/bootstrap/sass/_button-groups.scss +77 -23
- data/vendor/twitter/bootstrap/sass/_buttons.scss +106 -66
- data/vendor/twitter/bootstrap/sass/_carousel.scss +13 -3
- data/vendor/twitter/bootstrap/sass/_close.scss +5 -3
- data/vendor/twitter/bootstrap/sass/_code.scss +7 -6
- data/vendor/twitter/bootstrap/sass/_component-animations.scss +5 -3
- data/vendor/twitter/bootstrap/sass/_dropdowns.scss +85 -18
- data/vendor/twitter/bootstrap/sass/_forms.scss +121 -53
- data/vendor/twitter/bootstrap/sass/_grid.scss +17 -1
- data/vendor/twitter/bootstrap/sass/_hero-unit.scss +4 -2
- data/vendor/twitter/bootstrap/sass/_labels-badges.scss +29 -12
- data/vendor/twitter/bootstrap/sass/_layouts.scss +2 -3
- data/vendor/twitter/bootstrap/sass/_mixins.scss +163 -127
- data/vendor/twitter/bootstrap/sass/_modals.scss +12 -4
- data/vendor/twitter/bootstrap/sass/_navbar.scss +243 -127
- data/vendor/twitter/bootstrap/sass/_navs.scss +36 -15
- data/vendor/twitter/bootstrap/sass/_pager.scss +12 -8
- data/vendor/twitter/bootstrap/sass/_pagination.scss +23 -15
- data/vendor/twitter/bootstrap/sass/_popovers.scss +101 -33
- data/vendor/twitter/bootstrap/sass/_progress-bars.scss +18 -13
- data/vendor/twitter/bootstrap/sass/_reset.scss +8 -3
- data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +9 -7
- data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +95 -70
- data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +8 -6
- data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +29 -5
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +32 -15
- data/vendor/twitter/bootstrap/sass/_scaffolding.scss +29 -4
- data/vendor/twitter/bootstrap/sass/_sprites.scss +21 -19
- data/vendor/twitter/bootstrap/sass/_tables.scss +79 -11
- data/vendor/twitter/bootstrap/sass/_thumbnails.scss +9 -4
- data/vendor/twitter/bootstrap/sass/_tooltip.scss +47 -12
- data/vendor/twitter/bootstrap/sass/_type.scss +74 -85
- data/vendor/twitter/bootstrap/sass/_utilities.scss +24 -2
- data/vendor/twitter/bootstrap/sass/_variables.scss +102 -28
- data/vendor/twitter/bootstrap/sass/_wells.scss +7 -5
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +1 -1
- data/vendor/twitter/bootstrap/sass/responsive.scss +5 -5
- metadata +15 -10
@@ -1,6 +1,6 @@
|
|
1
|
-
//
|
2
|
-
//
|
3
|
-
|
1
|
+
//
|
2
|
+
// Navs
|
3
|
+
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
6
|
// BASE CLASS
|
@@ -27,7 +27,7 @@
|
|
27
27
|
}
|
28
28
|
|
29
29
|
// Nav headers (for dropdowns and lists)
|
30
|
-
.nav
|
30
|
+
.nav-header {
|
31
31
|
display: block;
|
32
32
|
padding: 3px 15px;
|
33
33
|
font-size: 11px;
|
@@ -43,6 +43,7 @@
|
|
43
43
|
}
|
44
44
|
|
45
45
|
|
46
|
+
|
46
47
|
// NAV LIST
|
47
48
|
// --------
|
48
49
|
|
@@ -170,10 +171,10 @@
|
|
170
171
|
@include border-radius(0);
|
171
172
|
}
|
172
173
|
.nav-tabs.nav-stacked > li:first-child > a {
|
173
|
-
@include border-radius(4px
|
174
|
+
@include border-top-radius(4px);
|
174
175
|
}
|
175
176
|
.nav-tabs.nav-stacked > li:last-child > a {
|
176
|
-
@include border-radius(
|
177
|
+
@include border-bottom-radius(4px);
|
177
178
|
}
|
178
179
|
.nav-tabs.nav-stacked > li > a:hover {
|
179
180
|
border-color: #ddd;
|
@@ -194,39 +195,43 @@
|
|
194
195
|
// ---------
|
195
196
|
|
196
197
|
.nav-tabs .dropdown-menu {
|
197
|
-
@include border-radius(0 0
|
198
|
+
@include border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
|
198
199
|
}
|
199
200
|
.nav-pills .dropdown-menu {
|
200
|
-
@include border-radius(
|
201
|
+
@include border-radius(6px); // make rounded corners match the pills
|
201
202
|
}
|
202
203
|
|
203
204
|
// Default dropdown links
|
204
205
|
// -------------------------
|
205
206
|
// Make carets use linkColor to start
|
206
|
-
.nav
|
207
|
-
.nav-pills .dropdown-toggle .caret {
|
207
|
+
.nav .dropdown-toggle .caret {
|
208
208
|
border-top-color: $linkColor;
|
209
209
|
border-bottom-color: $linkColor;
|
210
210
|
margin-top: 6px;
|
211
211
|
}
|
212
|
-
.nav
|
213
|
-
.nav-pills .dropdown-toggle:hover .caret {
|
212
|
+
.nav .dropdown-toggle:hover .caret {
|
214
213
|
border-top-color: $linkColorHover;
|
215
214
|
border-bottom-color: $linkColorHover;
|
216
215
|
}
|
216
|
+
/* move down carets for tabs */
|
217
|
+
.nav-tabs .dropdown-toggle .caret {
|
218
|
+
margin-top: 8px;
|
219
|
+
}
|
217
220
|
|
218
221
|
// Active dropdown links
|
219
222
|
// -------------------------
|
220
|
-
.nav
|
221
|
-
.nav-pills .active .dropdown-toggle .caret {
|
223
|
+
.nav .active .dropdown-toggle .caret {
|
222
224
|
border-top-color: $grayDark;
|
223
225
|
border-bottom-color: $grayDark;
|
224
226
|
}
|
227
|
+
.nav-tabs .active .dropdown-toggle .caret {
|
228
|
+
border-top-color: $gray;
|
229
|
+
border-bottom-color: $gray;
|
230
|
+
}
|
225
231
|
|
226
232
|
// Active:hover dropdown links
|
227
233
|
// -------------------------
|
228
234
|
.nav > .dropdown.active > a:hover {
|
229
|
-
color: $black;
|
230
235
|
cursor: pointer;
|
231
236
|
}
|
232
237
|
|
@@ -361,3 +366,19 @@
|
|
361
366
|
border-color: #ddd #ddd #ddd transparent;
|
362
367
|
*border-left-color: $white;
|
363
368
|
}
|
369
|
+
|
370
|
+
|
371
|
+
|
372
|
+
// DISABLED STATES
|
373
|
+
// ---------------
|
374
|
+
|
375
|
+
// Gray out text
|
376
|
+
.nav > .disabled > a {
|
377
|
+
color: $grayLight;
|
378
|
+
}
|
379
|
+
// Nuke hover effects
|
380
|
+
.nav > .disabled > a:hover {
|
381
|
+
text-decoration: none;
|
382
|
+
background-color: transparent;
|
383
|
+
cursor: default;
|
384
|
+
}
|
@@ -1,9 +1,10 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Pager pagination
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
.pager {
|
5
|
-
margin
|
6
|
-
margin-bottom: $baseLineHeight;
|
7
|
+
margin: $baseLineHeight 0;
|
7
8
|
list-style: none;
|
8
9
|
text-align: center;
|
9
10
|
@include clearfix();
|
@@ -11,7 +12,8 @@
|
|
11
12
|
.pager li {
|
12
13
|
display: inline;
|
13
14
|
}
|
14
|
-
.pager a
|
15
|
+
.pager a,
|
16
|
+
.pager span {
|
15
17
|
display: inline-block;
|
16
18
|
padding: 5px 14px;
|
17
19
|
background-color: #fff;
|
@@ -22,15 +24,17 @@
|
|
22
24
|
text-decoration: none;
|
23
25
|
background-color: #f5f5f5;
|
24
26
|
}
|
25
|
-
.pager .next a
|
27
|
+
.pager .next a,
|
28
|
+
.pager .next span {
|
26
29
|
float: right;
|
27
30
|
}
|
28
31
|
.pager .previous a {
|
29
32
|
float: left;
|
30
33
|
}
|
31
34
|
.pager .disabled a,
|
32
|
-
.pager .disabled a:hover
|
35
|
+
.pager .disabled a:hover,
|
36
|
+
.pager .disabled span {
|
33
37
|
color: $grayLight;
|
34
38
|
background-color: #fff;
|
35
39
|
cursor: default;
|
36
|
-
}
|
40
|
+
}
|
@@ -1,5 +1,7 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Pagination (multiple pages)
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
.pagination {
|
5
7
|
height: $baseLineHeight * 2;
|
@@ -13,37 +15,43 @@
|
|
13
15
|
@include border-radius(3px);
|
14
16
|
@include box-shadow(0 1px 2px rgba(0,0,0,.05));
|
15
17
|
}
|
16
|
-
.pagination li {
|
17
|
-
|
18
|
-
|
19
|
-
.pagination a
|
18
|
+
.pagination ul > li {
|
19
|
+
display: inline;
|
20
|
+
}
|
21
|
+
.pagination ul > li > a,
|
22
|
+
.pagination ul > li > span {
|
20
23
|
float: left;
|
21
24
|
padding: 0 14px;
|
22
25
|
line-height: ($baseLineHeight * 2) - 2;
|
23
26
|
text-decoration: none;
|
24
|
-
|
27
|
+
background-color: $paginationBackground;
|
28
|
+
border: 1px solid $paginationBorder;
|
25
29
|
border-left-width: 0;
|
26
30
|
}
|
27
|
-
.pagination a:hover,
|
28
|
-
.pagination .active a
|
31
|
+
.pagination ul > li > a:hover,
|
32
|
+
.pagination ul > .active > a,
|
33
|
+
.pagination ul > .active > span {
|
29
34
|
background-color: #f5f5f5;
|
30
35
|
}
|
31
|
-
.pagination .active a
|
36
|
+
.pagination ul > .active > a,
|
37
|
+
.pagination ul > .active > span {
|
32
38
|
color: $grayLight;
|
33
39
|
cursor: default;
|
34
40
|
}
|
35
|
-
.pagination .disabled span,
|
36
|
-
.pagination .disabled a,
|
37
|
-
.pagination .disabled a:hover {
|
41
|
+
.pagination ul > .disabled > span,
|
42
|
+
.pagination ul > .disabled > a,
|
43
|
+
.pagination ul > .disabled > a:hover {
|
38
44
|
color: $grayLight;
|
39
45
|
background-color: transparent;
|
40
46
|
cursor: default;
|
41
47
|
}
|
42
|
-
.pagination li:first-child a
|
48
|
+
.pagination ul > li:first-child > a,
|
49
|
+
.pagination ul > li:first-child > span {
|
43
50
|
border-left-width: 1px;
|
44
51
|
@include border-radius(3px 0 0 3px);
|
45
52
|
}
|
46
|
-
.pagination li:last-child a
|
53
|
+
.pagination ul > li:last-child > a,
|
54
|
+
.pagination ul > li:last-child > span {
|
47
55
|
@include border-radius(0 3px 3px 0);
|
48
56
|
}
|
49
57
|
|
@@ -1,5 +1,7 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Popovers
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
.popover {
|
5
7
|
position: absolute;
|
@@ -7,43 +9,109 @@
|
|
7
9
|
left: 0;
|
8
10
|
z-index: $zindexPopover;
|
9
11
|
display: none;
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
&.left .arrow { @include popoverArrow-left(); }
|
19
|
-
.arrow {
|
20
|
-
position: absolute;
|
21
|
-
width: 0;
|
22
|
-
height: 0;
|
23
|
-
}
|
24
|
-
}
|
25
|
-
.popover-inner {
|
26
|
-
padding: 3px;
|
27
|
-
width: 280px;
|
28
|
-
overflow: hidden;
|
29
|
-
background: $black; // has to be full background declaration for IE fallback
|
30
|
-
background: rgba(0,0,0,.8);
|
12
|
+
width: 236px;
|
13
|
+
padding: 1px;
|
14
|
+
background-color: $popoverBackground;
|
15
|
+
-webkit-background-clip: padding-box;
|
16
|
+
-moz-background-clip: padding;
|
17
|
+
background-clip: padding-box;
|
18
|
+
border: 1px solid #ccc;
|
19
|
+
border: 1px solid rgba(0,0,0,.2);
|
31
20
|
@include border-radius(6px);
|
32
|
-
@include box-shadow(0
|
21
|
+
@include box-shadow(0 5px 10px rgba(0,0,0,.2));
|
22
|
+
|
23
|
+
// Offset the popover to account for the popover arrow
|
24
|
+
&.top { margin-bottom: 10px; }
|
25
|
+
&.right { margin-left: 10px; }
|
26
|
+
&.bottom { margin-top: 10px; }
|
27
|
+
&.left { margin-right: 10px; }
|
28
|
+
|
33
29
|
}
|
30
|
+
|
34
31
|
.popover-title {
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
32
|
+
margin: 0; // reset heading margin
|
33
|
+
padding: 8px 14px;
|
34
|
+
font-size: 14px;
|
35
|
+
font-weight: normal;
|
36
|
+
line-height: 18px;
|
37
|
+
background-color: $popoverTitleBackground;
|
38
|
+
border-bottom: 1px solid darken($popoverTitleBackground, 5%);
|
39
|
+
@include border-radius(5px 5px 0 0);
|
40
40
|
}
|
41
|
+
|
41
42
|
.popover-content {
|
42
|
-
padding: 14px;
|
43
|
-
background-color: $white;
|
44
|
-
@include border-radius(0 0 3px 3px);
|
45
|
-
@include background-clip(padding-box);
|
43
|
+
padding: 9px 14px;
|
46
44
|
p, ul, ol {
|
47
45
|
margin-bottom: 0;
|
48
46
|
}
|
49
47
|
}
|
48
|
+
|
49
|
+
// Arrows
|
50
|
+
.popover .arrow,
|
51
|
+
.popover .arrow:after {
|
52
|
+
position: absolute;
|
53
|
+
display: inline-block;
|
54
|
+
width: 0;
|
55
|
+
height: 0;
|
56
|
+
border-color: transparent;
|
57
|
+
border-style: solid;
|
58
|
+
}
|
59
|
+
.popover .arrow:after {
|
60
|
+
content: "";
|
61
|
+
z-index: -1;
|
62
|
+
}
|
63
|
+
|
64
|
+
.popover {
|
65
|
+
&.top .arrow {
|
66
|
+
bottom: -$popoverArrowWidth;
|
67
|
+
left: 50%;
|
68
|
+
margin-left: -$popoverArrowWidth;
|
69
|
+
border-width: $popoverArrowWidth $popoverArrowWidth 0;
|
70
|
+
border-top-color: $popoverArrowColor;
|
71
|
+
&:after {
|
72
|
+
border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth 0;
|
73
|
+
border-top-color: $popoverArrowOuterColor;
|
74
|
+
bottom: -1px;
|
75
|
+
left: -$popoverArrowOuterWidth;
|
76
|
+
}
|
77
|
+
}
|
78
|
+
&.right .arrow {
|
79
|
+
top: 50%;
|
80
|
+
left: -$popoverArrowWidth;
|
81
|
+
margin-top: -$popoverArrowWidth;
|
82
|
+
border-width: $popoverArrowWidth $popoverArrowWidth $popoverArrowWidth 0;
|
83
|
+
border-right-color: $popoverArrowColor;
|
84
|
+
&:after {
|
85
|
+
border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth $popoverArrowOuterWidth 0;
|
86
|
+
border-right-color: $popoverArrowOuterColor;
|
87
|
+
bottom: -$popoverArrowOuterWidth;
|
88
|
+
left: -1px;
|
89
|
+
}
|
90
|
+
}
|
91
|
+
&.bottom .arrow {
|
92
|
+
top: -$popoverArrowWidth;
|
93
|
+
left: 50%;
|
94
|
+
margin-left: -$popoverArrowWidth;
|
95
|
+
border-width: 0 $popoverArrowWidth $popoverArrowWidth;
|
96
|
+
border-bottom-color: $popoverArrowColor;
|
97
|
+
&:after {
|
98
|
+
border-width: 0 $popoverArrowOuterWidth $popoverArrowOuterWidth;
|
99
|
+
border-bottom-color: $popoverArrowOuterColor;
|
100
|
+
top: -1px;
|
101
|
+
left: -$popoverArrowOuterWidth;
|
102
|
+
}
|
103
|
+
}
|
104
|
+
&.left .arrow {
|
105
|
+
top: 50%;
|
106
|
+
right: -$popoverArrowWidth;
|
107
|
+
margin-top: -$popoverArrowWidth;
|
108
|
+
border-width: $popoverArrowWidth 0 $popoverArrowWidth $popoverArrowWidth;
|
109
|
+
border-left-color: $popoverArrowColor;
|
110
|
+
&:after {
|
111
|
+
border-width: $popoverArrowOuterWidth 0 $popoverArrowOuterWidth $popoverArrowOuterWidth;
|
112
|
+
border-left-color: $popoverArrowOuterColor;
|
113
|
+
bottom: -$popoverArrowOuterWidth;
|
114
|
+
right: -1px;
|
115
|
+
}
|
116
|
+
}
|
117
|
+
}
|
@@ -1,5 +1,6 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Progress bars
|
3
|
+
// --------------------------------------------------
|
3
4
|
|
4
5
|
|
5
6
|
// ANIMATIONS
|
@@ -43,8 +44,8 @@
|
|
43
44
|
// Outer container
|
44
45
|
.progress {
|
45
46
|
overflow: hidden;
|
46
|
-
height:
|
47
|
-
margin-bottom:
|
47
|
+
height: $baseLineHeight;
|
48
|
+
margin-bottom: $baseLineHeight;
|
48
49
|
@include gradient-vertical(#f5f5f5, #f9f9f9);
|
49
50
|
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
|
50
51
|
@include border-radius(4px);
|
@@ -53,8 +54,9 @@
|
|
53
54
|
// Bar of progress
|
54
55
|
.progress .bar {
|
55
56
|
width: 0%;
|
56
|
-
height:
|
57
|
+
height: 100%;
|
57
58
|
color: $white;
|
59
|
+
float: left;
|
58
60
|
font-size: 12px;
|
59
61
|
text-align: center;
|
60
62
|
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
@@ -63,6 +65,9 @@
|
|
63
65
|
@include box-sizing(border-box);
|
64
66
|
@include transition(width .6s ease);
|
65
67
|
}
|
68
|
+
.progress .bar + .bar {
|
69
|
+
@include box-shadow(#{inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)});
|
70
|
+
}
|
66
71
|
|
67
72
|
// Striped bars
|
68
73
|
.progress-striped .bar {
|
@@ -85,33 +90,33 @@
|
|
85
90
|
// ------
|
86
91
|
|
87
92
|
// Danger (red)
|
88
|
-
.progress-danger .bar {
|
93
|
+
.progress-danger .bar, .progress .bar-danger {
|
89
94
|
@include gradient-vertical(#ee5f5b, #c43c35);
|
90
95
|
}
|
91
|
-
.progress-danger.progress-striped .bar {
|
96
|
+
.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
|
92
97
|
@include gradient-striped(#ee5f5b);
|
93
98
|
}
|
94
99
|
|
95
100
|
// Success (green)
|
96
|
-
.progress-success .bar {
|
101
|
+
.progress-success .bar, .progress .bar-success {
|
97
102
|
@include gradient-vertical(#62c462, #57a957);
|
98
103
|
}
|
99
|
-
.progress-success.progress-striped .bar {
|
104
|
+
.progress-success.progress-striped .bar, .progress-striped .bar-success {
|
100
105
|
@include gradient-striped(#62c462);
|
101
106
|
}
|
102
107
|
|
103
108
|
// Info (teal)
|
104
|
-
.progress-info .bar {
|
109
|
+
.progress-info .bar, .progress .bar-info {
|
105
110
|
@include gradient-vertical(#5bc0de, #339bb9);
|
106
111
|
}
|
107
|
-
.progress-info.progress-striped .bar {
|
112
|
+
.progress-info.progress-striped .bar, .progress-striped .bar-info {
|
108
113
|
@include gradient-striped(#5bc0de);
|
109
114
|
}
|
110
115
|
|
111
116
|
// Warning (orange)
|
112
|
-
.progress-warning .bar {
|
117
|
+
.progress-warning .bar, .progress .bar-warning {
|
113
118
|
@include gradient-vertical(lighten($orange, 15%), $orange);
|
114
119
|
}
|
115
|
-
.progress-warning.progress-striped .bar {
|
120
|
+
.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
|
116
121
|
@include gradient-striped(lighten($orange, 15%));
|
117
122
|
}
|