sass-rails-bootstrap 2.0.4 → 2.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +3 -3
- data/lib/sass-rails-bootstrap/sass_functions.rb +15 -0
- data/lib/sass-rails-bootstrap/version.rb +1 -1
- data/lib/sass-rails-bootstrap.rb +1 -0
- data/vendor/assets/javascripts/twitter/bootstrap/affix.js +104 -0
- data/vendor/assets/javascripts/twitter/bootstrap/alert.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/button.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +13 -6
- data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +5 -4
- data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +69 -19
- data/vendor/assets/javascripts/twitter/bootstrap/modal.js +96 -75
- data/vendor/assets/javascripts/twitter/bootstrap/popover.js +19 -9
- data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +13 -13
- data/vendor/assets/javascripts/twitter/bootstrap/tab.js +3 -3
- data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +15 -15
- data/vendor/assets/javascripts/twitter/bootstrap/transition.js +3 -4
- data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +52 -37
- data/vendor/assets/javascripts/twitter/bootstrap.js +1 -0
- data/vendor/assets/stylesheets/twitter/_bootstrap-responsive.scss +5 -5
- data/vendor/assets/stylesheets/twitter/_bootstrap.scss +2 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_accordion.sass +3 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_alerts.sass +14 -8
- data/vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.sass +9 -9
- data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.sass +71 -23
- data/vendor/assets/stylesheets/twitter/bootstrap/_buttons.sass +81 -66
- data/vendor/assets/stylesheets/twitter/bootstrap/_carousel.sass +12 -3
- data/vendor/assets/stylesheets/twitter/bootstrap/_close.sass +4 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_code.sass +6 -4
- data/vendor/assets/stylesheets/twitter/bootstrap/_component-animations.sass +5 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_dropdowns.sass +76 -13
- data/vendor/assets/stylesheets/twitter/bootstrap/_forms.sass +84 -41
- data/vendor/assets/stylesheets/twitter/bootstrap/_grid.sass +13 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_hero-unit.sass +4 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.sass +15 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_layouts.sass +3 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.sass +107 -76
- data/vendor/assets/stylesheets/twitter/bootstrap/_modals.sass +8 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.sass +234 -134
- data/vendor/assets/stylesheets/twitter/bootstrap/_navs.sass +130 -96
- data/vendor/assets/stylesheets/twitter/bootstrap/_pager.sass +5 -4
- data/vendor/assets/stylesheets/twitter/bootstrap/_pagination.sass +16 -8
- data/vendor/assets/stylesheets/twitter/bootstrap/_popovers.sass +92 -38
- data/vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.sass +18 -13
- data/vendor/assets/stylesheets/twitter/bootstrap/_reset.sass +6 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-1200px-min.sass +9 -7
- data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.sass +75 -60
- data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-768px-979px.sass +7 -5
- data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.sass +15 -6
- data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.sass +17 -14
- data/vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.sass +24 -4
- data/vendor/assets/stylesheets/twitter/bootstrap/_sprites.sass +13 -3
- data/vendor/assets/stylesheets/twitter/bootstrap/_tables.sass +50 -9
- data/vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.sass +9 -4
- data/vendor/assets/stylesheets/twitter/bootstrap/_tooltip.sass +46 -17
- data/vendor/assets/stylesheets/twitter/bootstrap/_type.sass +69 -67
- data/vendor/assets/stylesheets/twitter/bootstrap/_utilities.sass +8 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_variables.sass +95 -26
- data/vendor/assets/stylesheets/twitter/bootstrap/_wells.sass +6 -5
- metadata +4 -2
@@ -1,5 +1,6 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Mixins
|
3
|
+
// --------------------------------------------------
|
3
4
|
|
4
5
|
|
5
6
|
// UTILITY MIXINS
|
@@ -10,9 +11,13 @@
|
|
10
11
|
// For clearing floats like a boss h5bp.com/q
|
11
12
|
=clearfix
|
12
13
|
*zoom: 1
|
13
|
-
&:before,
|
14
|
+
&:before,
|
15
|
+
&:after
|
14
16
|
display: table
|
15
17
|
content: ""
|
18
|
+
// Fixes Opera/contenteditable bug:
|
19
|
+
// http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
|
20
|
+
line-height: 0
|
16
21
|
&:after
|
17
22
|
clear: both
|
18
23
|
|
@@ -51,8 +56,7 @@
|
|
51
56
|
|
52
57
|
=ie7-restore-right-whitespace
|
53
58
|
*margin-right: .3em
|
54
|
-
|
55
|
-
*margin-left: 0
|
59
|
+
|
56
60
|
|
57
61
|
// Sizing shortcuts
|
58
62
|
// -------------------------
|
@@ -62,6 +66,7 @@
|
|
62
66
|
|
63
67
|
=square($size)
|
64
68
|
+size($size, $size)
|
69
|
+
|
65
70
|
|
66
71
|
// Placeholder text
|
67
72
|
// -------------------------
|
@@ -127,8 +132,9 @@
|
|
127
132
|
=input-block-level
|
128
133
|
display: block
|
129
134
|
width: 100%
|
130
|
-
min-height:
|
135
|
+
min-height: 30px // Make inputs at least the height of their button counterpart
|
131
136
|
+box-sizing(border-box) // Makes inputs behave like true block-level elements
|
137
|
+
|
132
138
|
|
133
139
|
// Mixin for form field states
|
134
140
|
=form-field-state($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5)
|
@@ -145,9 +151,12 @@
|
|
145
151
|
textarea
|
146
152
|
color: $textColor
|
147
153
|
border-color: $borderColor
|
154
|
+
+box-shadow(inset 0 1px 1px rgba(0,0,0,.075)) // Redeclare so transitions work
|
148
155
|
&:focus
|
149
156
|
border-color: darken($borderColor, 10%)
|
150
|
-
|
157
|
+
// Write out in full since the lighten() function isn't easily escaped
|
158
|
+
$shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%)
|
159
|
+
+box-shadow($shadow)
|
151
160
|
// Give a small background color for input-prepend/-append
|
152
161
|
.input-prepend .add-on,
|
153
162
|
.input-append .add-on
|
@@ -166,6 +175,45 @@
|
|
166
175
|
-moz-border-radius: $radius
|
167
176
|
border-radius: $radius
|
168
177
|
|
178
|
+
// Single Corner Border Radius
|
179
|
+
=border-top-left-radius($radius)
|
180
|
+
-webkit-border-top-left-radius: $radius
|
181
|
+
-moz-border-radius-topleft: $radius
|
182
|
+
border-top-left-radius: $radius
|
183
|
+
|
184
|
+
=border-top-right-radius($radius)
|
185
|
+
-webkit-border-top-right-radius: $radius
|
186
|
+
-moz-border-radius-topright: $radius
|
187
|
+
border-top-right-radius: $radius
|
188
|
+
|
189
|
+
=border-bottom-right-radius($radius)
|
190
|
+
-webkit-border-bottom-right-radius: $radius
|
191
|
+
-moz-border-radius-bottomright: $radius
|
192
|
+
border-bottom-right-radius: $radius
|
193
|
+
|
194
|
+
=border-bottom-left-radius($radius)
|
195
|
+
-webkit-border-bottom-left-radius: $radius
|
196
|
+
-moz-border-radius-bottomleft: $radius
|
197
|
+
border-bottom-left-radius: $radius
|
198
|
+
|
199
|
+
// Single Side Border Radius
|
200
|
+
=border-top-radius($radius)
|
201
|
+
+border-top-right-radius($radius)
|
202
|
+
+border-top-left-radius($radius)
|
203
|
+
|
204
|
+
=border-right-radius($radius)
|
205
|
+
+border-top-right-radius($radius)
|
206
|
+
+border-bottom-right-radius($radius)
|
207
|
+
|
208
|
+
=border-bottom-radius($radius)
|
209
|
+
+border-bottom-right-radius($radius)
|
210
|
+
+border-bottom-left-radius($radius)
|
211
|
+
|
212
|
+
=border-left-radius($radius)
|
213
|
+
+border-top-left-radius($radius)
|
214
|
+
+border-bottom-left-radius($radius)
|
215
|
+
|
216
|
+
|
169
217
|
// Drop shadows
|
170
218
|
=box-shadow($shadow)
|
171
219
|
-webkit-box-shadow: $shadow
|
@@ -176,7 +224,6 @@
|
|
176
224
|
=transition($transition)
|
177
225
|
-webkit-transition: $transition
|
178
226
|
-moz-transition: $transition
|
179
|
-
-ms-transition: $transition
|
180
227
|
-o-transition: $transition
|
181
228
|
transition: $transition
|
182
229
|
|
@@ -210,11 +257,10 @@
|
|
210
257
|
transform: skew($x, $y)
|
211
258
|
|
212
259
|
=translate3d($x, $y, $z)
|
213
|
-
-webkit-transform:
|
214
|
-
-moz-transform:
|
215
|
-
-
|
216
|
-
|
217
|
-
transform: translate($x, $y, $z)
|
260
|
+
-webkit-transform: translate3d($x, $y, $z)
|
261
|
+
-moz-transform: translate3d($x, $y, $z)
|
262
|
+
-o-transform: translate3d($x, $y, $z)
|
263
|
+
transform: translate3d($x, $y, $z)
|
218
264
|
|
219
265
|
// Backface visibility
|
220
266
|
// Prevent browsers from flickering when using CSS 3D transforms.
|
@@ -223,7 +269,6 @@
|
|
223
269
|
=backface-visibility($visibility)
|
224
270
|
-webkit-backface-visibility: $visibility
|
225
271
|
-moz-backface-visibility: $visibility
|
226
|
-
-ms-backface-visibility: $visibility
|
227
272
|
backface-visibility: $visibility
|
228
273
|
|
229
274
|
// Background clipping
|
@@ -245,7 +290,6 @@
|
|
245
290
|
=box-sizing($boxmodel)
|
246
291
|
-webkit-box-sizing: $boxmodel
|
247
292
|
-moz-box-sizing: $boxmodel
|
248
|
-
-ms-box-sizing: $boxmodel
|
249
293
|
box-sizing: $boxmodel
|
250
294
|
|
251
295
|
// User select
|
@@ -293,12 +337,15 @@
|
|
293
337
|
// Add an alphatransparency value to any background or border color (via Elyse Holladay)
|
294
338
|
=translucent-background($color: $white, $alpha: 1)
|
295
339
|
background-color: hsla(hue($color), saturation($color), lightness($color), $alpha)
|
340
|
+
|
296
341
|
=translucent-border($color: $white, $alpha: 1)
|
297
342
|
+border-color(hsla(hue($color), saturation($color), lightness($color), $alpha))
|
298
343
|
+background-clip(padding-box)
|
299
344
|
|
300
345
|
// Gradient Bar Colors for buttons and alerts
|
301
|
-
=gradient-bar($primaryColor, $secondaryColor)
|
346
|
+
=gradient-bar($primaryColor, $secondaryColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25))
|
347
|
+
color: $textColor
|
348
|
+
text-shadow: $textShadow
|
302
349
|
+gradient-vertical($primaryColor, $secondaryColor)
|
303
350
|
border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%)
|
304
351
|
border-color: rgba(0, 0, 0, .1) rgba(0, 0, 0, .1) fadein(rgba(0, 0, 0, .1), 15%)
|
@@ -307,63 +354,56 @@
|
|
307
354
|
=gradient-horizontal($startColor: #555, $endColor: #333)
|
308
355
|
background-color: $endColor
|
309
356
|
background-image: -moz-linear-gradient(left, $startColor, $endColor) // FF 3.6+
|
310
|
-
background-image: -ms-linear-gradient(left, $startColor, $endColor) // IE10
|
311
357
|
background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)) // Safari 4+, Chrome 2+
|
312
358
|
background-image: -webkit-linear-gradient(left, $startColor, $endColor) // Safari 5.1+, Chrome 10+
|
313
359
|
background-image: -o-linear-gradient(left, $startColor, $endColor) // Opera 11.10
|
314
|
-
background-image: linear-gradient(
|
360
|
+
background-image: linear-gradient(to right, $startColor, $endColor) // Standard, IE10
|
315
361
|
background-repeat: repeat-x
|
316
|
-
|
317
|
-
|
318
|
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$ieStartColor}', endColorstr='#{$ieEndColor}', GradientType=1) // IE9 and down
|
362
|
+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1) // IE9 and down
|
363
|
+
|
319
364
|
=gradient-vertical($startColor: #555, $endColor: #333)
|
320
365
|
background-color: mix($startColor, $endColor, 60%)
|
321
366
|
background-image: -moz-linear-gradient(top, $startColor, $endColor) // FF 3.6+
|
322
|
-
background-image: -ms-linear-gradient(top, $startColor, $endColor) // IE10
|
323
367
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)) // Safari 4+, Chrome 2+
|
324
368
|
background-image: -webkit-linear-gradient(top, $startColor, $endColor) // Safari 5.1+, Chrome 10+
|
325
369
|
background-image: -o-linear-gradient(top, $startColor, $endColor) // Opera 11.10
|
326
|
-
background-image: linear-gradient(
|
370
|
+
background-image: linear-gradient(to bottom, $startColor, $endColor) // Standard, IE10
|
327
371
|
background-repeat: repeat-x
|
328
|
-
|
329
|
-
|
330
|
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$ieStartColor}', endColorstr='#{$ieEndColor}', GradientType=0) // IE9 and down
|
372
|
+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0) // IE9 and down
|
373
|
+
|
331
374
|
=gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg)
|
332
375
|
background-color: $endColor
|
333
376
|
background-repeat: repeat-x
|
334
377
|
background-image: -moz-linear-gradient($deg, $startColor, $endColor) // FF 3.6+
|
335
|
-
background-image: -ms-linear-gradient($deg, $startColor, $endColor) // IE10
|
336
378
|
background-image: -webkit-linear-gradient($deg, $startColor, $endColor) // Safari 5.1+, Chrome 10+
|
337
379
|
background-image: -o-linear-gradient($deg, $startColor, $endColor) // Opera 11.10
|
338
|
-
background-image: linear-gradient($deg, $startColor, $endColor) //
|
380
|
+
background-image: linear-gradient($deg, $startColor, $endColor) // Standard, IE10
|
381
|
+
|
339
382
|
=gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f)
|
340
383
|
background-color: mix($midColor, $endColor, 80%)
|
341
384
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor))
|
342
385
|
background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor)
|
343
|
-
background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor)
|
344
|
-
background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor)
|
386
|
+
background-image: -moz-linear-gradient(top, $startColor, $midColor ($colorStop * 100%), $endColor)
|
345
387
|
background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor)
|
346
388
|
background-image: linear-gradient($startColor, $midColor $colorStop, $endColor)
|
347
389
|
background-repeat: no-repeat
|
348
|
-
|
349
|
-
|
350
|
-
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$ieStartColor}', endColorstr='#{$ieEndColor}', GradientType=0) // IE9 and down
|
390
|
+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0) // IE9 and down, gets no color-stop at all for proper fallback
|
391
|
+
|
351
392
|
=gradient-radial($innerColor: #555, $outerColor: #333)
|
352
393
|
background-color: $outerColor
|
353
394
|
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor))
|
354
395
|
background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor)
|
355
396
|
background-image: -moz-radial-gradient(circle, $innerColor, $outerColor)
|
356
|
-
background-image: -ms-radial-gradient(circle, $innerColor, $outerColor)
|
357
397
|
background-image: -o-radial-gradient(circle, $innerColor, $outerColor)
|
358
398
|
background-repeat: no-repeat
|
359
|
-
|
399
|
+
|
400
|
+
=gradient-striped($color, $angle: 45deg)
|
360
401
|
background-color: $color
|
361
402
|
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))
|
362
403
|
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)
|
363
404
|
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)
|
364
|
-
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)
|
365
405
|
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)
|
366
|
-
background-image:
|
406
|
+
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)
|
367
407
|
|
368
408
|
// Reset filters for IE
|
369
409
|
=reset-filter
|
@@ -391,14 +431,15 @@
|
|
391
431
|
|
392
432
|
// Button backgrounds
|
393
433
|
// ---------------------------------------
|
394
|
-
=button-background($startColor, $endColor)
|
434
|
+
=button-background($startColor, $endColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25))
|
395
435
|
// gradient-bar will set the background to a pleasing blend of these, to support IE<=9
|
396
|
-
+gradient-bar($startColor, $endColor)
|
436
|
+
+gradient-bar($startColor, $endColor, $textColor, $textShadow)
|
397
437
|
*background-color: $endColor /* Darken IE7 buttons by default so they stand out more given they won't have borders */
|
398
438
|
+reset-filter
|
399
439
|
|
400
440
|
// In these cases the gradient won't cover the background, so we override
|
401
441
|
&:hover, &:active, &.active, &.disabled, &[disabled]
|
442
|
+
color: $textColor
|
402
443
|
background-color: $endColor
|
403
444
|
*background-color: darken($endColor, 5%)
|
404
445
|
|
@@ -414,38 +455,6 @@
|
|
414
455
|
=navbar-vertical-align($elementHeight)
|
415
456
|
margin-top: ($navbarHeight - $elementHeight) / 2
|
416
457
|
|
417
|
-
// Popover arrows
|
418
|
-
// -------------------------
|
419
|
-
// For tipsies and popovers
|
420
|
-
=popover-arrow-top($arrowWidth: 5px, $color: $black)
|
421
|
-
bottom: 0
|
422
|
-
left: 50%
|
423
|
-
margin-left: -$arrowWidth
|
424
|
-
border-left: $arrowWidth solid transparent
|
425
|
-
border-right: $arrowWidth solid transparent
|
426
|
-
border-top: $arrowWidth solid $color
|
427
|
-
=popover-arrow-left($arrowWidth: 5px, $color: $black)
|
428
|
-
top: 50%
|
429
|
-
right: 0
|
430
|
-
margin-top: -$arrowWidth
|
431
|
-
border-top: $arrowWidth solid transparent
|
432
|
-
border-bottom: $arrowWidth solid transparent
|
433
|
-
border-left: $arrowWidth solid $color
|
434
|
-
=popover-arrow-bottom($arrowWidth: 5px, $color: $black)
|
435
|
-
top: 0
|
436
|
-
left: 50%
|
437
|
-
margin-left: -$arrowWidth
|
438
|
-
border-left: $arrowWidth solid transparent
|
439
|
-
border-right: $arrowWidth solid transparent
|
440
|
-
border-bottom: $arrowWidth solid $color
|
441
|
-
=popover-arrow-right($arrowWidth: 5px, $color: $black)
|
442
|
-
top: 50%
|
443
|
-
left: 0
|
444
|
-
margin-top: -$arrowWidth
|
445
|
-
border-top: $arrowWidth solid transparent
|
446
|
-
border-bottom: $arrowWidth solid transparent
|
447
|
-
border-right: $arrowWidth solid $color
|
448
|
-
|
449
458
|
|
450
459
|
// Grid System
|
451
460
|
// -----------
|
@@ -494,10 +503,11 @@
|
|
494
503
|
|
495
504
|
// Set the container width, and override it for fixed navbars in media queries
|
496
505
|
.container,
|
506
|
+
.navbar-static-top .container,
|
497
507
|
.navbar-fixed-top .container,
|
498
508
|
.navbar-fixed-bottom .container
|
499
509
|
+core-grid-span($gridColumns, $gridColumnWidth, $gridGutterWidth)
|
500
|
-
|
510
|
+
|
501
511
|
@for $i from 1 through $gridColumns
|
502
512
|
.span#{$i}
|
503
513
|
+core-grid-span($i, $gridColumnWidth, $gridGutterWidth)
|
@@ -510,6 +520,14 @@
|
|
510
520
|
=fluid-grid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
511
521
|
width: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1)
|
512
522
|
*width: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5px / $gridRowWidth * 100 * 1%
|
523
|
+
|
524
|
+
=fluid-grid-offset($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
525
|
+
margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) + $fluidGridGutterWidth * 2
|
526
|
+
*margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5px / $gridRowWidth * 100 * 1% + $fluidGridGutterWidth * 2 - 0.5px / $gridRowWidth * 100 * 1%
|
527
|
+
|
528
|
+
=fluid-grid-offset-first-child($columns, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
529
|
+
margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) + $fluidGridGutterWidth
|
530
|
+
*margin-left: $fluidGridColumnWidth * $columns + $fluidGridGutterWidth * ($columns - 1) - 0.5px / $gridRowWidth * 100 * 1% + $fluidGridGutterWidth - 0.5px / $gridRowWidth * 100 * 1%
|
513
531
|
|
514
532
|
=fluid-grid-generate($fluidGridColumnWidth, $fluidGridGutterWidth)
|
515
533
|
.row-fluid
|
@@ -529,17 +547,30 @@
|
|
529
547
|
.span#{$i}
|
530
548
|
+fluid-grid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
531
549
|
|
550
|
+
@for $i from 1 to $gridColumns
|
551
|
+
.offset#{$i}
|
552
|
+
+fluid-grid-offset($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
553
|
+
.offset#{$i}:first-child
|
554
|
+
+fluid-grid-offset-first-child($i, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
555
|
+
|
532
556
|
|
533
557
|
=input-grid-span($columns, $gridColumnWidth, $gridGutterWidth)
|
534
|
-
width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1) -
|
558
|
+
width: $gridColumnWidth * $columns + $gridGutterWidth * ($columns - 1) - 14
|
535
559
|
|
536
560
|
=input-grid-generate($gridColumnWidth, $gridGutterWidth)
|
537
561
|
input,
|
538
562
|
textarea,
|
539
563
|
.uneditable-input
|
540
564
|
margin-left: 0 // override margin-left from core grid system
|
541
|
-
|
542
|
-
|
543
|
-
|
565
|
+
|
566
|
+
// Space grid-sized controls properly if multiple per line
|
567
|
+
.controls-row [class*="span"] + [class*="span"]
|
568
|
+
margin-left: $gridGutterWidth
|
569
|
+
|
570
|
+
@for $i from 1 through $gridColumns
|
571
|
+
input.span#{$i},
|
572
|
+
textarea.span#{$i},
|
573
|
+
.uneditable-input.span#{$i}
|
574
|
+
+input-grid-span($i, $gridColumnWidth, $gridGutterWidth)
|
544
575
|
|
545
576
|
|
@@ -1,5 +1,7 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Modals
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
3
5
|
|
4
6
|
// Recalculate z-index where appropriate
|
5
7
|
.modal-open
|
@@ -57,6 +59,10 @@
|
|
57
59
|
// Close icon
|
58
60
|
.close
|
59
61
|
margin-top: 2px
|
62
|
+
// Heading
|
63
|
+
h3
|
64
|
+
margin: 0
|
65
|
+
line-height: 30px
|
60
66
|
|
61
67
|
// Body (where all modal content resides)
|
62
68
|
.modal-body
|