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.
Files changed (104) hide show
  1. data/README.md +211 -63
  2. data/lib/bootstrap/generators/version.rb +1 -1
  3. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +102 -28
  4. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +104 -31
  5. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  6. data/vendor/assets/javascripts/bootstrap-affix.js +104 -0
  7. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  8. data/vendor/assets/javascripts/bootstrap-button.js +2 -2
  9. data/vendor/assets/javascripts/bootstrap-carousel.js +12 -5
  10. data/vendor/assets/javascripts/bootstrap-collapse.js +4 -3
  11. data/vendor/assets/javascripts/bootstrap-dropdown.js +66 -16
  12. data/vendor/assets/javascripts/bootstrap-modal.js +95 -74
  13. data/vendor/assets/javascripts/bootstrap-popover.js +9 -4
  14. data/vendor/assets/javascripts/bootstrap-scrollspy.js +9 -9
  15. data/vendor/assets/javascripts/bootstrap-tab.js +2 -2
  16. data/vendor/assets/javascripts/bootstrap-tooltip.js +15 -15
  17. data/vendor/assets/javascripts/bootstrap-transition.js +2 -3
  18. data/vendor/assets/javascripts/bootstrap-typeahead.js +51 -36
  19. data/vendor/assets/javascripts/bootstrap.js +1 -1
  20. data/vendor/assets/stylesheets/bootstrap-responsive.css +1058 -0
  21. data/vendor/assets/stylesheets/bootstrap-responsive.min.css +9 -0
  22. data/vendor/assets/stylesheets/bootstrap.css +5774 -0
  23. data/vendor/assets/stylesheets/bootstrap.min.css +9 -0
  24. data/vendor/twitter/bootstrap/less/accordion.less +3 -2
  25. data/vendor/twitter/bootstrap/less/alerts.less +16 -9
  26. data/vendor/twitter/bootstrap/less/bootstrap.less +1 -1
  27. data/vendor/twitter/bootstrap/less/breadcrumbs.less +10 -10
  28. data/vendor/twitter/bootstrap/less/button-groups.less +79 -25
  29. data/vendor/twitter/bootstrap/less/buttons.less +107 -67
  30. data/vendor/twitter/bootstrap/less/carousel.less +13 -3
  31. data/vendor/twitter/bootstrap/less/close.less +4 -2
  32. data/vendor/twitter/bootstrap/less/code.less +6 -5
  33. data/vendor/twitter/bootstrap/less/component-animations.less +4 -2
  34. data/vendor/twitter/bootstrap/less/dropdowns.less +82 -15
  35. data/vendor/twitter/bootstrap/less/forms.less +124 -57
  36. data/vendor/twitter/bootstrap/less/grid.less +17 -1
  37. data/vendor/twitter/bootstrap/less/hero-unit.less +4 -2
  38. data/vendor/twitter/bootstrap/less/labels-badges.less +19 -2
  39. data/vendor/twitter/bootstrap/less/layouts.less +1 -2
  40. data/vendor/twitter/bootstrap/less/mixins.less +112 -77
  41. data/vendor/twitter/bootstrap/less/modals.less +12 -4
  42. data/vendor/twitter/bootstrap/less/navbar.less +245 -128
  43. data/vendor/twitter/bootstrap/less/navs.less +38 -17
  44. data/vendor/twitter/bootstrap/less/pager.less +11 -7
  45. data/vendor/twitter/bootstrap/less/pagination.less +23 -15
  46. data/vendor/twitter/bootstrap/less/popovers.less +101 -33
  47. data/vendor/twitter/bootstrap/less/progress-bars.less +18 -13
  48. data/vendor/twitter/bootstrap/less/reset.less +10 -4
  49. data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +9 -7
  50. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +95 -70
  51. data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +7 -5
  52. data/vendor/twitter/bootstrap/less/responsive-navbar.less +30 -6
  53. data/vendor/twitter/bootstrap/less/responsive-utilities.less +17 -15
  54. data/vendor/twitter/bootstrap/less/responsive.less +5 -5
  55. data/vendor/twitter/bootstrap/less/scaffolding.less +27 -4
  56. data/vendor/twitter/bootstrap/less/sprites.less +21 -19
  57. data/vendor/twitter/bootstrap/less/tables.less +81 -12
  58. data/vendor/twitter/bootstrap/less/thumbnails.less +9 -4
  59. data/vendor/twitter/bootstrap/less/tooltip.less +47 -12
  60. data/vendor/twitter/bootstrap/less/type.less +75 -86
  61. data/vendor/twitter/bootstrap/less/utilities.less +9 -2
  62. data/vendor/twitter/bootstrap/less/variables.less +104 -31
  63. data/vendor/twitter/bootstrap/less/wells.less +7 -5
  64. data/vendor/twitter/bootstrap/sass/_accordion.scss +3 -2
  65. data/vendor/twitter/bootstrap/sass/_alerts.scss +15 -8
  66. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +10 -10
  67. data/vendor/twitter/bootstrap/sass/_button-groups.scss +77 -23
  68. data/vendor/twitter/bootstrap/sass/_buttons.scss +106 -66
  69. data/vendor/twitter/bootstrap/sass/_carousel.scss +13 -3
  70. data/vendor/twitter/bootstrap/sass/_close.scss +5 -3
  71. data/vendor/twitter/bootstrap/sass/_code.scss +7 -6
  72. data/vendor/twitter/bootstrap/sass/_component-animations.scss +5 -3
  73. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +85 -18
  74. data/vendor/twitter/bootstrap/sass/_forms.scss +121 -53
  75. data/vendor/twitter/bootstrap/sass/_grid.scss +17 -1
  76. data/vendor/twitter/bootstrap/sass/_hero-unit.scss +4 -2
  77. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +29 -12
  78. data/vendor/twitter/bootstrap/sass/_layouts.scss +2 -3
  79. data/vendor/twitter/bootstrap/sass/_mixins.scss +163 -127
  80. data/vendor/twitter/bootstrap/sass/_modals.scss +12 -4
  81. data/vendor/twitter/bootstrap/sass/_navbar.scss +243 -127
  82. data/vendor/twitter/bootstrap/sass/_navs.scss +36 -15
  83. data/vendor/twitter/bootstrap/sass/_pager.scss +12 -8
  84. data/vendor/twitter/bootstrap/sass/_pagination.scss +23 -15
  85. data/vendor/twitter/bootstrap/sass/_popovers.scss +101 -33
  86. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +18 -13
  87. data/vendor/twitter/bootstrap/sass/_reset.scss +8 -3
  88. data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +9 -7
  89. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +95 -70
  90. data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +8 -6
  91. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +29 -5
  92. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +32 -15
  93. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +29 -4
  94. data/vendor/twitter/bootstrap/sass/_sprites.scss +21 -19
  95. data/vendor/twitter/bootstrap/sass/_tables.scss +79 -11
  96. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +9 -4
  97. data/vendor/twitter/bootstrap/sass/_tooltip.scss +47 -12
  98. data/vendor/twitter/bootstrap/sass/_type.scss +74 -85
  99. data/vendor/twitter/bootstrap/sass/_utilities.scss +24 -2
  100. data/vendor/twitter/bootstrap/sass/_variables.scss +102 -28
  101. data/vendor/twitter/bootstrap/sass/_wells.scss +7 -5
  102. data/vendor/twitter/bootstrap/sass/bootstrap.scss +1 -1
  103. data/vendor/twitter/bootstrap/sass/responsive.scss +5 -5
  104. metadata +15 -10
data/README.md CHANGED
@@ -6,15 +6,15 @@ Bootstrap-generators provides [Twitter Bootstrap](http://twitter.github.com/boot
6
6
 
7
7
  In your Gemfile, add this line:
8
8
 
9
- gem 'bootstrap-generators', '~> 2.0'
9
+ gem 'bootstrap-generators', '~> 2.1'
10
10
 
11
11
  Or you can install from latest build:
12
12
 
13
- gem 'bootstrap-generators', '~> 2.0', :git => 'git://github.com/decioferreira/bootstrap-generators.git'
13
+ gem 'bootstrap-generators', '~> 2.1', :git => 'git://github.com/decioferreira/bootstrap-generators.git'
14
14
 
15
15
  By default Bootstrap Generators requires [SimpleForm 2.0](https://github.com/plataformatec/simple_form). Add the dependency on your Gemfile:
16
16
 
17
- gem 'simple_form', '~> 2.0'
17
+ gem 'simple_form'
18
18
 
19
19
  If you don't want to use SimpleForm, just pass the `--form_builder=form_builder` option:
20
20
 
@@ -79,7 +79,7 @@ To select one of these layouts just pass the option `--layout=LAYOUT` to the ins
79
79
 
80
80
  By default Bootstrap Generators requires SimpleForm 2.0. Add the dependency on your Gemfile:
81
81
 
82
- gem 'simple_form', '~> 2.0'
82
+ gem 'simple_form'
83
83
 
84
84
  And then run:
85
85
 
@@ -146,13 +146,12 @@ If you select LESS or SCSS as your stylesheet engine, you will get an `app/asset
146
146
 
147
147
  LESS version:
148
148
 
149
- // Variables.less
150
- // Variables to customize the look and feel of Bootstrap
151
- // -----------------------------------------------------
152
-
149
+ //
150
+ // Variables
151
+ // --------------------------------------------------
153
152
 
154
153
 
155
- // GLOBAL VALUES
154
+ // Global values
156
155
  // --------------------------------------------------
157
156
 
158
157
 
@@ -195,18 +194,17 @@ LESS version:
195
194
  // -------------------------
196
195
  @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
197
196
  @serifFontFamily: Georgia, "Times New Roman", Times, serif;
198
- @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
197
+ @monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
199
198
 
200
- @baseFontSize: 13px;
199
+ @baseFontSize: 14px;
201
200
  @baseFontFamily: @sansFontFamily;
202
- @baseLineHeight: 18px;
201
+ @baseLineHeight: 20px;
203
202
  @altFontFamily: @serifFontFamily;
204
203
 
205
204
  @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
206
205
  @headingsFontWeight: bold; // instead of browser default, bold
207
206
  @headingsColor: inherit; // empty to use BS default, @textColor
208
207
 
209
-
210
208
  // Tables
211
209
  // -------------------------
212
210
  @tableBackground: transparent; // overall background-color
@@ -214,15 +212,14 @@ LESS version:
214
212
  @tableBackgroundHover: #f5f5f5; // for hover
215
213
  @tableBorder: #ddd; // table and cell border
216
214
 
217
-
218
215
  // Buttons
219
216
  // -------------------------
220
217
  @btnBackground: @white;
221
218
  @btnBackgroundHighlight: darken(@white, 10%);
222
- @btnBorder: #ccc;
219
+ @btnBorder: #bbb;
223
220
 
224
221
  @btnPrimaryBackground: @linkColor;
225
- @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
222
+ @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
226
223
 
227
224
  @btnInfoBackground: #5bc0de;
228
225
  @btnInfoBackgroundHighlight: #2f96b4;
@@ -236,7 +233,7 @@ LESS version:
236
233
  @btnDangerBackground: #ee5f5b;
237
234
  @btnDangerBackgroundHighlight: #bd362f;
238
235
 
239
- @btnInverseBackground: @gray;
236
+ @btnInverseBackground: #444;
240
237
  @btnInverseBackgroundHighlight: @grayDarker;
241
238
 
242
239
 
@@ -252,12 +249,16 @@ LESS version:
252
249
  // -------------------------
253
250
  @dropdownBackground: @white;
254
251
  @dropdownBorder: rgba(0,0,0,.2);
255
- @dropdownLinkColor: @grayDark;
256
- @dropdownLinkColorHover: @white;
257
- @dropdownLinkBackgroundHover: @linkColor;
258
252
  @dropdownDividerTop: #e5e5e5;
259
253
  @dropdownDividerBottom: @white;
260
254
 
255
+ @dropdownLinkColor: @grayDark;
256
+ @dropdownLinkColorHover: @white;
257
+ @dropdownLinkColorActive: @dropdownLinkColor;
258
+
259
+ @dropdownLinkBackgroundActive: @linkColor;
260
+ @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
261
+
261
262
 
262
263
 
263
264
  // COMPONENT VARIABLES
@@ -269,7 +270,7 @@ LESS version:
269
270
  // Try to avoid customizing these :)
270
271
  @zindexDropdown: 1000;
271
272
  @zindexPopover: 1010;
272
- @zindexTooltip: 1020;
273
+ @zindexTooltip: 1030;
273
274
  @zindexFixedNavbar: 1030;
274
275
  @zindexModalBackdrop: 1040;
275
276
  @zindexModal: 1050;
@@ -291,25 +292,60 @@ LESS version:
291
292
  @hrBorder: @grayLighter;
292
293
 
293
294
 
295
+ // Horizontal forms & lists
296
+ // -------------------------
297
+ @horizontalComponentOffset: 180px;
298
+
299
+
300
+ // Wells
301
+ // -------------------------
302
+ @wellBackground: #f5f5f5;
303
+
304
+
294
305
  // Navbar
295
306
  // -------------------------
296
- @navbarHeight: 40px;
297
- @navbarBackground: @grayDarker;
298
- @navbarBackgroundHighlight: @grayDark;
307
+ @navbarCollapseWidth: 979px;
299
308
 
300
- @navbarText: @grayLight;
301
- @navbarLinkColor: @grayLight;
302
- @navbarLinkColorHover: @white;
303
- @navbarLinkColorActive: @navbarLinkColorHover;
309
+ @navbarHeight: 40px;
310
+ @navbarBackgroundHighlight: #ffffff;
311
+ @navbarBackground: darken(@navbarBackgroundHighlight, 5%);
312
+ @navbarBorder: darken(@navbarBackground, 12%);
313
+
314
+ @navbarText: #777;
315
+ @navbarLinkColor: #777;
316
+ @navbarLinkColorHover: @grayDark;
317
+ @navbarLinkColorActive: @gray;
304
318
  @navbarLinkBackgroundHover: transparent;
305
- @navbarLinkBackgroundActive: @navbarBackground;
319
+ @navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
306
320
 
307
- @navbarSearchBackground: lighten(@navbarBackground, 25%);
308
- @navbarSearchBackgroundFocus: @white;
309
- @navbarSearchBorder: darken(@navbarSearchBackground, 30%);
310
- @navbarSearchPlaceholderColor: #ccc;
311
321
  @navbarBrandColor: @navbarLinkColor;
312
322
 
323
+ // Inverted navbar
324
+ @navbarInverseBackground: #111111;
325
+ @navbarInverseBackgroundHighlight: #222222;
326
+ @navbarInverseBorder: #252525;
327
+
328
+ @navbarInverseText: @grayLight;
329
+ @navbarInverseLinkColor: @grayLight;
330
+ @navbarInverseLinkColorHover: @white;
331
+ @navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
332
+ @navbarInverseLinkBackgroundHover: transparent;
333
+ @navbarInverseLinkBackgroundActive: @navbarInverseBackground;
334
+
335
+ @navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
336
+ @navbarInverseSearchBackgroundFocus: @white;
337
+ @navbarInverseSearchBorder: @navbarInverseBackground;
338
+ @navbarInverseSearchPlaceholderColor: #ccc;
339
+
340
+ @navbarInverseBrandColor: @navbarInverseLinkColor;
341
+
342
+
343
+ // Pagination
344
+ // -------------------------
345
+ @paginationBackground: #fff;
346
+ @paginationBorder: #ddd;
347
+ @paginationActiveBackground: #f5f5f5;
348
+
313
349
 
314
350
  // Hero unit
315
351
  // -------------------------
@@ -337,10 +373,28 @@ LESS version:
337
373
  @infoBorder: darken(spin(@infoBackground, -10), 7%);
338
374
 
339
375
 
376
+ // Tooltips and popovers
377
+ // -------------------------
378
+ @tooltipColor: #fff;
379
+ @tooltipBackground: #000;
380
+ @tooltipArrowWidth: 5px;
381
+ @tooltipArrowColor: @tooltipBackground;
382
+
383
+ @popoverBackground: #fff;
384
+ @popoverArrowWidth: 10px;
385
+ @popoverArrowColor: #fff;
386
+ @popoverTitleBackground: darken(@popoverBackground, 3%);
387
+
388
+ // Special enhancement for popovers
389
+ @popoverArrowOuterWidth: @popoverArrowWidth + 1;
390
+ @popoverArrowOuterColor: rgba(0,0,0,.25);
391
+
392
+
340
393
 
341
394
  // GRID
342
395
  // --------------------------------------------------
343
396
 
397
+
344
398
  // Default 940px grid
345
399
  // -------------------------
346
400
  @gridColumns: 12;
@@ -348,20 +402,38 @@ LESS version:
348
402
  @gridGutterWidth: 20px;
349
403
  @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
350
404
 
405
+ // 1200px min
406
+ @gridColumnWidth1200: 70px;
407
+ @gridGutterWidth1200: 30px;
408
+ @gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
409
+
410
+ // 768px-979px
411
+ @gridColumnWidth768: 42px;
412
+ @gridGutterWidth768: 20px;
413
+ @gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
414
+
415
+
351
416
  // Fluid grid
352
417
  // -------------------------
353
- @fluidGridColumnWidth: 6.382978723%;
354
- @fluidGridGutterWidth: 2.127659574%;
418
+ @fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
419
+ @fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
420
+
421
+ // 1200px min
422
+ @fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
423
+ @fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
424
+
425
+ // 768px-979px
426
+ @fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
427
+ @fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
355
428
 
356
429
  SCSS version:
357
430
 
431
+ //
358
432
  // Variables
359
- // Variables to customize the look and feel of Bootstrap
360
- // -----------------------------------------------------
361
-
433
+ // --------------------------------------------------
362
434
 
363
435
 
364
- // GLOBAL VALUES
436
+ // Global values
365
437
  // --------------------------------------------------
366
438
 
367
439
 
@@ -404,18 +476,17 @@ SCSS version:
404
476
  // -------------------------
405
477
  $sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
406
478
  $serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
407
- $monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace !default;
479
+ $monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default;
408
480
 
409
- $baseFontSize: 13px !default;
481
+ $baseFontSize: 14px !default;
410
482
  $baseFontFamily: $sansFontFamily !default;
411
- $baseLineHeight: 18px !default;
483
+ $baseLineHeight: 20px !default;
412
484
  $altFontFamily: $serifFontFamily !default;
413
485
 
414
486
  $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontFamily
415
487
  $headingsFontWeight: bold !default; // instead of browser default, bold
416
488
  $headingsColor: inherit !default; // empty to use BS default, $textColor
417
489
 
418
-
419
490
  // Tables
420
491
  // -------------------------
421
492
  $tableBackground: transparent !default; // overall background-color
@@ -423,15 +494,14 @@ SCSS version:
423
494
  $tableBackgroundHover: #f5f5f5 !default; // for hover
424
495
  $tableBorder: #ddd !default; // table and cell border
425
496
 
426
-
427
497
  // Buttons
428
498
  // -------------------------
429
499
  $btnBackground: $white !default;
430
500
  $btnBackgroundHighlight: darken($white, 10%) !default;
431
- $btnBorder: #ccc !default;
501
+ $btnBorder: #bbb !default;
432
502
 
433
503
  $btnPrimaryBackground: $linkColor !default;
434
- $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 15%) !default;
504
+ $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default;
435
505
 
436
506
  $btnInfoBackground: #5bc0de !default;
437
507
  $btnInfoBackgroundHighlight: #2f96b4 !default;
@@ -445,7 +515,7 @@ SCSS version:
445
515
  $btnDangerBackground: #ee5f5b !default;
446
516
  $btnDangerBackgroundHighlight: #bd362f !default;
447
517
 
448
- $btnInverseBackground: $gray !default;
518
+ $btnInverseBackground: #444 !default;
449
519
  $btnInverseBackgroundHighlight: $grayDarker !default;
450
520
 
451
521
 
@@ -461,9 +531,15 @@ SCSS version:
461
531
  // -------------------------
462
532
  $dropdownBackground: $white !default;
463
533
  $dropdownBorder: rgba(0,0,0,.2) !default;
534
+ $dropdownDividerTop: #e5e5e5 !default;
535
+ $dropdownDividerBottom: $white !default;
536
+
464
537
  $dropdownLinkColor: $grayDark !default;
465
538
  $dropdownLinkColorHover: $white !default;
466
- $dropdownLinkBackgroundHover: $linkColor !default;
539
+ $dropdownLinkColorActive: $dropdownLinkColor !default;
540
+
541
+ $dropdownLinkBackgroundActive: $linkColor !default;
542
+ $dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default;
467
543
 
468
544
 
469
545
 
@@ -476,7 +552,7 @@ SCSS version:
476
552
  // Try to avoid customizing these :)
477
553
  $zindexDropdown: 1000 !default;
478
554
  $zindexPopover: 1010 !default;
479
- $zindexTooltip: 1020 !default;
555
+ $zindexTooltip: 1030 !default;
480
556
  $zindexFixedNavbar: 1030 !default;
481
557
  $zindexModalBackdrop: 1040 !default;
482
558
  $zindexModal: 1050 !default;
@@ -498,25 +574,60 @@ SCSS version:
498
574
  $hrBorder: $grayLighter !default;
499
575
 
500
576
 
577
+ // Horizontal forms & lists
578
+ // -------------------------
579
+ $horizontalComponentOffset: 180px;
580
+
581
+
582
+ // Wells
583
+ // -------------------------
584
+ $wellBackground: #f5f5f5 !default;
585
+
586
+
501
587
  // Navbar
502
588
  // -------------------------
503
- $navbarHeight: 40px !default;
504
- $navbarBackground: $grayDarker !default;
505
- $navbarBackgroundHighlight: $grayDark !default;
589
+ $navbarCollapseWidth: 979px !default;
506
590
 
507
- $navbarText: $grayLight !default;
508
- $navbarLinkColor: $grayLight !default;
509
- $navbarLinkColorHover: $white !default;
510
- $navbarLinkColorActive: $navbarLinkColorHover !default;
591
+ $navbarHeight: 40px !default;
592
+ $navbarBackgroundHighlight: #ffffff !default;
593
+ $navbarBackground: darken($navbarBackgroundHighlight, 5%) !default;
594
+ $navbarBorder: darken($navbarBackground, 12%) !default;
595
+
596
+ $navbarText: #777 !default;
597
+ $navbarLinkColor: #777 !default;
598
+ $navbarLinkColorHover: $grayDark !default;
599
+ $navbarLinkColorActive: $gray !default;
511
600
  $navbarLinkBackgroundHover: transparent !default;
512
- $navbarLinkBackgroundActive: $navbarBackground !default;
601
+ $navbarLinkBackgroundActive: darken($navbarBackground, 5.25%) !default;
513
602
 
514
- $navbarSearchBackground: lighten($navbarBackground, 25%) !default;
515
- $navbarSearchBackgroundFocus: $white !default;
516
- $navbarSearchBorder: darken($navbarSearchBackground, 30%) !default;
517
- $navbarSearchPlaceholderColor: #ccc !default;
518
603
  $navbarBrandColor: $navbarLinkColor !default;
519
604
 
605
+ // Inverted navbar
606
+ $navbarInverseBackground: #111111 !default;
607
+ $navbarInverseBackgroundHighlight: #222222 !default;
608
+ $navbarInverseBorder: #252525 !default;
609
+
610
+ $navbarInverseText: $grayLight !default;
611
+ $navbarInverseLinkColor: $grayLight !default;
612
+ $navbarInverseLinkColorHover: $white !default;
613
+ $navbarInverseLinkColorActive: $navbarInverseLinkColorHover !default;
614
+ $navbarInverseLinkBackgroundHover: transparent !default;
615
+ $navbarInverseLinkBackgroundActive: $navbarInverseBackground !default;
616
+
617
+ $navbarInverseSearchBackground: lighten($navbarInverseBackground, 25%) !default;
618
+ $navbarInverseSearchBackgroundFocus: $white !default;
619
+ $navbarInverseSearchBorder: $navbarInverseBackground !default;
620
+ $navbarInverseSearchPlaceholderColor: #ccc !default;
621
+
622
+ $navbarInverseBrandColor: $navbarInverseLinkColor !default;
623
+
624
+
625
+ // Pagination
626
+ // -------------------------
627
+ $paginationBackground: #fff !default;
628
+ $paginationBorder: #ddd !default;
629
+ $paginationActiveBackground: #f5f5f5 !default;
630
+
520
631
 
521
632
  // Hero unit
522
633
  // -------------------------
@@ -544,6 +655,23 @@ SCSS version:
544
655
  $infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default;
545
656
 
546
657
 
658
+ // Tooltips and popovers
659
+ // -------------------------
660
+ $tooltipColor: #fff !default;
661
+ $tooltipBackground: #000 !default;
662
+ $tooltipArrowWidth: 5px !default;
663
+ $tooltipArrowColor: $tooltipBackground !default;
664
+
665
+ $popoverBackground: #fff !default;
666
+ $popoverArrowWidth: 10px !default;
667
+ $popoverArrowColor: #fff !default;
668
+ $popoverTitleBackground: darken($popoverBackground, 3%) !default;
669
+
670
+ // Special enhancement for popovers
671
+ $popoverArrowOuterWidth: $popoverArrowWidth + 1 !default;
672
+ $popoverArrowOuterColor: rgba(0,0,0,.25) !default;
673
+
674
+
547
675
 
548
676
  // GRID
549
677
  // --------------------------------------------------
@@ -555,10 +683,29 @@ SCSS version:
555
683
  $gridGutterWidth: 20px !default;
556
684
  $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
557
685
 
686
+ // 1200px min
687
+ $gridColumnWidth1200: 70px !default;
688
+ $gridGutterWidth1200: 30px !default;
689
+ $gridRowWidth1200: ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1)) !default;
690
+
691
+ // 768px-979px
692
+ $gridColumnWidth768: 42px !default;
693
+ $gridGutterWidth768: 20px !default;
694
+ $gridRowWidth768: ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1)) !default;
695
+
696
+
558
697
  // Fluid grid
559
698
  // -------------------------
560
- $fluidGridColumnWidth: 6.382978723% !default;
561
- $fluidGridGutterWidth: 2.127659574% !default;
699
+ $fluidGridColumnWidth: percentage($gridColumnWidth/$gridRowWidth) !default;
700
+ $fluidGridGutterWidth: percentage($gridGutterWidth/$gridRowWidth) !default;
701
+
702
+ // 1200px min
703
+ $fluidGridColumnWidth1200: percentage($gridColumnWidth1200/$gridRowWidth1200) !default;
704
+ $fluidGridGutterWidth1200: percentage($gridGutterWidth1200/$gridRowWidth1200) !default;
705
+
706
+ // 768px-979px
707
+ $fluidGridColumnWidth768: percentage($gridColumnWidth768/$gridRowWidth768) !default;
708
+ $fluidGridGutterWidth768: percentage($gridGutterWidth768/$gridRowWidth768) !default;
562
709
 
563
710
  ### Javascript
564
711
 
@@ -580,6 +727,7 @@ Or quickly add only the necessary javascript (Transitions: required for any anim
580
727
  //= require bootstrap-collapse
581
728
  //= require bootstrap-carousel
582
729
  //= require bootstrap-typeahead
730
+ //= require bootstrap-affix
583
731
 
584
732
  ## Customizing Templates
585
733