anjlab-bootstrap-rails 2.0.4.4 → 2.1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. data/README.md +21 -20
  2. data/Rakefile +39 -26
  3. data/lib/bootstrap-rails/engine.rb +3 -0
  4. data/lib/bootstrap-rails/version.rb +1 -1
  5. data/vendor/assets/images/{glyphicons-halflings-white.png → twitter/glyphicons-halflings-white.png} +0 -0
  6. data/vendor/assets/images/twitter/glyphicons-halflings.png +0 -0
  7. data/vendor/assets/javascripts/twitter/bootstrap.js +13 -0
  8. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +104 -0
  9. data/vendor/assets/javascripts/{bootstrap-alert.js → twitter/bootstrap/alert.js} +1 -1
  10. data/vendor/assets/javascripts/{bootstrap-button.js → twitter/bootstrap/button.js} +1 -1
  11. data/vendor/assets/javascripts/{bootstrap-carousel.js → twitter/bootstrap/carousel.js} +12 -5
  12. data/vendor/assets/javascripts/{bootstrap-collapse.js → twitter/bootstrap/collapse.js} +4 -3
  13. data/vendor/assets/javascripts/{bootstrap-dropdown.js → twitter/bootstrap/dropdown.js} +66 -16
  14. data/vendor/assets/javascripts/{bootstrap-modal.js → twitter/bootstrap/modal.js} +95 -74
  15. data/vendor/assets/javascripts/{bootstrap-popover.js → twitter/bootstrap/popover.js} +9 -4
  16. data/vendor/assets/javascripts/{bootstrap-scrollspy.js → twitter/bootstrap/scrollspy.js} +9 -9
  17. data/vendor/assets/javascripts/{bootstrap-tab.js → twitter/bootstrap/tab.js} +2 -2
  18. data/vendor/assets/javascripts/{bootstrap-tooltip.js → twitter/bootstrap/tooltip.js} +15 -15
  19. data/vendor/assets/javascripts/{bootstrap-transition.js → twitter/bootstrap/transition.js} +2 -3
  20. data/vendor/assets/javascripts/{bootstrap-typeahead.js → twitter/bootstrap/typeahead.js} +50 -35
  21. data/vendor/assets/stylesheets/twitter/bootstrap-responsive.scss +1 -0
  22. data/vendor/assets/stylesheets/twitter/bootstrap.scss +1 -0
  23. data/vendor/frameworks/twitter/bootstrap.scss +1 -0
  24. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/accordion.scss +3 -2
  25. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/alerts.scss +15 -8
  26. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/bootstrap.scss +1 -1
  27. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/breadcrumbs.scss +10 -10
  28. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/button-groups.scss +76 -23
  29. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/buttons.scss +76 -56
  30. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/carousel.scss +13 -3
  31. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/close.scss +4 -2
  32. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/code.scss +6 -5
  33. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/component-animations.scss +5 -2
  34. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/dropdowns.scss +81 -14
  35. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/forms.scss +99 -46
  36. data/vendor/frameworks/twitter/bootstrap/grid.scss +21 -0
  37. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/hero-unit.scss +4 -2
  38. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/labels-badges.scss +19 -2
  39. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/layouts.scss +1 -2
  40. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/mixins.scss +105 -81
  41. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/modals.scss +9 -2
  42. data/vendor/frameworks/twitter/bootstrap/navbar.scss +468 -0
  43. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/navs.scss +38 -17
  44. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/pager.scss +5 -4
  45. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/pagination.scss +16 -8
  46. data/vendor/frameworks/twitter/bootstrap/popovers.scss +117 -0
  47. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/progress-bars.scss +18 -13
  48. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/reset.scss +6 -3
  49. data/vendor/frameworks/twitter/bootstrap/responsive-1200px-min.scss +28 -0
  50. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/responsive-767px-max.scss +83 -69
  51. data/vendor/frameworks/twitter/bootstrap/responsive-768px-979px.scss +19 -0
  52. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/responsive-navbar.scss +17 -4
  53. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/responsive-utilities.scss +17 -15
  54. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/responsive.scss +5 -5
  55. data/vendor/frameworks/twitter/bootstrap/scaffolding.scss +51 -0
  56. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/sprites.scss +17 -20
  57. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/tables.scss +60 -15
  58. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/thumbnails.scss +9 -4
  59. data/vendor/frameworks/twitter/bootstrap/tooltip.scss +70 -0
  60. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/type.scss +56 -83
  61. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/utilities.scss +9 -2
  62. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/variables.scss +109 -36
  63. data/vendor/{assets/stylesheets → frameworks/twitter/bootstrap}/wells.scss +7 -5
  64. metadata +63 -59
  65. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  66. data/vendor/assets/javascripts/bootstrap.js +0 -12
  67. data/vendor/assets/stylesheets/grid.scss +0 -5
  68. data/vendor/assets/stylesheets/navbar.scss +0 -358
  69. data/vendor/assets/stylesheets/popovers.scss +0 -49
  70. data/vendor/assets/stylesheets/responsive-1200px-min.scss +0 -26
  71. data/vendor/assets/stylesheets/responsive-768px-979px.scss +0 -17
  72. data/vendor/assets/stylesheets/scaffolding.scss +0 -29
  73. data/vendor/assets/stylesheets/tooltip.scss +0 -35
@@ -0,0 +1,21 @@
1
+ //
2
+ // Grid system
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Fixed (940px)
7
+ @include grid-core($gridColumnWidth, $gridGutterWidth);
8
+
9
+ // Fluid (940px)
10
+ @include 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
- // HERO UNIT
2
- // ---------
1
+ //
2
+ // Hero unit
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  .hero-unit {
5
7
  padding: 60px;
@@ -1,5 +1,7 @@
1
- // LABELS & BADGES
2
- // ---------------
1
+ //
2
+ // Labels and badges
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  // Base classes
5
7
  .label,
@@ -52,3 +54,18 @@ a {
52
54
  .#{$widget}-inverse { background-color: $grayDark; }
53
55
  .#{$widget}-inverse[href] { background-color: darken($grayDark, 10%); }
54
56
  }
57
+
58
+ // Quick fix for labels/badges in buttons
59
+ .btn {
60
+ .label,
61
+ .badge {
62
+ position: relative;
63
+ top: -1px;
64
+ }
65
+ }
66
+ .btn-mini {
67
+ .label,
68
+ .badge {
69
+ top: 0;
70
+ }
71
+ }
@@ -1,7 +1,6 @@
1
1
  //
2
2
  // Layouts
3
- // Fixed-width and fluid (with sidebar) layouts
4
- // --------------------------------------------
3
+ // --------------------------------------------------
5
4
 
6
5
 
7
6
  // Container (centered, fixed-width layouts)
@@ -1,6 +1,6 @@
1
- // Mixins.less
2
- // Snippets of reusable CSS to develop faster and keep code readable
3
- // -----------------------------------------------------------------
1
+ //
2
+ // Mixins
3
+ // --------------------------------------------------
4
4
 
5
5
 
6
6
  // UTILITY MIXINS
@@ -17,7 +17,7 @@
17
17
  content: "";
18
18
  // Fixes Opera/contenteditable bug:
19
19
  // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
20
- height:0;
20
+ line-height: 0;
21
21
  }
22
22
  &:after {
23
23
  clear: both;
@@ -65,10 +65,6 @@
65
65
 
66
66
  @mixin ie7-restore-right-whitespace() {
67
67
  *margin-right: .3em;
68
-
69
- &:last-child {
70
- *margin-left: 0;
71
- }
72
68
  }
73
69
 
74
70
  // Sizing shortcuts
@@ -177,10 +173,12 @@
177
173
  @mixin input-block-level {
178
174
  display: block;
179
175
  width: 100%;
180
- min-height: 28px; // Make inputs at least the height of their button counterpart
176
+ min-height: 30px; // Make inputs at least the height of their button counterpart
181
177
  @include box-sizing(border-box); // Makes inputs behave like true block-level elements
182
178
  }
183
179
 
180
+
181
+
184
182
  // Mixin for form field states
185
183
  @mixin form-field-state($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
186
184
  // Set the text color
@@ -197,9 +195,13 @@
197
195
  textarea {
198
196
  color: $textColor;
199
197
  border-color: $borderColor;
198
+ @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
200
199
  &:focus {
201
200
  border-color: darken($borderColor, 10%);
202
- @include box-shadow(0 0 6px lighten($borderColor, 20%));
201
+ // Write out in full since the lighten() function isn't easily escaped
202
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
203
+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
204
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
203
205
  }
204
206
  }
205
207
  // Give a small background color for input-prepend/-append
@@ -223,6 +225,46 @@
223
225
  border-radius: $radius;
224
226
  }
225
227
 
228
+ // Single Corner Border Radius
229
+ @mixin border-top-left-radius($radius) {
230
+ -webkit-border-top-left-radius: $radius;
231
+ -moz-border-radius-topleft: $radius;
232
+ border-top-left-radius: $radius;
233
+ }
234
+ @mixin border-top-right-radius($radius) {
235
+ -webkit-border-top-right-radius: $radius;
236
+ -moz-border-radius-topright: $radius;
237
+ border-top-right-radius: $radius;
238
+ }
239
+ @mixin border-bottom-right-radius($radius) {
240
+ -webkit-border-bottom-right-radius: $radius;
241
+ -moz-border-radius-bottomright: $radius;
242
+ border-bottom-right-radius: $radius;
243
+ }
244
+ @mixin border-bottom-left-radius($radius) {
245
+ -webkit-border-bottom-left-radius: $radius;
246
+ -moz-border-radius-bottomleft: $radius;
247
+ border-bottom-left-radius: $radius;
248
+ }
249
+
250
+ // Single Side Border Radius
251
+ @mixin border-top-radius($radius) {
252
+ @include border-top-right-radius($radius);
253
+ @include border-top-left-radius($radius);
254
+ }
255
+ @mixin border-right-radius($radius) {
256
+ @include border-top-right-radius($radius);
257
+ @include border-bottom-right-radius($radius);
258
+ }
259
+ @mixin border-bottom-radius($radius) {
260
+ @include border-bottom-right-radius($radius);
261
+ @include border-bottom-left-radius($radius);
262
+ }
263
+ @mixin border-left-radius($radius) {
264
+ @include border-top-left-radius($radius);
265
+ @include border-bottom-left-radius($radius);
266
+ }
267
+
226
268
  // Drop shadows
227
269
  @mixin box-shadow($shadow) {
228
270
  -webkit-box-shadow: $shadow;
@@ -231,10 +273,10 @@
231
273
  }
232
274
 
233
275
  // Transitions
276
+
234
277
  @mixin transition($transition) {
235
278
  -webkit-transition: $transition;
236
279
  -moz-transition: $transition;
237
- -ms-transition: $transition;
238
280
  -o-transition: $transition;
239
281
  transition: $transition;
240
282
  }
@@ -283,7 +325,6 @@
283
325
  @mixin backface-visibility($visibility){
284
326
  -webkit-backface-visibility: $visibility;
285
327
  -moz-backface-visibility: $visibility;
286
- -ms-backface-visibility: $visibility;
287
328
  backface-visibility: $visibility;
288
329
  }
289
330
 
@@ -296,13 +337,20 @@
296
337
  }
297
338
 
298
339
  // Background sizing
299
- @mixin background-size($size){
340
+ @mixin background-size($size) {
300
341
  -webkit-background-size: $size;
301
342
  -moz-background-size: $size;
302
343
  -o-background-size: $size;
303
344
  background-size: $size;
304
345
  }
305
346
 
347
+ // Box sizing
348
+ @mixin box-sizing($boxmodel) {
349
+ -webkit-box-sizing: $boxmodel;
350
+ -moz-box-sizing: $boxmodel;
351
+ box-sizing: $boxmodel;
352
+ }
353
+
306
354
  // User select
307
355
  // For selecting text on the page
308
356
  @mixin user-select($select) {
@@ -350,24 +398,15 @@
350
398
  // BACKGROUNDS
351
399
  // --------------------------------------------------
352
400
 
353
- // Add an alphatransparency value to any background or border color (via Elyse Holladay)
354
- @mixin translucent-background($color: $white, $alpha: 1) {
355
- background-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
356
- }
357
- @mixin translucent-border($color: $white, $alpha: 1) {
358
- border-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
359
- @include background-clip(padding-box);
360
- }
361
401
 
362
402
  // Gradients
363
403
  @mixin gradient-horizontal($startColor: #555, $endColor: #333) {
364
404
  background-color: $endColor;
365
405
  background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+
366
- background-image: -ms-linear-gradient(left, $startColor, $endColor); // IE10
367
406
  background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
368
407
  background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
369
408
  background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
370
- background-image: linear-gradient(left, $startColor, $endColor); // Le standard
409
+ background-image: linear-gradient(left, $startColor, $endColor); // Standard, IE10
371
410
  background-repeat: repeat-x;
372
411
  $ieStartColor: ie_hex_str($startColor);
373
412
  $ieEndColor: ie_hex_str($endColor);
@@ -376,11 +415,10 @@
376
415
  @mixin gradient-vertical($startColor: #555, $endColor: #333) {
377
416
  background-color: mix($startColor, $endColor, 60%);
378
417
  background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+
379
- background-image: -ms-linear-gradient(top, $startColor, $endColor); // IE10
380
418
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
381
419
  background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
382
420
  background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10
383
- background-image: linear-gradient(top, $startColor, $endColor); // The standard
421
+ background-image: linear-gradient(top, $startColor, $endColor); // Standard, IE10
384
422
  background-repeat: repeat-x;
385
423
  $ieStartColor: ie_hex_str($startColor);
386
424
  $ieEndColor: ie_hex_str($endColor);
@@ -390,17 +428,15 @@
390
428
  background-color: $endColor;
391
429
  background-repeat: repeat-x;
392
430
  background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+
393
- background-image: -ms-linear-gradient($deg, $startColor, $endColor); // IE10
394
431
  background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+
395
432
  background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10
396
- background-image: linear-gradient($deg, $startColor, $endColor); // The standard
433
+ background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
397
434
  }
398
435
  @mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
399
436
  background-color: mix($midColor, $endColor, 80%);
400
437
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
401
438
  background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor);
402
439
  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor);
403
- background-image: -ms-linear-gradient($startColor, $midColor $colorStop, $endColor);
404
440
  background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor);
405
441
  background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
406
442
  background-repeat: no-repeat;
@@ -413,28 +449,28 @@
413
449
  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor));
414
450
  background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor);
415
451
  background-image: -moz-radial-gradient(circle, $innerColor, $outerColor);
416
- background-image: -ms-radial-gradient(circle, $innerColor, $outerColor);
417
452
  background-image: -o-radial-gradient(circle, $innerColor, $outerColor);
418
453
  background-repeat: no-repeat;
419
454
  }
420
455
  @mixin gradient-striped($color, $angle: -45deg) {
421
456
  background-color: $color;
422
- $transparent: rgba(0,0,0,0); // Workaround compass transparent color-stop bug https://github.com/chriseppstein/compass/issues/356
423
457
  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));
424
- 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);
425
- 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);
426
- 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);
427
- 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);
428
- 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);
458
+ 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);
459
+ 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);
460
+ 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);
461
+ 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);
429
462
  }
430
463
 
431
464
  // Gradient Bar Colors for buttons and alerts
432
- @mixin gradient-bar($primaryColor, $secondaryColor) {
465
+ @mixin gradient-bar($primaryColor, $secondaryColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
466
+ color: $textColor;
467
+ text-shadow: $textShadow;
433
468
  @include gradient-vertical($primaryColor, $secondaryColor);
434
469
  border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
435
470
  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
436
471
  }
437
472
 
473
+
438
474
  // Reset filters for IE
439
475
  @mixin reset-filter() {
440
476
  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
@@ -464,14 +500,15 @@
464
500
 
465
501
  // Button backgrounds
466
502
  // ------------------
467
- @mixin button-background($startColor, $endColor) {
503
+ @mixin button-background($startColor, $endColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
468
504
  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
469
- @include gradient-bar($startColor, $endColor);
505
+ @include gradient-bar($startColor, $endColor, $textColor, $textShadow);
470
506
  *background-color: $endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
471
507
  @include reset-filter();
472
508
 
473
509
  // in these cases the gradient won't cover the background, so we override
474
510
  &:hover, &:active, &.active, &.disabled, &[disabled] {
511
+ color: $textColor;
475
512
  background-color: $endColor;
476
513
  *background-color: darken($endColor, 5%);
477
514
  }
@@ -491,42 +528,6 @@
491
528
  margin-top: ($navbarHeight - $elementHeight) / 2;
492
529
  }
493
530
 
494
- // Popover arrows
495
- // -------------------------
496
- // For tipsies and popovers
497
- @mixin popover-arrow-top($arrowWidth: 5px, $color: $black) {
498
- bottom: 0;
499
- left: 50%;
500
- margin-left: -$arrowWidth;
501
- border-left: $arrowWidth solid transparent;
502
- border-right: $arrowWidth solid transparent;
503
- border-top: $arrowWidth solid $color;
504
- }
505
- @mixin popover-arrow-left($arrowWidth: 5px, $color: $black) {
506
- top: 50%;
507
- right: 0;
508
- margin-top: -$arrowWidth;
509
- border-top: $arrowWidth solid transparent;
510
- border-bottom: $arrowWidth solid transparent;
511
- border-left: $arrowWidth solid $color;
512
- }
513
- @mixin popover-arrow-bottom($arrowWidth: 5px, $color: $black) {
514
- top: 0;
515
- left: 50%;
516
- margin-left: -$arrowWidth;
517
- border-left: $arrowWidth solid transparent;
518
- border-right: $arrowWidth solid transparent;
519
- border-bottom: $arrowWidth solid $color;
520
- }
521
- @mixin popover-arrow-right($arrowWidth: 5px, $color: $black) {
522
- top: 50%;
523
- left: 0;
524
- margin-top: -$arrowWidth;
525
- border-top: $arrowWidth solid transparent;
526
- border-bottom: $arrowWidth solid transparent;
527
- border-right: $arrowWidth solid $color;
528
- }
529
-
530
531
  // Grid System
531
532
  // -----------
532
533
 
@@ -557,12 +558,13 @@
557
558
  }
558
559
 
559
560
  // The Grid
560
- @mixin grid-core-span ($columns, $gridColumnWidth, $gridGutterWidth) {
561
- width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
562
- }
563
561
  @mixin grid-core-offset ($columns, $gridColumnWidth, $gridGutterWidth) {
564
562
  margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns + 1));
565
563
  }
564
+ @mixin grid-core-span ($columns, $gridColumnWidth, $gridGutterWidth) {
565
+ width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
566
+ }
567
+
566
568
  @mixin grid-core-span-x($columns, $gridColumnWidth, $gridGutterWidth) {
567
569
  @for $i from 1 through $columns {
568
570
  .span#{$i} { @include grid-core-span($i, $gridColumnWidth, $gridGutterWidth) }
@@ -586,6 +588,7 @@
586
588
 
587
589
  // Set the container width, and override it for fixed navbars in media queries
588
590
  .container,
591
+ .navbar-static-top .container,
589
592
  .navbar-fixed-top .container,
590
593
  .navbar-fixed-bottom .container { @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth); }
591
594
 
@@ -594,14 +597,29 @@
594
597
  @include grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
595
598
  }
596
599
 
600
+ @mixin grid-fluid-offset($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
601
+ margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) + ($fluidGridGutterWidth*2);
602
+ *margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / ($gridRowWidth / 1px) * 100 * 1%) + ($fluidGridGutterWidth*2) - (.5 / ($gridRowWidth / 1px) * 100 * 1%);
603
+ }
604
+ @mixin grid-fluid-offset-first-child ($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
605
+ margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) + ($fluidGridGutterWidth);
606
+ *margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (0.5 / ($gridRowWidth / 1px) * 100 * 1%) + $fluidGridGutterWidth - (.5 / ($gridRowWidth / 1px) * 100 * 1%);
607
+ }
608
+
597
609
  @mixin grid-fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
598
610
  width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
599
- *width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / ($gridRowWidth / 1px)* 100 * 1%);
611
+ *width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (0.5 / ($gridRowWidth / 1px) * 100 * 1%);
600
612
  }
601
613
  @mixin grid-fluid-span-x($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
602
614
  @for $i from 1 through $columns {
603
615
  .span#{$i} { @include grid-fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth) }
604
- }
616
+ }
617
+ }
618
+ @mixin grid-fluid-offset-x($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
619
+ @for $i from 1 through $columns {
620
+ .offset#{$i} { @include grid-fluid-offset($i, $fluidGridColumnWidth, $fluidGridGutterWidth) }
621
+ .offset#{$i}:first-child { @include grid-fluid-offset-first-child($i, $fluidGridColumnWidth, $fluidGridGutterWidth) }
622
+ }
605
623
  }
606
624
  @mixin grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth) {
607
625
  .row-fluid {
@@ -617,13 +635,14 @@
617
635
  margin-left: 0;
618
636
  }
619
637
 
620
- // generate .spanX
638
+ // generate .spanX and .offsetX
621
639
  @include grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
640
+ @include grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
622
641
  }
623
642
  }
624
643
 
625
644
  @mixin grid-input-span($columns, $gridColumnWidth, $gridGutterWidth) {
626
- width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
645
+ width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 14;
627
646
  }
628
647
  @mixin grid-input-span-x($columns, $gridColumnWidth, $gridGutterWidth) {
629
648
  @for $i from 1 through $columns {
@@ -637,6 +656,11 @@
637
656
  margin-left: 0; // override margin-left from core grid system
638
657
  }
639
658
 
659
+ // Space grid-sized controls properly if multiple per line
660
+ .controls-row [class*="span"] + [class*="span"] {
661
+ margin-left: $gridGutterWidth;
662
+ }
663
+
640
664
  // generate .spanX
641
665
  @include grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
642
666
  }