bootswatch-rails 3.2.4 → 3.3.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +23 -19
  3. data/bootswatch-rails.gemspec +1 -1
  4. data/lib/bootswatch-rails/version.rb +1 -1
  5. data/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +11 -5
  6. data/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +60 -43
  7. data/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +38 -1
  8. data/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss +61 -44
  9. data/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +47 -1
  10. data/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss +57 -40
  11. data/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss +57 -4
  12. data/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss +65 -48
  13. data/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +57 -3
  14. data/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss +61 -44
  15. data/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +2 -2
  16. data/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +59 -42
  17. data/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss +70 -9
  18. data/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss +147 -128
  19. data/vendor/assets/stylesheets/bootswatch/paper/_bootswatch.scss +307 -84
  20. data/vendor/assets/stylesheets/bootswatch/paper/_variables.scss +37 -22
  21. data/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +15 -20
  22. data/vendor/assets/stylesheets/bootswatch/readable/_variables.scss +69 -52
  23. data/vendor/assets/stylesheets/bootswatch/sandstone/_bootswatch.scss +11 -12
  24. data/vendor/assets/stylesheets/bootswatch/sandstone/_variables.scss +32 -16
  25. data/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +1 -1
  26. data/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss +59 -42
  27. data/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +43 -1
  28. data/vendor/assets/stylesheets/bootswatch/slate/_variables.scss +69 -50
  29. data/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +3 -3
  30. data/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss +59 -42
  31. data/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +47 -1
  32. data/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +211 -190
  33. data/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +15 -1
  34. data/vendor/assets/stylesheets/bootswatch/united/_variables.scss +58 -41
  35. data/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss +6 -1
  36. data/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss +45 -30
  37. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6c202142f6c2b961c28bd97afd07cff4cc3081e3
4
- data.tar.gz: a33c521af33efa9721cc2537bc464a1053623600
3
+ metadata.gz: 2659926a7c5393c92e126ab8e4f4db0afff53e4f
4
+ data.tar.gz: b556417b1952ac542e3a67dd0a9f09bcf4ba2d22
5
5
  SHA512:
6
- metadata.gz: 0e75bb8d8701b85bed7441e220b5ab244f7cabb5592c82fd619c511bffd08f9c71a44eb2cb093aece3246c35ea0d1beed1d3e59aac254989fb7cac27a62a7fc8
7
- data.tar.gz: 16ac03f5c9d9903e8253a83111881a6fdba56b36d086999162e6c642b7a53d66f3aad47d9c331917f152fd3a5940ca118c9521092c0f19dd8a20027f1fd34a6e
6
+ metadata.gz: d479fd2ab7b80b69d225ebd57d5ef643cc5572d8a27f5ed87b7a14d2288576d365b6ea9e0b9e14392f7d06b2992593f9cf16eec6de2929b4e34a9f686e012b71
7
+ data.tar.gz: 18c329719f0346cb630ed09aba4f3618af0fa046a1601093124cc8d0d1c22fbd5b5583b7556efdf11446b345d6aa741ea2ed04aa6dff5b73f490c34f63347741
data/README.md CHANGED
@@ -30,35 +30,39 @@ Here's approximately how your `application.css.scss` file should look like,
30
30
  considering that you're using
31
31
  [bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass).
32
32
 
33
- // Example using 'Cerulean' bootswatch
34
- //
35
- // First import cerulean variables
36
- @import "bootswatch/cerulean/variables";
33
+ ````sass
34
+ // Example using 'Cerulean' bootswatch
37
35
 
38
- // Then bootstrap itself
39
- @import "bootstrap";
36
+ //Import bootstrap-sprockets
37
+ @import "bootstrap-sprockets";
40
38
 
41
- // Bootstrap body padding for fixed navbar
42
- body { padding-top: 60px; }
39
+ // Import cerulean variables
40
+ @import "bootswatch/cerulean/variables";
43
41
 
44
- // And finally bootswatch style itself
45
- @import "bootswatch/cerulean/bootswatch";
42
+ // Then bootstrap itself
43
+ @import "bootstrap";
46
44
 
47
- // Whatever application styles you have go last
48
- @import "base";
45
+ // Bootstrap body padding for fixed navbar
46
+ body { padding-top: 60px; }
49
47
 
48
+ // And finally bootswatch style itself
49
+ @import "bootswatch/cerulean/bootswatch";
50
+
51
+ // Whatever application styles you have go last
52
+ @import "base";
53
+ ````
50
54
  ### Overriding bootswatch variables
51
55
 
52
56
  Since version 3.1 it's possible to override variables.
57
+ ````sass
58
+ // First set or import your overrides
59
+ $textColor: #000;
53
60
 
54
- // First set or import your overrides
55
- $textColor: #000;
56
-
57
- // Then load variables
58
- @import "bootswatch/journal/variables";
59
-
60
- // Then the rest as shown above...
61
+ // Then load variables
62
+ @import "bootswatch/journal/variables";
61
63
 
64
+ // Then the rest as shown above...
65
+ ````
62
66
  ## Bootswatches
63
67
 
64
68
  Included bootswatches
@@ -4,7 +4,7 @@ require File.expand_path('../lib/bootswatch-rails/version', __FILE__)
4
4
  Gem::Specification.new do |gem|
5
5
  gem.authors = ["Maxim Chernyak","Esteban Arango Medina"]
6
6
  gem.email = ["max@bitsonnet.com","marranoparael31@gmail.com"]
7
- gem.description = %q{Bootswatches converted to SCSS ready to use in Rails 3 asset pipeline.}
7
+ gem.description = %q{Bootswatches converted to SCSS ready to use in Rails asset pipeline.}
8
8
  gem.summary = %q{Bootswatches in your Rails asset pipeline}
9
9
  gem.homepage = "http://github.com/maxim/bootswatch-rails"
10
10
 
@@ -1,5 +1,5 @@
1
1
  module Bootswatch
2
2
  module Rails
3
- VERSION = '3.2.4'
3
+ VERSION = '3.3.4'
4
4
  end
5
5
  end
@@ -1,4 +1,4 @@
1
- // Cerulean 3.2.0
1
+ // Cerulean 3.3.4
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -14,11 +14,11 @@
14
14
  @include btn-shadow($navbar-default-bg);
15
15
  filter: none;
16
16
  @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1));
17
+ }
17
18
 
18
- .navbar-nav > li > a,
19
- .navbar-brand {
20
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
21
- }
19
+ .navbar .navbar-nav > li > a,
20
+ .navbar-brand {
21
+ text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
22
22
  }
23
23
 
24
24
  .navbar-default {
@@ -47,6 +47,12 @@
47
47
  .dropdown-header {
48
48
  color: #fff;
49
49
  }
50
+
51
+ .dropdown-menu {
52
+ a {
53
+ color: #fff;
54
+ }
55
+ }
50
56
  }
51
57
  }
52
58
 
@@ -1,4 +1,4 @@
1
- // Cerulean 3.2.0
1
+ // Cerulean 3.3.4
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -7,11 +7,12 @@
7
7
  //
8
8
  //## Gray and brand colors for use across Bootstrap.
9
9
 
10
- $gray: lighten(#000, 33.5%) !default; // #555
11
- $gray-darker: lighten(#000, 13.5%) !default; // #222
12
- $gray-dark: lighten(#000, 20%) !default; // #333
13
- $gray-light: lighten(#000, 60%) !default; // #999
14
- $gray-lighter: lighten(#000, 93.5%) !default; // #eee
10
+ $gray-base: #000 !default;
11
+ $gray-darker: lighten($gray-base, 13.5%) !default; // #222
12
+ $gray-dark: lighten($gray-base, 20%) !default; // #333
13
+ $gray: lighten($gray-base, 33.5%) !default; // #555
14
+ $gray-light: lighten($gray-base, 60%) !default; // #999
15
+ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
15
16
 
16
17
  $brand-primary: #2FA4E7 !default;
17
18
  $brand-success: #73A839 !default;
@@ -33,6 +34,8 @@ $text-color: $gray !default;
33
34
  $link-color: $brand-primary !default;
34
35
  //** Link hover color set via `darken()` function.
35
36
  $link-hover-color: darken($link-color, 15%) !default;
37
+ //** Link hover decoration.
38
+ $link-hover-decoration: underline !default;
36
39
 
37
40
 
38
41
  //== Typography
@@ -95,7 +98,7 @@ $padding-small-horizontal: 10px !default;
95
98
  $padding-xs-vertical: 1px !default;
96
99
  $padding-xs-horizontal: 5px !default;
97
100
 
98
- $line-height-large: 1.33 !default;
101
+ $line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
99
102
  $line-height-small: 1.5 !default;
100
103
 
101
104
  $border-radius-base: 4px !default;
@@ -180,8 +183,16 @@ $input-bg-disabled: $gray-lighter !default;
180
183
  $input-color: $text-color !default;
181
184
  //** `<input>` border color
182
185
  $input-border: #ccc !default;
183
- //** `<input>` border radius
186
+
187
+ // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
188
+ //** Default `.form-control` border radius
189
+ // This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
184
190
  $input-border-radius: $border-radius-base !default;
191
+ //** Large `.form-control` border radius
192
+ $input-border-radius-large: $border-radius-large !default;
193
+ //** Small `.form-control` border radius
194
+ $input-border-radius-small: $border-radius-small !default;
195
+
185
196
  //** Border color for inputs on focus
186
197
  $input-border-focus: #66afe9 !default;
187
198
 
@@ -195,6 +206,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
195
206
  //** Small `.form-control` height
196
207
  $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
197
208
 
209
+ //** `.form-group` margin
210
+ $form-group-margin-bottom: 15px !default;
211
+
198
212
  $legend-color: $text-color !default;
199
213
  $legend-border-color: #e5e5e5 !default;
200
214
 
@@ -203,30 +217,9 @@ $input-group-addon-bg: $gray-lighter !default;
203
217
  //** Border color for textual input addons
204
218
  $input-group-addon-border-color: $input-border !default;
205
219
 
206
- //== Type
207
- //
208
- //##
220
+ //** Disabled cursor for form controls and buttons.
221
+ $cursor-disabled: not-allowed !default;
209
222
 
210
- //** Horizontal offset for forms and lists.
211
- $component-offset-horizontal: 180px !default;
212
- //** Text muted color
213
- $text-muted: $gray-light !default;
214
- //** Abbreviations and acronyms border color
215
- $abbr-border-color: $gray-light !default;
216
- //** Headings small color
217
- $headings-small-color: $gray-light !default;
218
- //** Blockquote small color
219
- $blockquote-small-color: $gray-light !default;
220
- //** Blockquote font size
221
- $blockquote-font-size: ($font-size-base * 1.25) !default;
222
- //** Blockquote border color
223
- $blockquote-border-color: $gray-lighter !default;
224
- //** Page header border color
225
- $page-header-border-color: $gray-lighter !default;
226
- //** Width of horizontal description list titles
227
- $dl-horizontal-offset: $component-offset-horizontal !default;
228
- //** Horizontal line color.
229
- $hr-border: $gray-lighter !default;
230
223
 
231
224
  //== Dropdowns
232
225
  //
@@ -241,23 +234,23 @@ $dropdown-fallback-border: #ccc !default;
241
234
  //** Divider color for between dropdown items.
242
235
  $dropdown-divider-bg: #e5e5e5 !default;
243
236
 
244
- //** Active dropdown menu item background color.
245
- $dropdown-link-active-bg: $component-active-bg !default;
246
237
  //** Dropdown link text color.
247
238
  $dropdown-link-color: $gray-dark !default;
248
239
  //** Hover color for dropdown links.
249
240
  $dropdown-link-hover-color: #fff !default;
250
241
  //** Hover background for dropdown links.
251
- $dropdown-link-hover-bg: $dropdown-link-active-bg !default;
242
+ $dropdown-link-hover-bg: $component-active-bg !default;
252
243
 
253
244
  //** Active dropdown menu item text color.
254
245
  $dropdown-link-active-color: #fff !default;
246
+ //** Active dropdown menu item background color.
247
+ $dropdown-link-active-bg: $component-active-bg !default;
255
248
 
256
249
  //** Disabled dropdown menu item background color.
257
- $dropdown-link-disabled-color: $text-muted !default;
250
+ $dropdown-link-disabled-color: $gray-light !default;
258
251
 
259
252
  //** Text color for headers within dropdown menus.
260
- $dropdown-header-color: $text-muted !default;
253
+ $dropdown-header-color: $gray-light !default;
261
254
 
262
255
  //** Deprecated `@dropdown-caret-color` as of v3.1.0
263
256
  $dropdown-caret-color: #000 !default;
@@ -338,17 +331,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
338
331
  //## Define the maximum width of `.container` for different screen sizes.
339
332
 
340
333
  // Small screen / tablet
341
- $container-tablet: ((720px + $grid-gutter-width)) !default;
334
+ $container-tablet: (720px + $grid-gutter-width) !default;
342
335
  //** For `@screen-sm-min` and up.
343
336
  $container-sm: $container-tablet !default;
344
337
 
345
338
  // Medium screen / desktop
346
- $container-desktop: ((940px + $grid-gutter-width)) !default;
339
+ $container-desktop: (940px + $grid-gutter-width) !default;
347
340
  //** For `@screen-md-min` and up.
348
341
  $container-md: $container-desktop !default;
349
342
 
350
343
  // Large screen / wide desktop
351
- $container-large-desktop: ((1140px + $grid-gutter-width)) !default;
344
+ $container-large-desktop: (1140px + $grid-gutter-width) !default;
352
345
  //** For `@screen-lg-min` and up.
353
346
  $container-lg: $container-large-desktop !default;
354
347
 
@@ -426,8 +419,6 @@ $nav-link-hover-bg: $gray-lighter !default;
426
419
  $nav-disabled-link-color: $gray-light !default;
427
420
  $nav-disabled-link-hover-color: $gray-light !default;
428
421
 
429
- $nav-open-link-hover-color: #fff !default;
430
-
431
422
  //== Tabs
432
423
  $nav-tabs-border-color: #ddd !default;
433
424
 
@@ -524,7 +515,7 @@ $tooltip-max-width: 200px !default;
524
515
  //** Tooltip text color
525
516
  $tooltip-color: #fff !default;
526
517
  //** Tooltip background color
527
- $tooltip-bg: rgba(0,0,0,.9) !default;
518
+ $tooltip-bg: #000 !default;
528
519
  $tooltip-opacity: .9 !default;
529
520
 
530
521
  //** Tooltip arrow width
@@ -552,7 +543,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default;
552
543
  //** Popover arrow width
553
544
  $popover-arrow-width: 10px !default;
554
545
  //** Popover arrow color
555
- $popover-arrow-color: #fff !default;
546
+ $popover-arrow-color: $popover-bg !default;
556
547
 
557
548
  //** Popover outer arrow width
558
549
  $popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
@@ -651,6 +642,8 @@ $alert-danger-border: $state-danger-border !default;
651
642
  $progress-bg: #f5f5f5 !default;
652
643
  //** Progress bar text color
653
644
  $progress-bar-color: #fff !default;
645
+ //** Variable for setting rounded corners on progress bar.
646
+ $progress-border-radius: $border-radius-base !default;
654
647
 
655
648
  //** Default progress bar color
656
649
  $progress-bar-bg: $brand-primary !default;
@@ -841,3 +834,27 @@ $pre-border-color: #ccc !default;
841
834
  $pre-scrollable-max-height: 340px !default;
842
835
 
843
836
 
837
+ //== Type
838
+ //
839
+ //##
840
+
841
+ //** Horizontal offset for forms and lists.
842
+ $component-offset-horizontal: 180px !default;
843
+ //** Text muted color
844
+ $text-muted: $gray-light !default;
845
+ //** Abbreviations and acronyms border color
846
+ $abbr-border-color: $gray-light !default;
847
+ //** Headings small color
848
+ $headings-small-color: $gray-light !default;
849
+ //** Blockquote small color
850
+ $blockquote-small-color: $gray-light !default;
851
+ //** Blockquote font size
852
+ $blockquote-font-size: ($font-size-base * 1.25) !default;
853
+ //** Blockquote border color
854
+ $blockquote-border-color: $gray-lighter !default;
855
+ //** Page header border color
856
+ $page-header-border-color: $gray-lighter !default;
857
+ //** Width of horizontal description list titles
858
+ $dl-horizontal-offset: $component-offset-horizontal !default;
859
+ //** Horizontal line color.
860
+ $hr-border: $gray-lighter !default;
@@ -1,4 +1,4 @@
1
- // Cosmo 3.2.0
1
+ // Cosmo 3.3.4
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -57,6 +57,10 @@ table,
57
57
  text-decoration: underline;
58
58
  }
59
59
 
60
+ .dropdown-menu a {
61
+ text-decoration: none;
62
+ }
63
+
60
64
  .success,
61
65
  .warning,
62
66
  .danger,
@@ -182,6 +186,39 @@ table,
182
186
  }
183
187
  }
184
188
 
189
+ a.list-group-item-success {
190
+ &.active {
191
+ background-color: $state-success-bg;
192
+ }
193
+
194
+ &.active:hover,
195
+ &.active:focus {
196
+ background-color: darken($state-success-bg, 5%);
197
+ }
198
+ }
199
+
200
+ a.list-group-item-warning {
201
+ &.active {
202
+ background-color: $state-warning-bg;
203
+ }
204
+
205
+ &.active:hover,
206
+ &.active:focus {
207
+ background-color: darken($state-warning-bg, 5%);
208
+ }
209
+ }
210
+
211
+ a.list-group-item-danger {
212
+ &.active {
213
+ background-color: $state-danger-bg;
214
+ }
215
+
216
+ &.active:hover,
217
+ &.active:focus {
218
+ background-color: darken($state-danger-bg, 5%);
219
+ }
220
+ }
221
+
185
222
  .modal {
186
223
  .close {
187
224
  color: $text-color;
@@ -1,4 +1,4 @@
1
- // Cosmo 3.2.0
1
+ // Cosmo 3.3.4
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -7,11 +7,12 @@
7
7
  //
8
8
  //## Gray and brand colors for use across Bootstrap.
9
9
 
10
- $gray: lighten(#000, 33.5%) !default; // #555
11
- $gray-darker: lighten(#000, 13.5%) !default; // #222
12
- $gray-dark: lighten(#000, 20%) !default; // #333
13
- $gray-light: lighten(#000, 60%) !default; // #999
14
- $gray-lighter: lighten(#000, 90%) !default; // #eee
10
+ $gray-base: #000 !default;
11
+ $gray-darker: lighten($gray-base, 13.5%) !default; // #222
12
+ $gray-dark: lighten($gray-base, 20%) !default; // #333
13
+ $gray: lighten($gray-base, 33.5%) !default; // #555
14
+ $gray-light: lighten($gray-base, 60%) !default; // #999
15
+ $gray-lighter: lighten($gray-base, 90%) !default; // #eee
15
16
 
16
17
  $brand-primary: #2780E3 !default;
17
18
  $brand-success: #3FB618 !default;
@@ -33,6 +34,8 @@ $text-color: $gray-dark !default;
33
34
  $link-color: $brand-primary !default;
34
35
  //** Link hover color set via `darken()` function.
35
36
  $link-hover-color: darken($link-color, 15%) !default;
37
+ //** Link hover decoration.
38
+ $link-hover-decoration: underline !default;
36
39
 
37
40
 
38
41
  //== Typography
@@ -95,7 +98,7 @@ $padding-small-horizontal: 10px !default;
95
98
  $padding-xs-vertical: 1px !default;
96
99
  $padding-xs-horizontal: 5px !default;
97
100
 
98
- $line-height-large: 1.33 !default;
101
+ $line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
99
102
  $line-height-small: 1.5 !default;
100
103
 
101
104
  $border-radius-base: 0 !default;
@@ -180,8 +183,16 @@ $input-bg-disabled: $gray-lighter !default;
180
183
  $input-color: $text-color !default;
181
184
  //** `<input>` border color
182
185
  $input-border: #ccc !default;
183
- //** `<input>` border radius
186
+
187
+ // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
188
+ //** Default `.form-control` border radius
189
+ // This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
184
190
  $input-border-radius: $border-radius-base !default;
191
+ //** Large `.form-control` border radius
192
+ $input-border-radius-large: $border-radius-large !default;
193
+ //** Small `.form-control` border radius
194
+ $input-border-radius-small: $border-radius-small !default;
195
+
185
196
  //** Border color for inputs on focus
186
197
  $input-border-focus: #66afe9 !default;
187
198
 
@@ -195,6 +206,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
195
206
  //** Small `.form-control` height
196
207
  $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
197
208
 
209
+ //** `.form-group` margin
210
+ $form-group-margin-bottom: 15px !default;
211
+
198
212
  $legend-color: $text-color !default;
199
213
  $legend-border-color: #e5e5e5 !default;
200
214
 
@@ -203,30 +217,9 @@ $input-group-addon-bg: $gray-lighter !default;
203
217
  //** Border color for textual input addons
204
218
  $input-group-addon-border-color: $input-border !default;
205
219
 
206
- //== Type
207
- //
208
- //##
220
+ //** Disabled cursor for form controls and buttons.
221
+ $cursor-disabled: not-allowed !default;
209
222
 
210
- //** Horizontal offset for forms and lists.
211
- $component-offset-horizontal: 180px !default;
212
- //** Text muted color
213
- $text-muted: $gray-light !default;
214
- //** Abbreviations and acronyms border color
215
- $abbr-border-color: $gray-light !default;
216
- //** Headings small color
217
- $headings-small-color: $gray-light !default;
218
- //** Blockquote small color
219
- $blockquote-small-color: $gray-light !default;
220
- //** Blockquote font size
221
- $blockquote-font-size: ($font-size-base * 1.25) !default;
222
- //** Blockquote border color
223
- $blockquote-border-color: $gray-lighter !default;
224
- //** Page header border color
225
- $page-header-border-color: $gray-lighter !default;
226
- //** Width of horizontal description list titles
227
- $dl-horizontal-offset: $component-offset-horizontal !default;
228
- //** Horizontal line color.
229
- $hr-border: $gray-lighter !default;
230
223
 
231
224
  //== Dropdowns
232
225
  //
@@ -241,23 +234,23 @@ $dropdown-fallback-border: #ccc !default;
241
234
  //** Divider color for between dropdown items.
242
235
  $dropdown-divider-bg: #e5e5e5 !default;
243
236
 
244
- //** Active dropdown menu item background color.
245
- $dropdown-link-active-bg: $component-active-bg !default;
246
237
  //** Dropdown link text color.
247
238
  $dropdown-link-color: $gray-dark !default;
248
239
  //** Hover color for dropdown links.
249
240
  $dropdown-link-hover-color: #fff !default;
250
241
  //** Hover background for dropdown links.
251
- $dropdown-link-hover-bg: $dropdown-link-active-bg !default;
242
+ $dropdown-link-hover-bg: $component-active-bg !default;
252
243
 
253
244
  //** Active dropdown menu item text color.
254
245
  $dropdown-link-active-color: #fff !default;
246
+ //** Active dropdown menu item background color.
247
+ $dropdown-link-active-bg: $component-active-bg !default;
255
248
 
256
249
  //** Disabled dropdown menu item background color.
257
- $dropdown-link-disabled-color: $text-muted !default;
250
+ $dropdown-link-disabled-color: $gray-light !default;
258
251
 
259
252
  //** Text color for headers within dropdown menus.
260
- $dropdown-header-color: $text-muted !default;
253
+ $dropdown-header-color: $gray-light !default;
261
254
 
262
255
  //** Deprecated `@dropdown-caret-color` as of v3.1.0
263
256
  $dropdown-caret-color: #000 !default;
@@ -338,17 +331,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
338
331
  //## Define the maximum width of `.container` for different screen sizes.
339
332
 
340
333
  // Small screen / tablet
341
- $container-tablet: ((720px + $grid-gutter-width)) !default;
334
+ $container-tablet: (720px + $grid-gutter-width) !default;
342
335
  //** For `@screen-sm-min` and up.
343
336
  $container-sm: $container-tablet !default;
344
337
 
345
338
  // Medium screen / desktop
346
- $container-desktop: ((940px + $grid-gutter-width)) !default;
339
+ $container-desktop: (940px + $grid-gutter-width) !default;
347
340
  //** For `@screen-md-min` and up.
348
341
  $container-md: $container-desktop !default;
349
342
 
350
343
  // Large screen / wide desktop
351
- $container-large-desktop: ((1140px + $grid-gutter-width)) !default;
344
+ $container-large-desktop: (1140px + $grid-gutter-width) !default;
352
345
  //** For `@screen-lg-min` and up.
353
346
  $container-lg: $container-large-desktop !default;
354
347
 
@@ -426,8 +419,6 @@ $nav-link-hover-bg: $gray-lighter !default;
426
419
  $nav-disabled-link-color: $gray-light !default;
427
420
  $nav-disabled-link-hover-color: $gray-light !default;
428
421
 
429
- $nav-open-link-hover-color: #fff !default;
430
-
431
422
  //== Tabs
432
423
  $nav-tabs-border-color: #ddd !default;
433
424
 
@@ -524,7 +515,7 @@ $tooltip-max-width: 200px !default;
524
515
  //** Tooltip text color
525
516
  $tooltip-color: #fff !default;
526
517
  //** Tooltip background color
527
- $tooltip-bg: rgba(0,0,0,.9) !default;
518
+ $tooltip-bg: #000 !default;
528
519
  $tooltip-opacity: .9 !default;
529
520
 
530
521
  //** Tooltip arrow width
@@ -552,7 +543,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default;
552
543
  //** Popover arrow width
553
544
  $popover-arrow-width: 10px !default;
554
545
  //** Popover arrow color
555
- $popover-arrow-color: #fff !default;
546
+ $popover-arrow-color: $popover-bg !default;
556
547
 
557
548
  //** Popover outer arrow width
558
549
  $popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
@@ -651,6 +642,8 @@ $alert-danger-border: $state-danger-border !default;
651
642
  $progress-bg: #ccc !default;
652
643
  //** Progress bar text color
653
644
  $progress-bar-color: #fff !default;
645
+ //** Variable for setting rounded corners on progress bar.
646
+ $progress-border-radius: $border-radius-base !default;
654
647
 
655
648
  //** Default progress bar color
656
649
  $progress-bar-bg: $brand-primary !default;
@@ -682,7 +675,7 @@ $list-group-active-color: $component-active-color !default;
682
675
  //** Background color of active list items
683
676
  $list-group-active-bg: $component-active-bg !default;
684
677
  //** Border color of active list elements
685
- $list-group-active-border: $list-group-active-bg !default;
678
+ $list-group-active-border: $list-group-border !default;
686
679
  //** Text color for content within active list items
687
680
  $list-group-active-text-color: lighten($list-group-active-bg, 40%) !default;
688
681
 
@@ -841,3 +834,27 @@ $pre-border-color: #ccc !default;
841
834
  $pre-scrollable-max-height: 340px !default;
842
835
 
843
836
 
837
+ //== Type
838
+ //
839
+ //##
840
+
841
+ //** Horizontal offset for forms and lists.
842
+ $component-offset-horizontal: 180px !default;
843
+ //** Text muted color
844
+ $text-muted: $gray-light !default;
845
+ //** Abbreviations and acronyms border color
846
+ $abbr-border-color: $gray-light !default;
847
+ //** Headings small color
848
+ $headings-small-color: $gray-light !default;
849
+ //** Blockquote small color
850
+ $blockquote-small-color: $gray-light !default;
851
+ //** Blockquote font size
852
+ $blockquote-font-size: ($font-size-base * 1.25) !default;
853
+ //** Blockquote border color
854
+ $blockquote-border-color: $gray-lighter !default;
855
+ //** Page header border color
856
+ $page-header-border-color: $gray-lighter !default;
857
+ //** Width of horizontal description list titles
858
+ $dl-horizontal-offset: $component-offset-horizontal !default;
859
+ //** Horizontal line color.
860
+ $hr-border: $gray-lighter !default;