bootstrap-sass-rails 3.0.0.3 → 3.0.3.0
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/README.md +20 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg +200 -199
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/javascripts/twitter/bootstrap/affix.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/alert.js +3 -3
- data/app/assets/javascripts/twitter/bootstrap/button.js +13 -7
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +8 -8
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/dropdown.js +8 -8
- data/app/assets/javascripts/twitter/bootstrap/modal.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/popover.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +5 -5
- data/app/assets/javascripts/twitter/bootstrap/tab.js +5 -5
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/transition.js +3 -3
- data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_badges.scss +6 -6
- data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +12 -33
- data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +4 -9
- data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +33 -10
- data/app/assets/stylesheets/twitter/bootstrap/_close.scss +1 -0
- data/app/assets/stylesheets/twitter/bootstrap/_code.scss +5 -8
- data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +3 -9
- data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +33 -10
- data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +15 -10
- data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +36 -304
- data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +10 -1
- data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +10 -4
- data/app/assets/stylesheets/twitter/bootstrap/_labels.scss +6 -0
- data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +14 -15
- data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +176 -65
- data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +5 -21
- data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +49 -58
- data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +43 -30
- data/app/assets/stylesheets/twitter/bootstrap/_normalize.scss +16 -6
- data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +2 -0
- data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +41 -7
- data/app/assets/stylesheets/twitter/bootstrap/_print.scss +6 -1
- data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +4 -19
- data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +37 -48
- data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +1 -12
- data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +45 -50
- data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +26 -11
- data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +22 -15
- data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +8 -8
- data/app/assets/stylesheets/twitter/bootstrap/_type.scss +105 -62
- data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +15 -1
- data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +69 -47
- data/app/assets/stylesheets/twitter/bootstrap.css.scss +0 -10
- data/lib/bootstrap/sass/rails/engine.rb +9 -1
- data/lib/bootstrap/sass/rails/version.rb +1 -1
- data/lib/generators/bootstrap/customize_generator.rb +37 -0
- data/lib/generators/bootstrap/templates/USAGE +23 -0
- data/lib/generators/bootstrap/templates/bootstrap-custom.css.scss +18 -0
- data/lib/generators/bootstrap/templates/bootstrap-custom.js +3 -0
- data/test/cases/less_to_sass_spec.rb +1 -1
- data/test/cases/usage_css_spec.rb +0 -3
- metadata +27 -5
- checksums.yaml +0 -15
@@ -39,8 +39,22 @@
|
|
39
39
|
> .badge + .badge {
|
40
40
|
margin-right: 5px;
|
41
41
|
}
|
42
|
+
}
|
42
43
|
|
44
|
+
// Linked list items
|
45
|
+
a.list-group-item {
|
46
|
+
color: $list-group-link-color;
|
43
47
|
|
48
|
+
.list-group-item-heading {
|
49
|
+
color: $list-group-link-heading-color;
|
50
|
+
}
|
51
|
+
|
52
|
+
// Hover state
|
53
|
+
&:hover,
|
54
|
+
&:focus {
|
55
|
+
text-decoration: none;
|
56
|
+
background-color: $list-group-hover-bg;
|
57
|
+
}
|
44
58
|
|
45
59
|
// Active class on item itself, not parent
|
46
60
|
&.active,
|
@@ -60,21 +74,6 @@
|
|
60
74
|
}
|
61
75
|
}
|
62
76
|
}
|
63
|
-
// Linked list items
|
64
|
-
a.list-group-item {
|
65
|
-
color: $list-group-link-color;
|
66
|
-
|
67
|
-
.list-group-item-heading {
|
68
|
-
color: $list-group-link-heading-color;
|
69
|
-
}
|
70
|
-
|
71
|
-
// Hover state
|
72
|
-
&:hover,
|
73
|
-
&:focus {
|
74
|
-
text-decoration: none;
|
75
|
-
background-color: $list-group-hover-bg;
|
76
|
-
}
|
77
|
-
}
|
78
77
|
|
79
78
|
// Custom content options
|
80
79
|
// -------------------------
|
@@ -19,19 +19,19 @@
|
|
19
19
|
@mixin clearfix() {
|
20
20
|
&:before,
|
21
21
|
&:after {
|
22
|
-
content: " ";
|
23
|
-
display: table;
|
22
|
+
content: " "; // 1
|
23
|
+
display: table; // 2
|
24
24
|
}
|
25
25
|
&:after {
|
26
26
|
clear: both;
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
30
|
-
//
|
30
|
+
// WebKit-style focus
|
31
31
|
@mixin tab-focus() {
|
32
32
|
// Default
|
33
|
-
outline: thin dotted
|
34
|
-
//
|
33
|
+
outline: thin dotted;
|
34
|
+
// WebKit
|
35
35
|
outline: 5px auto -webkit-focus-ring-color;
|
36
36
|
outline-offset: -2px;
|
37
37
|
}
|
@@ -55,7 +55,8 @@
|
|
55
55
|
// Placeholder text
|
56
56
|
@mixin placeholder($color: $input-color-placeholder) {
|
57
57
|
&:-moz-placeholder { color: $color; } // Firefox 4-18
|
58
|
-
&::-moz-placeholder { color: $color;
|
58
|
+
&::-moz-placeholder { color: $color; // Firefox 19+
|
59
|
+
opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
|
59
60
|
&:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
|
60
61
|
&::-webkit-input-placeholder { color: $color; } // Safari and Chrome
|
61
62
|
}
|
@@ -69,7 +70,15 @@
|
|
69
70
|
}
|
70
71
|
|
71
72
|
// CSS image replacement
|
73
|
+
//
|
74
|
+
// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
|
75
|
+
// mixins being reused as classes with the same name, this doesn't hold up. As
|
76
|
+
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note
|
77
|
+
// that we cannot chain the mixins together in Less, so they are repeated.
|
78
|
+
//
|
72
79
|
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
|
80
|
+
|
81
|
+
// Deprecated as of v3.0.1 (will be removed in v4)
|
73
82
|
@mixin hide-text() {
|
74
83
|
font: 0/0 a;
|
75
84
|
color: transparent;
|
@@ -77,6 +86,10 @@
|
|
77
86
|
background-color: transparent;
|
78
87
|
border: 0;
|
79
88
|
}
|
89
|
+
// New mixin to use as of v3.0.1
|
90
|
+
@mixin text-hide() {
|
91
|
+
@include hide-text();
|
92
|
+
}
|
80
93
|
|
81
94
|
|
82
95
|
|
@@ -112,6 +125,10 @@
|
|
112
125
|
-webkit-transition: $transition;
|
113
126
|
transition: $transition;
|
114
127
|
}
|
128
|
+
@mixin transition-property($transition-property) {
|
129
|
+
-webkit-transition-property: $transition-property;
|
130
|
+
transition-property: $transition-property;
|
131
|
+
}
|
115
132
|
@mixin transition-delay($transition-delay) {
|
116
133
|
-webkit-transition-delay: $transition-delay;
|
117
134
|
transition-delay: $transition-delay;
|
@@ -153,10 +170,41 @@
|
|
153
170
|
transform: translate3d($x, $y, $z);
|
154
171
|
}
|
155
172
|
|
173
|
+
@mixin rotateX($degrees) {
|
174
|
+
-webkit-transform: rotateX($degrees);
|
175
|
+
-ms-transform: rotateX($degrees); // IE9+
|
176
|
+
transform: rotateX($degrees);
|
177
|
+
}
|
178
|
+
@mixin rotateY($degrees) {
|
179
|
+
-webkit-transform: rotateY($degrees);
|
180
|
+
-ms-transform: rotateY($degrees); // IE9+
|
181
|
+
transform: rotateY($degrees);
|
182
|
+
}
|
183
|
+
@mixin perspective($perspective) {
|
184
|
+
-webkit-perspective: $perspective;
|
185
|
+
-moz-perspective: $perspective;
|
186
|
+
perspective: $perspective;
|
187
|
+
}
|
188
|
+
@mixin perspective-origin($perspective) {
|
189
|
+
-webkit-perspective-origin: $perspective;
|
190
|
+
-moz-perspective-origin: $perspective;
|
191
|
+
perspective-origin: $perspective;
|
192
|
+
}
|
193
|
+
@mixin transform-origin($origin) {
|
194
|
+
-webkit-transform-origin: $origin;
|
195
|
+
-moz-transform-origin: $origin;
|
196
|
+
transform-origin: $origin;
|
197
|
+
}
|
198
|
+
|
199
|
+
// Animations
|
200
|
+
@mixin animation($animation) {
|
201
|
+
-webkit-animation: $animation;
|
202
|
+
animation: $animation;
|
203
|
+
}
|
204
|
+
|
156
205
|
// Backface visibility
|
157
206
|
// Prevent browsers from flickering when using CSS 3D transforms.
|
158
207
|
// Default value is `visible`, but can be changed to `hidden`
|
159
|
-
// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
|
160
208
|
@mixin backface-visibility($visibility){
|
161
209
|
-webkit-backface-visibility: $visibility;
|
162
210
|
-moz-backface-visibility: $visibility;
|
@@ -226,10 +274,8 @@
|
|
226
274
|
// Creates two color stops, start and end, by specifying a color and position for each color stop.
|
227
275
|
// Color stops are not available in IE9 and below.
|
228
276
|
@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
|
229
|
-
background-image: -webkit-gradient(
|
230
|
-
background-image:
|
231
|
-
background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
|
232
|
-
background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
|
277
|
+
background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1-6, Chrome 10+
|
278
|
+
background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
233
279
|
background-repeat: repeat-x;
|
234
280
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=1); // IE9 and down
|
235
281
|
}
|
@@ -239,48 +285,37 @@
|
|
239
285
|
// Creates two color stops, start and end, by specifying a color and position for each color stop.
|
240
286
|
// Color stops are not available in IE9 and below.
|
241
287
|
@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
|
242
|
-
background-image: -webkit-gradient(
|
243
|
-
background-image:
|
244
|
-
background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
|
245
|
-
background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
|
288
|
+
background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
|
289
|
+
background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
246
290
|
background-repeat: repeat-x;
|
247
291
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=0); // IE9 and down
|
248
292
|
}
|
249
293
|
|
250
294
|
@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
|
251
295
|
background-repeat: repeat-x;
|
252
|
-
background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1
|
253
|
-
background-image:
|
254
|
-
background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10
|
296
|
+
background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
|
297
|
+
background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
255
298
|
}
|
256
299
|
@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
|
257
|
-
background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
|
258
300
|
background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
|
259
|
-
background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
|
260
301
|
background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
|
261
302
|
background-repeat: no-repeat;
|
262
303
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
|
263
304
|
}
|
264
305
|
@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
|
265
|
-
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
|
266
306
|
background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
|
267
|
-
background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color);
|
268
307
|
background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
|
269
308
|
background-repeat: no-repeat;
|
270
309
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#{ie-hex-str($start-color)}, endColorstr=#{ie-hex-str($end-color)}, GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
|
271
310
|
}
|
272
311
|
@mixin gradient-radial($inner-color: #555, $outer-color: #333) {
|
273
|
-
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color));
|
274
312
|
background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
|
275
|
-
background-image: -moz-radial-gradient(circle, $inner-color, $outer-color);
|
276
313
|
background-image: radial-gradient(circle, $inner-color, $outer-color);
|
277
314
|
background-repeat: no-repeat;
|
278
315
|
}
|
279
|
-
@mixin gradient-striped($color:
|
280
|
-
background-image: -webkit-gradient(
|
281
|
-
background-image:
|
282
|
-
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);
|
283
|
-
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);
|
316
|
+
@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
|
317
|
+
background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
|
318
|
+
background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
|
284
319
|
}
|
285
320
|
|
286
321
|
// Reset filters for IE
|
@@ -298,7 +333,7 @@
|
|
298
333
|
// Short retina mixin for setting background-image and -size
|
299
334
|
|
300
335
|
@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
|
301
|
-
background-image: image-url($file-1x);
|
336
|
+
background-image: image-url("#{$file-1x}");
|
302
337
|
|
303
338
|
@media
|
304
339
|
only screen and (-webkit-min-device-pixel-ratio: 2),
|
@@ -307,7 +342,7 @@
|
|
307
342
|
only screen and ( min-device-pixel-ratio: 2),
|
308
343
|
only screen and ( min-resolution: 192dpi),
|
309
344
|
only screen and ( min-resolution: 2dppx) {
|
310
|
-
background-image: image-url($file-2x);
|
345
|
+
background-image: image-url("#{$file-2x}");
|
311
346
|
background-size: $width-1x $height-1x;
|
312
347
|
}
|
313
348
|
}
|
@@ -341,10 +376,12 @@
|
|
341
376
|
// -------------------------
|
342
377
|
@mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
|
343
378
|
border-color: $border;
|
379
|
+
|
344
380
|
& > .panel-heading {
|
345
381
|
color: $heading-text-color;
|
346
382
|
background-color: $heading-bg-color;
|
347
383
|
border-color: $heading-border;
|
384
|
+
|
348
385
|
+ .panel-collapse .panel-body {
|
349
386
|
border-top-color: $border;
|
350
387
|
}
|
@@ -362,6 +399,7 @@
|
|
362
399
|
background-color: $background;
|
363
400
|
border-color: $border;
|
364
401
|
color: $text-color;
|
402
|
+
|
365
403
|
hr {
|
366
404
|
border-top-color: darken($border, 5%);
|
367
405
|
}
|
@@ -372,29 +410,28 @@
|
|
372
410
|
|
373
411
|
// Tables
|
374
412
|
// -------------------------
|
375
|
-
@mixin table-row-variant($state, $background
|
413
|
+
@mixin table-row-variant($state, $background) {
|
376
414
|
// Exact selectors below required to override `.table-striped` and prevent
|
377
415
|
// inheritance to nested tables.
|
378
|
-
.table
|
379
|
-
|
380
|
-
|
381
|
-
>
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
416
|
+
.table {
|
417
|
+
> thead,
|
418
|
+
> tbody,
|
419
|
+
> tfoot {
|
420
|
+
> tr > .#{$state},
|
421
|
+
> .#{$state} > td,
|
422
|
+
> .#{$state} > th {
|
423
|
+
background-color: $background;
|
424
|
+
}
|
387
425
|
}
|
388
426
|
}
|
389
427
|
|
390
428
|
// Hover states for `.table-hover`
|
391
429
|
// Note: this is not available for cells or rows within `thead` or `tfoot`.
|
392
|
-
.table-hover > tbody
|
393
|
-
>
|
394
|
-
>
|
395
|
-
|
430
|
+
.table-hover > tbody {
|
431
|
+
> tr > .#{$state}:hover,
|
432
|
+
> .#{$state}:hover > td,
|
433
|
+
> .#{$state}:hover > th {
|
396
434
|
background-color: darken($background, 5%);
|
397
|
-
border-color: darken($border, 5%);
|
398
435
|
}
|
399
436
|
}
|
400
437
|
}
|
@@ -443,9 +480,14 @@
|
|
443
480
|
&:active,
|
444
481
|
&.active {
|
445
482
|
background-color: $background;
|
446
|
-
border-color: $border
|
483
|
+
border-color: $border;
|
447
484
|
}
|
448
485
|
}
|
486
|
+
|
487
|
+
.badge {
|
488
|
+
color: $background;
|
489
|
+
background-color: #fff;
|
490
|
+
}
|
449
491
|
}
|
450
492
|
|
451
493
|
// Button sizes
|
@@ -507,7 +549,7 @@
|
|
507
549
|
@mixin progress-bar-variant($color) {
|
508
550
|
background-color: $color;
|
509
551
|
.progress-striped & {
|
510
|
-
@include gradient-striped(
|
552
|
+
@include gradient-striped();
|
511
553
|
}
|
512
554
|
}
|
513
555
|
|
@@ -516,18 +558,20 @@
|
|
516
558
|
// More easily include all the states for responsive-utilities.less.
|
517
559
|
@mixin responsive-visibility($parent) {
|
518
560
|
#{$parent} { display: block !important; }
|
519
|
-
|
561
|
+
table#{$parent} { display: table; }
|
562
|
+
tr#{$parent} { display: table-row !important; }
|
520
563
|
th#{$parent},
|
521
|
-
td#{$parent}
|
564
|
+
td#{$parent} { display: table-cell !important; }
|
522
565
|
}
|
523
566
|
|
524
567
|
@mixin responsive-invisibility($parent) {
|
525
|
-
|
526
|
-
tr#{$parent}
|
568
|
+
#{$parent},
|
569
|
+
tr#{$parent},
|
527
570
|
th#{$parent},
|
528
571
|
td#{$parent} { display: none !important; }
|
529
572
|
}
|
530
573
|
|
574
|
+
|
531
575
|
// Grid System
|
532
576
|
// -----------
|
533
577
|
|
@@ -569,7 +613,7 @@
|
|
569
613
|
padding-right: ($gutter / 2);
|
570
614
|
|
571
615
|
// Calculate width based on number of columns available
|
572
|
-
@media (min-width: $screen-sm) {
|
616
|
+
@media (min-width: $screen-sm-min) {
|
573
617
|
float: left;
|
574
618
|
width: percentage(($columns / $grid-columns));
|
575
619
|
}
|
@@ -577,17 +621,17 @@
|
|
577
621
|
|
578
622
|
// Generate the small column offsets
|
579
623
|
@mixin make-sm-column-offset($columns) {
|
580
|
-
@media (min-width: $screen-sm) {
|
624
|
+
@media (min-width: $screen-sm-min) {
|
581
625
|
margin-left: percentage(($columns / $grid-columns));
|
582
626
|
}
|
583
627
|
}
|
584
628
|
@mixin make-sm-column-push($columns) {
|
585
|
-
@media (min-width: $screen-sm) {
|
629
|
+
@media (min-width: $screen-sm-min) {
|
586
630
|
left: percentage(($columns / $grid-columns));
|
587
631
|
}
|
588
632
|
}
|
589
633
|
@mixin make-sm-column-pull($columns) {
|
590
|
-
@media (min-width: $screen-sm) {
|
634
|
+
@media (min-width: $screen-sm-min) {
|
591
635
|
right: percentage(($columns / $grid-columns));
|
592
636
|
}
|
593
637
|
}
|
@@ -602,15 +646,15 @@
|
|
602
646
|
padding-right: ($gutter / 2);
|
603
647
|
|
604
648
|
// Calculate width based on number of columns available
|
605
|
-
@media (min-width: $screen-md) {
|
649
|
+
@media (min-width: $screen-md-min) {
|
606
650
|
float: left;
|
607
651
|
width: percentage(($columns / $grid-columns));
|
608
652
|
}
|
609
653
|
}
|
610
654
|
|
611
|
-
// Generate the
|
655
|
+
// Generate the medium column offsets
|
612
656
|
@mixin make-md-column-offset($columns) {
|
613
|
-
@media (min-width: $screen-md) {
|
657
|
+
@media (min-width: $screen-md-min) {
|
614
658
|
margin-left: percentage(($columns / $grid-columns));
|
615
659
|
}
|
616
660
|
}
|
@@ -620,7 +664,7 @@
|
|
620
664
|
}
|
621
665
|
}
|
622
666
|
@mixin make-md-column-pull($columns) {
|
623
|
-
@media (min-width: $screen-md) {
|
667
|
+
@media (min-width: $screen-md-min) {
|
624
668
|
right: percentage(($columns / $grid-columns));
|
625
669
|
}
|
626
670
|
}
|
@@ -635,7 +679,7 @@
|
|
635
679
|
padding-right: ($gutter / 2);
|
636
680
|
|
637
681
|
// Calculate width based on number of columns available
|
638
|
-
@media (min-width: $screen-lg) {
|
682
|
+
@media (min-width: $screen-lg-min) {
|
639
683
|
float: left;
|
640
684
|
width: percentage(($columns / $grid-columns));
|
641
685
|
}
|
@@ -643,22 +687,85 @@
|
|
643
687
|
|
644
688
|
// Generate the large column offsets
|
645
689
|
@mixin make-lg-column-offset($columns) {
|
646
|
-
@media (min-width: $screen-lg) {
|
690
|
+
@media (min-width: $screen-lg-min) {
|
647
691
|
margin-left: percentage(($columns / $grid-columns));
|
648
692
|
}
|
649
693
|
}
|
650
694
|
@mixin make-lg-column-push($columns) {
|
651
|
-
@media (min-width: $screen-lg) {
|
695
|
+
@media (min-width: $screen-lg-min) {
|
652
696
|
left: percentage(($columns / $grid-columns));
|
653
697
|
}
|
654
698
|
}
|
655
699
|
@mixin make-lg-column-pull($columns) {
|
656
|
-
@media (min-width: $screen-lg) {
|
700
|
+
@media (min-width: $screen-lg-min) {
|
657
701
|
right: percentage(($columns / $grid-columns));
|
658
702
|
}
|
659
703
|
}
|
660
704
|
|
661
705
|
|
706
|
+
// Framework grid generation
|
707
|
+
//
|
708
|
+
// Used only by Bootstrap to generate the correct number of grid classes given
|
709
|
+
// any value of `$grid-columns`.
|
710
|
+
|
711
|
+
@mixin make-grid-columns() {
|
712
|
+
$list: ();
|
713
|
+
@for $index from 1 through $grid-columns {
|
714
|
+
$list: append($list, unquote(".col-xs-#{$index}, .col-sm-#{$index}, .col-md-#{$index}, .col-lg-#{$index}"), comma);
|
715
|
+
}
|
716
|
+
#{$list} {
|
717
|
+
position: relative;
|
718
|
+
// Prevent columns from collapsing when empty
|
719
|
+
min-height: 1px;
|
720
|
+
// Inner gutter via padding
|
721
|
+
padding-left: ($grid-gutter-width / 2);
|
722
|
+
padding-right: ($grid-gutter-width / 2);
|
723
|
+
}
|
724
|
+
}
|
725
|
+
|
726
|
+
|
727
|
+
@mixin make-grid-columns-float($class) {
|
728
|
+
$list: ();
|
729
|
+
@for $index from 1 through $grid-columns {
|
730
|
+
$list: append($list, unquote(".col-#{$class}-#{$index}"), comma);
|
731
|
+
}
|
732
|
+
#{$list} {
|
733
|
+
float: left;
|
734
|
+
}
|
735
|
+
}
|
736
|
+
|
737
|
+
|
738
|
+
@mixin calc-grid($index, $class, $type) {
|
739
|
+
@if ($type == width) and ($index > 0) {
|
740
|
+
.col-#{$class}-#{$index} {
|
741
|
+
width: percentage(($index / $grid-columns));
|
742
|
+
}
|
743
|
+
}
|
744
|
+
@if ($type == push) {
|
745
|
+
.col-#{$class}-push-#{$index} {
|
746
|
+
left: percentage(($index / $grid-columns));
|
747
|
+
}
|
748
|
+
}
|
749
|
+
@if ($type == pull) {
|
750
|
+
.col-#{$class}-pull-#{$index} {
|
751
|
+
right: percentage(($index / $grid-columns));
|
752
|
+
}
|
753
|
+
}
|
754
|
+
@if ($type == offset) {
|
755
|
+
.col-#{$class}-offset-#{$index} {
|
756
|
+
margin-left: percentage(($index / $grid-columns));
|
757
|
+
}
|
758
|
+
}
|
759
|
+
}
|
760
|
+
|
761
|
+
@mixin make-grid($index, $class, $type) {
|
762
|
+
@for $i from 0 through $index {
|
763
|
+
@include calc-grid($i, $class, $type);
|
764
|
+
}
|
765
|
+
}
|
766
|
+
|
767
|
+
|
768
|
+
|
662
769
|
// Form validation states
|
663
770
|
//
|
664
771
|
// Used in forms.less to generate the form validation CSS for warnings, errors,
|
@@ -667,7 +774,11 @@
|
|
667
774
|
@mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
|
668
775
|
// Color the label and help text
|
669
776
|
.help-block,
|
670
|
-
.control-label
|
777
|
+
.control-label,
|
778
|
+
.radio,
|
779
|
+
.checkbox,
|
780
|
+
.radio-inline,
|
781
|
+
.checkbox-inline {
|
671
782
|
color: $text-color;
|
672
783
|
}
|
673
784
|
// Set the border and box shadow on specific inputs to match
|
@@ -10,19 +10,6 @@
|
|
10
10
|
// Kill the scroll on the body
|
11
11
|
.modal-open {
|
12
12
|
overflow: hidden;
|
13
|
-
|
14
|
-
|
15
|
-
// Account for hiding of scrollbar
|
16
|
-
|
17
|
-
|
18
|
-
.navbar-fixed-top,
|
19
|
-
.navbar-fixed-bottom {
|
20
|
-
margin-right: 15px
|
21
|
-
}
|
22
|
-
}
|
23
|
-
|
24
|
-
body.modal-open {
|
25
|
-
margin-right: 15px
|
26
13
|
}
|
27
14
|
|
28
15
|
// Container that the modal scrolls within
|
@@ -47,10 +34,9 @@ body.modal-open {
|
|
47
34
|
|
48
35
|
// Shell div to position the modal with bottom padding
|
49
36
|
.modal-dialog {
|
50
|
-
|
51
|
-
margin-right: auto;
|
37
|
+
position: relative;
|
52
38
|
width: auto;
|
53
|
-
|
39
|
+
margin: 10px;
|
54
40
|
z-index: ($zindex-modal-background + 10);
|
55
41
|
}
|
56
42
|
|
@@ -130,16 +116,14 @@ body.modal-open {
|
|
130
116
|
}
|
131
117
|
|
132
118
|
// Scale up the modal
|
133
|
-
@media screen and (min-width: $screen-
|
119
|
+
@media screen and (min-width: $screen-sm-min) {
|
134
120
|
|
135
121
|
.modal-dialog {
|
136
|
-
left: 50%;
|
137
|
-
right: auto;
|
138
122
|
width: 600px;
|
139
|
-
|
140
|
-
padding-bottom: 30px;
|
123
|
+
margin: 30px auto;
|
141
124
|
}
|
142
125
|
.modal-content {
|
143
126
|
@include box-shadow(0 5px 15px rgba(0,0,0,.5));
|
144
127
|
}
|
128
|
+
|
145
129
|
}
|