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,5 +1,21 @@
|
|
1
|
+
//
|
2
|
+
// Grid system
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
5
|
+
|
1
6
|
// Fixed (940px)
|
2
7
|
#grid > .core(@gridColumnWidth, @gridGutterWidth);
|
3
8
|
|
4
9
|
// Fluid (940px)
|
5
|
-
#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
|
10
|
+
#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
|
11
|
+
|
12
|
+
// Reset utility classes due to specificity
|
13
|
+
[class*="span"].hide,
|
14
|
+
.row-fluid [class*="span"].hide {
|
15
|
+
display: none;
|
16
|
+
}
|
17
|
+
|
18
|
+
[class*="span"].pull-right,
|
19
|
+
.row-fluid [class*="span"].pull-right {
|
20
|
+
float: right;
|
21
|
+
}
|
@@ -1,5 +1,7 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Labels and badges
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
// Base classes
|
5
7
|
.label,
|
@@ -53,3 +55,18 @@ a {
|
|
53
55
|
&-inverse { background-color: @grayDark; }
|
54
56
|
&-inverse[href] { background-color: darken(@grayDark, 10%); }
|
55
57
|
}
|
58
|
+
|
59
|
+
// Quick fix for labels/badges in buttons
|
60
|
+
.btn {
|
61
|
+
.label,
|
62
|
+
.badge {
|
63
|
+
position: relative;
|
64
|
+
top: -1px;
|
65
|
+
}
|
66
|
+
}
|
67
|
+
.btn-mini {
|
68
|
+
.label,
|
69
|
+
.badge {
|
70
|
+
top: 0;
|
71
|
+
}
|
72
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
|
-
//
|
2
|
-
//
|
3
|
-
//
|
1
|
+
//
|
2
|
+
// Mixins
|
3
|
+
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
6
|
// UTILITY MIXINS
|
@@ -15,6 +15,9 @@
|
|
15
15
|
&:after {
|
16
16
|
display: table;
|
17
17
|
content: "";
|
18
|
+
// Fixes Opera/contenteditable bug:
|
19
|
+
// http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
|
20
|
+
line-height: 0;
|
18
21
|
}
|
19
22
|
&:after {
|
20
23
|
clear: both;
|
@@ -62,10 +65,6 @@
|
|
62
65
|
|
63
66
|
.ie7-restore-right-whitespace() {
|
64
67
|
*margin-right: .3em;
|
65
|
-
|
66
|
-
&:last-child {
|
67
|
-
*margin-left: 0;
|
68
|
-
}
|
69
68
|
}
|
70
69
|
|
71
70
|
// Sizing shortcuts
|
@@ -155,11 +154,12 @@
|
|
155
154
|
.input-block-level {
|
156
155
|
display: block;
|
157
156
|
width: 100%;
|
158
|
-
min-height:
|
157
|
+
min-height: 30px; // Make inputs at least the height of their button counterpart
|
159
158
|
.box-sizing(border-box); // Makes inputs behave like true block-level elements
|
160
159
|
}
|
161
160
|
|
162
161
|
|
162
|
+
|
163
163
|
// Mixin for form field states
|
164
164
|
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
|
165
165
|
// Set the text color
|
@@ -175,10 +175,15 @@
|
|
175
175
|
select,
|
176
176
|
textarea {
|
177
177
|
color: @textColor;
|
178
|
+
}
|
179
|
+
input,
|
180
|
+
select,
|
181
|
+
textarea {
|
178
182
|
border-color: @borderColor;
|
183
|
+
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
|
179
184
|
&:focus {
|
180
185
|
border-color: darken(@borderColor, 10%);
|
181
|
-
.box-shadow(0 0 6px lighten(@borderColor, 20%));
|
186
|
+
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%));
|
182
187
|
}
|
183
188
|
}
|
184
189
|
// Give a small background color for input-prepend/-append
|
@@ -202,21 +207,68 @@
|
|
202
207
|
border-radius: @radius;
|
203
208
|
}
|
204
209
|
|
210
|
+
// Single Corner Border Radius
|
211
|
+
.border-top-left-radius(@radius) {
|
212
|
+
-webkit-border-top-left-radius: @radius;
|
213
|
+
-moz-border-radius-topleft: @radius;
|
214
|
+
border-top-left-radius: @radius;
|
215
|
+
}
|
216
|
+
.border-top-right-radius(@radius) {
|
217
|
+
-webkit-border-top-right-radius: @radius;
|
218
|
+
-moz-border-radius-topright: @radius;
|
219
|
+
border-top-right-radius: @radius;
|
220
|
+
}
|
221
|
+
.border-bottom-right-radius(@radius) {
|
222
|
+
-webkit-border-bottom-right-radius: @radius;
|
223
|
+
-moz-border-radius-bottomright: @radius;
|
224
|
+
border-bottom-right-radius: @radius;
|
225
|
+
}
|
226
|
+
.border-bottom-left-radius(@radius) {
|
227
|
+
-webkit-border-bottom-left-radius: @radius;
|
228
|
+
-moz-border-radius-bottomleft: @radius;
|
229
|
+
border-bottom-left-radius: @radius;
|
230
|
+
}
|
231
|
+
|
232
|
+
// Single Side Border Radius
|
233
|
+
.border-top-radius(@radius) {
|
234
|
+
.border-top-right-radius(@radius);
|
235
|
+
.border-top-left-radius(@radius);
|
236
|
+
}
|
237
|
+
.border-right-radius(@radius) {
|
238
|
+
.border-top-right-radius(@radius);
|
239
|
+
.border-bottom-right-radius(@radius);
|
240
|
+
}
|
241
|
+
.border-bottom-radius(@radius) {
|
242
|
+
.border-bottom-right-radius(@radius);
|
243
|
+
.border-bottom-left-radius(@radius);
|
244
|
+
}
|
245
|
+
.border-left-radius(@radius) {
|
246
|
+
.border-top-left-radius(@radius);
|
247
|
+
.border-bottom-left-radius(@radius);
|
248
|
+
}
|
249
|
+
|
205
250
|
// Drop shadows
|
206
|
-
.box-shadow(@
|
207
|
-
-
|
208
|
-
|
209
|
-
|
251
|
+
.box-shadow(@shadowA, @shadowB:X, ...){
|
252
|
+
// Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/
|
253
|
+
@props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`;
|
254
|
+
-webkit-box-shadow: @props;
|
255
|
+
-moz-box-shadow: @props;
|
256
|
+
box-shadow: @props;
|
210
257
|
}
|
211
258
|
|
212
259
|
// Transitions
|
213
260
|
.transition(@transition) {
|
214
261
|
-webkit-transition: @transition;
|
215
262
|
-moz-transition: @transition;
|
216
|
-
-ms-transition: @transition;
|
217
263
|
-o-transition: @transition;
|
218
264
|
transition: @transition;
|
219
265
|
}
|
266
|
+
.transition-delay(@transition-delay) {
|
267
|
+
-webkit-transition-delay: @transition-delay;
|
268
|
+
-moz-transition-delay: @transition-delay;
|
269
|
+
-o-transition-delay: @transition-delay;
|
270
|
+
transition-delay: @transition-delay;
|
271
|
+
}
|
220
272
|
|
221
273
|
// Transformations
|
222
274
|
.rotate(@degrees) {
|
@@ -243,16 +295,15 @@
|
|
243
295
|
.skew(@x, @y) {
|
244
296
|
-webkit-transform: skew(@x, @y);
|
245
297
|
-moz-transform: skew(@x, @y);
|
246
|
-
-ms-transform:
|
298
|
+
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
|
247
299
|
-o-transform: skew(@x, @y);
|
248
300
|
transform: skew(@x, @y);
|
249
301
|
}
|
250
302
|
.translate3d(@x, @y, @z) {
|
251
|
-
-webkit-transform:
|
252
|
-
-moz-transform:
|
253
|
-
|
254
|
-
|
255
|
-
transform: translate(@x, @y, @z);
|
303
|
+
-webkit-transform: translate3d(@x, @y, @z);
|
304
|
+
-moz-transform: translate3d(@x, @y, @z);
|
305
|
+
-o-transform: translate3d(@x, @y, @z);
|
306
|
+
transform: translate3d(@x, @y, @z);
|
256
307
|
}
|
257
308
|
|
258
309
|
// Backface visibility
|
@@ -262,7 +313,6 @@
|
|
262
313
|
.backface-visibility(@visibility){
|
263
314
|
-webkit-backface-visibility: @visibility;
|
264
315
|
-moz-backface-visibility: @visibility;
|
265
|
-
-ms-backface-visibility: @visibility;
|
266
316
|
backface-visibility: @visibility;
|
267
317
|
}
|
268
318
|
|
@@ -287,7 +337,6 @@
|
|
287
337
|
.box-sizing(@boxmodel) {
|
288
338
|
-webkit-box-sizing: @boxmodel;
|
289
339
|
-moz-box-sizing: @boxmodel;
|
290
|
-
-ms-box-sizing: @boxmodel;
|
291
340
|
box-sizing: @boxmodel;
|
292
341
|
}
|
293
342
|
|
@@ -350,7 +399,9 @@
|
|
350
399
|
}
|
351
400
|
|
352
401
|
// Gradient Bar Colors for buttons and alerts
|
353
|
-
.gradientBar(@primaryColor, @secondaryColor) {
|
402
|
+
.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
|
403
|
+
color: @textColor;
|
404
|
+
text-shadow: @textShadow;
|
354
405
|
#gradient > .vertical(@primaryColor, @secondaryColor);
|
355
406
|
border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
|
356
407
|
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
|
@@ -361,60 +412,54 @@
|
|
361
412
|
.horizontal(@startColor: #555, @endColor: #333) {
|
362
413
|
background-color: @endColor;
|
363
414
|
background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
|
364
|
-
background-image: -ms-linear-gradient(left, @startColor, @endColor); // IE10
|
365
415
|
background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
|
366
416
|
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
|
367
417
|
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
|
368
|
-
background-image: linear-gradient(
|
418
|
+
background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
|
369
419
|
background-repeat: repeat-x;
|
370
|
-
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)"
|
420
|
+
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down
|
371
421
|
}
|
372
422
|
.vertical(@startColor: #555, @endColor: #333) {
|
373
423
|
background-color: mix(@startColor, @endColor, 60%);
|
374
424
|
background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
|
375
|
-
background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
|
376
425
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
|
377
426
|
background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
|
378
427
|
background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
|
379
|
-
background-image: linear-gradient(
|
428
|
+
background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
|
380
429
|
background-repeat: repeat-x;
|
381
|
-
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)"
|
430
|
+
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
|
382
431
|
}
|
383
432
|
.directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
|
384
433
|
background-color: @endColor;
|
385
434
|
background-repeat: repeat-x;
|
386
435
|
background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
|
387
|
-
background-image: -ms-linear-gradient(@deg, @startColor, @endColor); // IE10
|
388
436
|
background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
|
389
437
|
background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
|
390
|
-
background-image: linear-gradient(@deg, @startColor, @endColor); //
|
438
|
+
background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
|
391
439
|
}
|
392
440
|
.vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
|
393
441
|
background-color: mix(@midColor, @endColor, 80%);
|
394
442
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
|
395
443
|
background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
396
444
|
background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
|
397
|
-
background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
398
445
|
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
399
446
|
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
400
447
|
background-repeat: no-repeat;
|
401
|
-
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)"
|
448
|
+
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
|
402
449
|
}
|
403
450
|
.radial(@innerColor: #555, @outerColor: #333) {
|
404
451
|
background-color: @outerColor;
|
405
452
|
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
|
406
453
|
background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
|
407
454
|
background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
|
408
|
-
background-image: -ms-radial-gradient(circle, @innerColor, @outerColor);
|
409
455
|
background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
|
410
456
|
background-repeat: no-repeat;
|
411
457
|
}
|
412
|
-
.striped(@color, @angle:
|
458
|
+
.striped(@color: #555, @angle: 45deg) {
|
413
459
|
background-color: @color;
|
414
460
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
|
415
461
|
background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
|
416
462
|
background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
|
417
|
-
background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
|
418
463
|
background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
|
419
464
|
background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
|
420
465
|
}
|
@@ -448,14 +493,15 @@
|
|
448
493
|
|
449
494
|
// Button backgrounds
|
450
495
|
// ------------------
|
451
|
-
.buttonBackground(@startColor, @endColor) {
|
496
|
+
.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
|
452
497
|
// gradientBar will set the background to a pleasing blend of these, to support IE<=9
|
453
|
-
.gradientBar(@startColor, @endColor);
|
498
|
+
.gradientBar(@startColor, @endColor, @textColor, @textShadow);
|
454
499
|
*background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
|
455
500
|
.reset-filter();
|
456
501
|
|
457
502
|
// in these cases the gradient won't cover the background, so we override
|
458
503
|
&:hover, &:active, &.active, &.disabled, &[disabled] {
|
504
|
+
color: @textColor;
|
459
505
|
background-color: @endColor;
|
460
506
|
*background-color: darken(@endColor, 5%);
|
461
507
|
}
|
@@ -475,43 +521,7 @@
|
|
475
521
|
margin-top: (@navbarHeight - @elementHeight) / 2;
|
476
522
|
}
|
477
523
|
|
478
|
-
|
479
|
-
// -------------------------
|
480
|
-
// For tipsies and popovers
|
481
|
-
#popoverArrow {
|
482
|
-
.top(@arrowWidth: 5px, @color: @black) {
|
483
|
-
bottom: 0;
|
484
|
-
left: 50%;
|
485
|
-
margin-left: -@arrowWidth;
|
486
|
-
border-left: @arrowWidth solid transparent;
|
487
|
-
border-right: @arrowWidth solid transparent;
|
488
|
-
border-top: @arrowWidth solid @color;
|
489
|
-
}
|
490
|
-
.left(@arrowWidth: 5px, @color: @black) {
|
491
|
-
top: 50%;
|
492
|
-
right: 0;
|
493
|
-
margin-top: -@arrowWidth;
|
494
|
-
border-top: @arrowWidth solid transparent;
|
495
|
-
border-bottom: @arrowWidth solid transparent;
|
496
|
-
border-left: @arrowWidth solid @color;
|
497
|
-
}
|
498
|
-
.bottom(@arrowWidth: 5px, @color: @black) {
|
499
|
-
top: 0;
|
500
|
-
left: 50%;
|
501
|
-
margin-left: -@arrowWidth;
|
502
|
-
border-left: @arrowWidth solid transparent;
|
503
|
-
border-right: @arrowWidth solid transparent;
|
504
|
-
border-bottom: @arrowWidth solid @color;
|
505
|
-
}
|
506
|
-
.right(@arrowWidth: 5px, @color: @black) {
|
507
|
-
top: 50%;
|
508
|
-
left: 0;
|
509
|
-
margin-top: -@arrowWidth;
|
510
|
-
border-top: @arrowWidth solid transparent;
|
511
|
-
border-bottom: @arrowWidth solid transparent;
|
512
|
-
border-right: @arrowWidth solid @color;
|
513
|
-
}
|
514
|
-
}
|
524
|
+
|
515
525
|
|
516
526
|
// Grid System
|
517
527
|
// -----------
|
@@ -574,11 +584,13 @@
|
|
574
584
|
|
575
585
|
[class*="span"] {
|
576
586
|
float: left;
|
587
|
+
min-height: 1px; // prevent collapsing columns
|
577
588
|
margin-left: @gridGutterWidth;
|
578
589
|
}
|
579
590
|
|
580
591
|
// Set the container width, and override it for fixed navbars in media queries
|
581
592
|
.container,
|
593
|
+
.navbar-static-top .container,
|
582
594
|
.navbar-fixed-top .container,
|
583
595
|
.navbar-fixed-bottom .container { .span(@gridColumns); }
|
584
596
|
|
@@ -596,6 +608,23 @@
|
|
596
608
|
}
|
597
609
|
.spanX (0) {}
|
598
610
|
|
611
|
+
.offsetX (@index) when (@index > 0) {
|
612
|
+
(~'.offset@{index}') { .offset(@index); }
|
613
|
+
(~'.offset@{index}:first-child') { .offsetFirstChild(@index); }
|
614
|
+
.offsetX(@index - 1);
|
615
|
+
}
|
616
|
+
.offsetX (0) {}
|
617
|
+
|
618
|
+
.offset (@columns) {
|
619
|
+
margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
|
620
|
+
*margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
|
621
|
+
}
|
622
|
+
|
623
|
+
.offsetFirstChild (@columns) {
|
624
|
+
margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth);
|
625
|
+
*margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
|
626
|
+
}
|
627
|
+
|
599
628
|
.span (@columns) {
|
600
629
|
width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
|
601
630
|
*width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
|
@@ -614,8 +643,9 @@
|
|
614
643
|
margin-left: 0;
|
615
644
|
}
|
616
645
|
|
617
|
-
// generate .spanX
|
646
|
+
// generate .spanX and .offsetX
|
618
647
|
.spanX (@gridColumns);
|
648
|
+
.offsetX (@gridColumns);
|
619
649
|
}
|
620
650
|
|
621
651
|
}
|
@@ -629,7 +659,7 @@
|
|
629
659
|
.spanX (0) {}
|
630
660
|
|
631
661
|
.span(@columns) {
|
632
|
-
width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) -
|
662
|
+
width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14;
|
633
663
|
}
|
634
664
|
|
635
665
|
input,
|
@@ -638,6 +668,11 @@
|
|
638
668
|
margin-left: 0; // override margin-left from core grid system
|
639
669
|
}
|
640
670
|
|
671
|
+
// Space grid-sized controls properly if multiple per line
|
672
|
+
.controls-row [class*="span"] + [class*="span"] {
|
673
|
+
margin-left: @gridGutterWidth;
|
674
|
+
}
|
675
|
+
|
641
676
|
// generate .spanX
|
642
677
|
.spanX (@gridColumns);
|
643
678
|
|
@@ -1,8 +1,11 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Modals
|
3
|
+
// --------------------------------------------------
|
3
4
|
|
4
|
-
|
5
|
-
|
5
|
+
|
6
|
+
// Recalculate z-index where appropriate,
|
7
|
+
// but only apply to elements within modal
|
8
|
+
.modal-open .modal {
|
6
9
|
.dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
|
7
10
|
.dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
|
8
11
|
.popover { z-index: @zindexPopover + @zindexModal; }
|
@@ -54,6 +57,11 @@
|
|
54
57
|
border-bottom: 1px solid #eee;
|
55
58
|
// Close icon
|
56
59
|
.close { margin-top: 2px; }
|
60
|
+
// Heading
|
61
|
+
h3 {
|
62
|
+
margin: 0;
|
63
|
+
line-height: 30px;
|
64
|
+
}
|
57
65
|
}
|
58
66
|
|
59
67
|
// Body (where all modal content resides)
|