bootswatch-rails 3.1.1.1 → 3.2.0

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/HISTORY.md +4 -0
  3. data/README.md +4 -3
  4. data/converter +9 -0
  5. data/lib/bootswatch-rails/version.rb +1 -1
  6. data/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss +16 -4
  7. data/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss +80 -63
  8. data/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +5 -5
  9. data/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +53 -38
  10. data/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +16 -13
  11. data/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss +55 -40
  12. data/vendor/assets/stylesheets/bootswatch/custom/_variables.scss +7 -7
  13. data/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +18 -11
  14. data/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss +64 -49
  15. data/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss +6 -1
  16. data/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss +68 -53
  17. data/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +15 -9
  18. data/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss +66 -49
  19. data/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +4 -3
  20. data/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +53 -37
  21. data/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss +27 -10
  22. data/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss +164 -147
  23. data/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +15 -11
  24. data/vendor/assets/stylesheets/bootswatch/readable/_variables.scss +66 -50
  25. data/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +1 -1
  26. data/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss +64 -48
  27. data/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +22 -9
  28. data/vendor/assets/stylesheets/bootswatch/slate/_variables.scss +179 -168
  29. data/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +3 -3
  30. data/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss +59 -43
  31. data/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +25 -12
  32. data/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +182 -169
  33. data/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +1 -1
  34. data/vendor/assets/stylesheets/bootswatch/united/_variables.scss +53 -38
  35. data/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss +9 -4
  36. data/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss +64 -47
  37. metadata +2 -2
@@ -1,4 +1,4 @@
1
- // Spacelab 3.1.1
1
+ // Spacelab 3.2.0
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -53,7 +53,6 @@
53
53
  @include transition(color ease-in-out .2s);
54
54
  }
55
55
 
56
-
57
56
  // Buttons ====================================================================
58
57
 
59
58
  .btn {
@@ -114,6 +113,7 @@
114
113
  }
115
114
  }
116
115
 
116
+
117
117
  // Typography =================================================================
118
118
 
119
119
  // Tables =====================================================================
@@ -132,4 +132,4 @@
132
132
  .panel-title {
133
133
  color: #fff;
134
134
  }
135
- }
135
+ }
@@ -1,4 +1,4 @@
1
- // Spacelab 3.1.1
1
+ // Spacelab 3.2.0
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -22,7 +22,7 @@ $brand-danger: #CD0200 !default;
22
22
 
23
23
  //== Scaffolding
24
24
  //
25
- // ## Settings for some of the most global styles.
25
+ //## Settings for some of the most global styles.
26
26
 
27
27
  //** Background color for `<body>`.
28
28
  $body-bg: #fff !default;
@@ -68,10 +68,23 @@ $headings-line-height: 1.1 !default;
68
68
  $headings-color: $gray-darker !default;
69
69
 
70
70
 
71
+ //== Iconography
72
+ //
73
+ //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
74
+
75
+ //** Load fonts from this directory.
76
+ //** File name for all font files.
77
+ $icon-font-name: "glyphicons-halflings-regular" !default;
78
+ //** Element ID within SVG icon file.
79
+ $icon-font-svg-id: "glyphicons_halflingsregular" !default;
80
+
81
+
71
82
  //== Type
72
83
  //
73
84
  //##
74
85
 
86
+ //** Horizontal offset for forms and lists.
87
+ $component-offset-horizontal: 180px !default;
75
88
  //** Text muted color
76
89
  $text-muted: $gray-light !default;
77
90
  //** Abbreviations and acronyms border color
@@ -86,26 +99,11 @@ $blockquote-font-size: ($font-size-base * 1.25) !default;
86
99
  $blockquote-border-color: $gray-lighter !default;
87
100
  //** Page header border color
88
101
  $page-header-border-color: $gray-lighter !default;
89
-
90
-
91
- //== Miscellaneous
92
- //
93
- //##
94
-
102
+ //** Width of horizontal description list titles
103
+ $dl-horizontal-offset: $component-offset-horizontal !default;
95
104
  //** Horizontal line color.
96
105
  $hr-border: $gray-lighter !default;
97
106
 
98
- //** Horizontal offset for forms and lists.
99
- $component-offset-horizontal: 180px !default;
100
-
101
-
102
- //-- Iconography
103
- //
104
- //## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
105
-
106
-
107
- $icon-font-name: "glyphicons-halflings-regular" !default;
108
- $icon-font-svg-id: "glyphicons_halflingsregular" !default;
109
107
 
110
108
  //== Components
111
109
  //
@@ -151,7 +149,7 @@ $table-cell-padding: 8px !default;
151
149
  $table-condensed-cell-padding: 5px !default;
152
150
 
153
151
  //** Default background color used for all tables.
154
- $table-bg: transparent !default;
152
+ $table-bg: hsla(0, 100%, 100%, 0) !default;
155
153
  //** Background color used for `.table-striped`.
156
154
  $table-bg-accent: #f9f9f9 !default;
157
155
  //** Background color used for `.table-hover`.
@@ -245,25 +243,26 @@ $dropdown-fallback-border: #ccc !default;
245
243
  //** Divider color for between dropdown items.
246
244
  $dropdown-divider-bg: #e5e5e5 !default;
247
245
 
248
- //** Active dropdown menu item text color.
249
- $dropdown-link-active-color: #fff !default;
250
- //** Active dropdown menu item background color.
251
- $dropdown-link-active-bg: $component-active-bg !default;
252
-
253
246
  //** Dropdown link text color.
254
247
  $dropdown-link-color: $gray-dark !default;
255
248
  //** Hover color for dropdown links.
256
249
  $dropdown-link-hover-color: #fff !default;
250
+ //** Active dropdown menu item background color.
251
+ $dropdown-link-active-bg: $component-active-bg !default;
252
+
257
253
  //** Hover background for dropdown links.
258
254
  $dropdown-link-hover-bg: $dropdown-link-active-bg !default;
259
255
 
256
+ //** Active dropdown menu item text color.
257
+ $dropdown-link-active-color: #fff !default;
258
+
260
259
  //** Disabled dropdown menu item background color.
261
260
  $dropdown-link-disabled-color: $text-muted !default;
262
261
 
263
262
  //** Text color for headers within dropdown menus.
264
263
  $dropdown-header-color: $text-muted !default;
265
264
 
266
- // Note: Deprecated @dropdown-caret-color as of v3.1.0
265
+ //** Deprecated `@dropdown-caret-color` as of v3.1.0
267
266
  $dropdown-caret-color: #000 !default;
268
267
 
269
268
 
@@ -276,8 +275,8 @@ $dropdown-caret-color: #000 !default;
276
275
 
277
276
  $zindex-navbar: 1000 !default;
278
277
  $zindex-dropdown: 1000 !default;
279
- $zindex-popover: 1010 !default;
280
- $zindex-tooltip: 1030 !default;
278
+ $zindex-popover: 1060 !default;
279
+ $zindex-tooltip: 1070 !default;
281
280
  $zindex-navbar-fixed: 1030 !default;
282
281
  $zindex-modal-background: 1040 !default;
283
282
  $zindex-modal: 1050 !default;
@@ -288,27 +287,32 @@ $zindex-modal: 1050 !default;
288
287
  //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
289
288
 
290
289
  // Extra small screen / phone
291
- // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
290
+ //** Deprecated `@screen-xs` as of v3.0.1
292
291
  $screen-xs: 480px !default;
292
+ //** Deprecated `@screen-xs-min` as of v3.2.0
293
293
  $screen-xs-min: $screen-xs !default;
294
+ //** Deprecated `@screen-phone` as of v3.0.1
294
295
  $screen-phone: $screen-xs-min !default;
295
296
 
296
297
  // Small screen / tablet
297
- // Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
298
+ //** Deprecated `@screen-sm` as of v3.0.1
298
299
  $screen-sm: 768px !default;
299
300
  $screen-sm-min: $screen-sm !default;
301
+ //** Deprecated `@screen-tablet` as of v3.0.1
300
302
  $screen-tablet: $screen-sm-min !default;
301
303
 
302
304
  // Medium screen / desktop
303
- // Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
305
+ //** Deprecated `@screen-md` as of v3.0.1
304
306
  $screen-md: 992px !default;
305
307
  $screen-md-min: $screen-md !default;
308
+ //** Deprecated `@screen-desktop` as of v3.0.1
306
309
  $screen-desktop: $screen-md-min !default;
307
310
 
308
311
  // Large screen / wide desktop
309
- // Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
312
+ //** Deprecated `@screen-lg` as of v3.0.1
310
313
  $screen-lg: 1200px !default;
311
314
  $screen-lg-min: $screen-lg !default;
315
+ //** Deprecated `@screen-lg-desktop` as of v3.0.1
312
316
  $screen-lg-desktop: $screen-lg-min !default;
313
317
 
314
318
  // So media queries don't overlap when required, provide a maximum
@@ -371,16 +375,16 @@ $navbar-default-border: darken($navbar-default-bg, 6.5%) !default;
371
375
  // Navbar links
372
376
  $navbar-default-link-color: #777 !default;
373
377
  $navbar-default-link-hover-color: $brand-info !default;
374
- $navbar-default-link-hover-bg: transparent !default;
378
+ $navbar-default-link-hover-bg: hsla(0, 100%, 100%, 0) !default;
375
379
  $navbar-default-link-active-color: $navbar-default-link-hover-color !default;
376
- $navbar-default-link-active-bg: transparent !default;
380
+ $navbar-default-link-active-bg: hsla(0, 100%, 100%, 0) !default;
377
381
  $navbar-default-link-disabled-color: #444 !default;
378
- $navbar-default-link-disabled-bg: transparent !default;
382
+ $navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0) !default;
379
383
 
380
384
  // Navbar brand label
381
385
  $navbar-default-brand-color: $navbar-default-link-color !default;
382
386
  $navbar-default-brand-hover-color: $navbar-default-link-hover-color !default;
383
- $navbar-default-brand-hover-bg: transparent !default;
387
+ $navbar-default-brand-hover-bg: hsla(0, 100%, 100%, 0) !default;
384
388
 
385
389
  // Navbar toggle
386
390
  $navbar-default-toggle-hover-bg: darken($navbar-default-bg, 6.5%) !default;
@@ -397,16 +401,16 @@ $navbar-inverse-border: darken($navbar-inverse-bg, 10%) !def
397
401
  // Inverted navbar links
398
402
  $navbar-inverse-link-color: #ddd !default;
399
403
  $navbar-inverse-link-hover-color: #fff !default;
400
- $navbar-inverse-link-hover-bg: transparent !default;
404
+ $navbar-inverse-link-hover-bg: hsla(0, 100%, 100%, 0) !default;
401
405
  $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default;
402
- $navbar-inverse-link-active-bg: transparent !default;
406
+ $navbar-inverse-link-active-bg: hsla(0, 100%, 100%, 0) !default;
403
407
  $navbar-inverse-link-disabled-color: #ccc !default;
404
- $navbar-inverse-link-disabled-bg: transparent !default;
408
+ $navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0) !default;
405
409
 
406
410
  // Inverted navbar brand label
407
411
  $navbar-inverse-brand-color: $navbar-inverse-link-color !default;
408
412
  $navbar-inverse-brand-hover-color: #fff !default;
409
- $navbar-inverse-brand-hover-bg: transparent !default;
413
+ $navbar-inverse-brand-hover-bg: hsla(0, 100%, 100%, 0) !default;
410
414
 
411
415
  // Inverted navbar toggle
412
416
  $navbar-inverse-toggle-hover-bg: darken($navbar-inverse-bg, 10%) !default;
@@ -674,17 +678,26 @@ $list-group-border: #ddd !default;
674
678
  //** List group border radius
675
679
  $list-group-border-radius: $border-radius-base !default;
676
680
 
677
- //** Background color of single list elements on hover
681
+ //** Background color of single list items on hover
678
682
  $list-group-hover-bg: #f5f5f5 !default;
679
- //** Text color of active list elements
683
+ //** Text color of active list items
680
684
  $list-group-active-color: $component-active-color !default;
681
- //** Background color of active list elements
685
+ //** Background color of active list items
682
686
  $list-group-active-bg: $component-active-bg !default;
683
687
  //** Border color of active list elements
684
688
  $list-group-active-border: $list-group-active-bg !default;
689
+ //** Text color for content within active list items
685
690
  $list-group-active-text-color: lighten($list-group-active-bg, 40%) !default;
686
691
 
692
+ //** Text color of disabled list items
693
+ $list-group-disabled-color: $gray-light !default;
694
+ //** Background color of disabled list items
695
+ $list-group-disabled-bg: $gray-lighter !default;
696
+ //** Text color for content within disabled list items
697
+ $list-group-disabled-text-color: $list-group-disabled-color !default;
698
+
687
699
  $list-group-link-color: #555 !default;
700
+ $list-group-link-hover-color: $list-group-link-color !default;
688
701
  $list-group-link-heading-color: #333 !default;
689
702
 
690
703
 
@@ -694,6 +707,8 @@ $list-group-link-heading-color: #333 !default;
694
707
 
695
708
  $panel-bg: #fff !default;
696
709
  $panel-body-padding: 15px !default;
710
+ $panel-heading-padding: 10px 15px !default;
711
+ $panel-footer-padding: $panel-heading-padding !default;
697
712
  $panel-border-radius: $border-radius-base !default;
698
713
 
699
714
  //** Border color for elements within panels
@@ -827,3 +842,4 @@ $pre-bg: #f5f5f5 !default;
827
842
  $pre-color: $gray-dark !default;
828
843
  $pre-border-color: #ccc !default;
829
844
  $pre-scrollable-max-height: 340px !default;
845
+
@@ -1,4 +1,4 @@
1
- // Superhero 3.1.1
1
+ // Superhero 3.2.0
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -45,6 +45,7 @@
45
45
  font-size: 12px;
46
46
  }
47
47
 
48
+
48
49
  // Typography =================================================================
49
50
 
50
51
  body {
@@ -121,7 +122,7 @@ table,
121
122
  > thead > tr > td,
122
123
  > tbody > tr > td,
123
124
  > tfoot > tr > td {
124
- border-color: transparent;
125
+ border-color: hsla(0, 100%, 100%, 0);
125
126
  }
126
127
  }
127
128
 
@@ -151,6 +152,10 @@ label,
151
152
  .form-control-feedback {
152
153
  color: $brand-warning;
153
154
  }
155
+
156
+ .input-group-addon {
157
+ border: none;
158
+ }
154
159
  }
155
160
 
156
161
  .has-error {
@@ -159,6 +164,10 @@ label,
159
164
  .form-control-feedback {
160
165
  color: $brand-danger;
161
166
  }
167
+
168
+ .input-group-addon {
169
+ border: none;
170
+ }
162
171
  }
163
172
 
164
173
  .has-success {
@@ -167,6 +176,10 @@ label,
167
176
  .form-control-feedback {
168
177
  color: $brand-success;
169
178
  }
179
+
180
+ .input-group-addon {
181
+ border: none;
182
+ }
170
183
  }
171
184
 
172
185
  .form-control:focus {
@@ -187,7 +200,7 @@ label,
187
200
  .open > a,
188
201
  .open > a:hover,
189
202
  .open > a:focus {
190
- border-color: transparent;
203
+ border-color: hsla(0, 100%, 100%, 0);
191
204
  }
192
205
  }
193
206
 
@@ -211,15 +224,6 @@ label,
211
224
 
212
225
  // Indicators =================================================================
213
226
 
214
- .close {
215
- opacity: 0.4;
216
-
217
- &:hover,
218
- &:focus {
219
- opacity: 1;
220
- }
221
- }
222
-
223
227
  .label {
224
228
  font-weight: 300;
225
229
  }
@@ -233,6 +237,15 @@ label,
233
237
  }
234
238
  }
235
239
 
240
+ .close {
241
+ opacity: 0.4;
242
+
243
+ &:hover,
244
+ &:focus {
245
+ opacity: 1;
246
+ }
247
+ }
248
+
236
249
  // Progress bars ==============================================================
237
250
 
238
251
  // Containers =================================================================
@@ -1,4 +1,4 @@
1
- // Superhero 3.1.1
1
+ // Superhero 3.2.0
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -18,11 +18,13 @@ $brand-success: #5cb85c !default;
18
18
  $brand-info: #5bc0de !default;
19
19
  $brand-warning: #f0ad4e !default;
20
20
  $brand-danger: #d9534f !default;
21
+ $navbar-default-bg: #4E5D6C !default;
21
22
 
23
+ $navbar-default-link-hover-bg: darken($navbar-default-bg, 3%) !default;
22
24
 
23
25
  //== Scaffolding
24
26
  //
25
- // ## Settings for some of the most global styles.
27
+ //## Settings for some of the most global styles.
26
28
 
27
29
  //** Background color for `<body>`.
28
30
  $body-bg: #2B3E50 !default;
@@ -68,14 +70,17 @@ $headings-line-height: 1.1 !default;
68
70
  $headings-color: inherit !default;
69
71
 
70
72
 
71
- //-- Iconography
73
+ //== Iconography
72
74
  //
73
- //## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
74
-
75
+ //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
75
76
 
77
+ //** Load fonts from this directory.
78
+ //** File name for all font files.
76
79
  $icon-font-name: "glyphicons-halflings-regular" !default;
80
+ //** Element ID within SVG icon file.
77
81
  $icon-font-svg-id: "glyphicons_halflingsregular" !default;
78
82
 
83
+
79
84
  //== Components
80
85
  //
81
86
  //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -109,129 +114,15 @@ $caret-width-base: 4px !default;
109
114
  //** Carets increase slightly in size for larger components.
110
115
  $caret-width-large: 5px !default;
111
116
 
112
-
113
- //== Media queries breakpoints
114
- //
115
- //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
116
-
117
- // Extra small screen / phone
118
- // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
119
- $screen-xs: 480px !default;
120
- $screen-xs-min: $screen-xs !default;
121
- $screen-phone: $screen-xs-min !default;
122
-
123
- // Small screen / tablet
124
- // Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
125
- $screen-sm: 768px !default;
126
- $screen-sm-min: $screen-sm !default;
127
- $screen-tablet: $screen-sm-min !default;
128
-
129
- // Medium screen / desktop
130
- // Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
131
- $screen-md: 992px !default;
132
- $screen-md-min: $screen-md !default;
133
- $screen-desktop: $screen-md-min !default;
134
-
135
- // Large screen / wide desktop
136
- // Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
137
- $screen-lg: 1200px !default;
138
- $screen-lg-min: $screen-lg !default;
139
- $screen-lg-desktop: $screen-lg-min !default;
140
-
141
- // So media queries don't overlap when required, provide a maximum
142
- $screen-xs-max: ($screen-sm-min - 1) !default;
143
- $screen-sm-max: ($screen-md-min - 1) !default;
144
- $screen-md-max: ($screen-lg-min - 1) !default;
145
-
146
-
147
- //== Grid system
148
- //
149
- //## Define your custom responsive grid.
150
-
151
- //** Number of columns in the grid.
152
- $grid-columns: 12 !default;
153
- //** Padding between columns. Gets divided in half for the left and right.
154
- $grid-gutter-width: 30px !default;
155
- // Navbar collapse
156
- //** Point at which the navbar becomes uncollapsed.
157
- $grid-float-breakpoint: $screen-sm-min !default;
158
- //** Point at which the navbar begins collapsing.
159
- $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
160
-
161
-
162
- //== Navbar
163
- //
164
- //##
165
-
166
- // Basics of a navbar
167
- $navbar-height: 40px !default;
168
- $navbar-margin-bottom: $line-height-computed !default;
169
- $navbar-border-radius: $border-radius-base !default;
170
- $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
171
- $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
172
- $navbar-collapse-max-height: 340px !default;
173
-
174
- $navbar-default-color: $text-color !default;
175
- $navbar-default-bg: #4E5D6C !default;
176
- $navbar-default-border: hsla(0, 100%, 100%, 0);
177
-
178
- // Navbar links
179
- $navbar-default-link-color: $text-color !default;
180
- $navbar-default-link-hover-color: $navbar-default-link-color !default;
181
- $navbar-default-link-hover-bg: darken($navbar-default-bg, 3%) !default;
182
- $navbar-default-link-active-color: $navbar-default-link-color !default;
183
- $navbar-default-link-active-bg: darken($navbar-default-bg, 3%) !default;
184
- $navbar-default-link-disabled-color: #ccc !default;
185
- $navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0);
186
-
187
- // Navbar brand label
188
- $navbar-default-brand-color: $navbar-default-link-color !default;
189
- $navbar-default-brand-hover-color: $navbar-default-link-color !default;
190
- $navbar-default-brand-hover-bg: hsla(0, 100%, 100%, 0);
191
-
192
- // Navbar toggle
193
- $navbar-default-toggle-hover-bg: $navbar-default-link-hover-bg !default;
194
- $navbar-default-toggle-icon-bar-bg: $text-color !default;
195
- $navbar-default-toggle-border-color: hsla(0, 100%, 100%, 0);
196
-
197
-
198
- // Inverted navbar
199
- // Reset inverted navbar basics
200
- $navbar-inverse-color: $text-color !default;
201
- $navbar-inverse-bg: $brand-primary !default;
202
- $navbar-inverse-border: hsla(0, 100%, 100%, 0);
203
-
204
- // Inverted navbar links
205
- $navbar-inverse-link-color: $text-color !default;
206
- $navbar-inverse-link-hover-color: $navbar-inverse-link-color !default;
207
- $navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 5%) !default;
208
- $navbar-inverse-link-active-color: $navbar-inverse-link-color !default;
209
- $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 5%) !default;
210
- $navbar-inverse-link-disabled-color: #444 !default;
211
- $navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0);
212
-
213
- // Inverted navbar brand label
214
- $navbar-inverse-brand-color: $navbar-inverse-link-color !default;
215
- $navbar-inverse-brand-hover-color: $navbar-inverse-link-color !default;
216
- $navbar-inverse-brand-hover-bg: hsla(0, 100%, 100%, 0);
217
-
218
- // Inverted navbar toggle
219
- $navbar-inverse-toggle-hover-bg: $navbar-inverse-link-hover-bg !default;
220
- $navbar-inverse-toggle-icon-bar-bg: $text-color !default;
221
- $navbar-inverse-toggle-border-color: hsla(0, 100%, 100%, 0);
222
-
223
-
224
117
  //** Border color for table and cell borders.
225
118
  $table-border-color: $navbar-default-bg !default;
226
119
 
227
-
228
120
  //== Wells
229
121
  //
230
122
  //##
231
123
 
232
124
  $well-bg: $table-border-color !default;
233
- $well-border: hsla(0, 100%, 100%, 0);
234
-
125
+ $well-border: hsla(0, 100%, 100%, 0) !default;
235
126
 
236
127
  //== Tables
237
128
  //
@@ -243,7 +134,7 @@ $table-cell-padding: 6px !default;
243
134
  $table-condensed-cell-padding: 3px !default;
244
135
 
245
136
  //** Default background color used for all tables.
246
- $table-bg: hsla(0, 100%, 100%, 0);
137
+ $table-bg: hsla(0, 100%, 100%, 0) !default;
247
138
  //** Background color used for `.table-striped`.
248
139
  $table-bg-accent: $well-bg !default;
249
140
  //** Background color used for `.table-hover`.
@@ -259,27 +150,27 @@ $btn-font-weight: normal !default;
259
150
 
260
151
  $btn-default-color: #fff !default;
261
152
  $btn-default-bg: $navbar-default-bg !default;
262
- $btn-default-border: hsla(0, 100%, 100%, 0);
153
+ $btn-default-border: hsla(0, 100%, 100%, 0) !default;
263
154
 
264
155
  $btn-primary-color: #fff !default;
265
156
  $btn-primary-bg: $brand-primary !default;
266
- $btn-primary-border: hsla(0, 100%, 100%, 0);
157
+ $btn-primary-border: hsla(0, 100%, 100%, 0) !default;
267
158
 
268
159
  $btn-success-color: #fff !default;
269
160
  $btn-success-bg: $brand-success !default;
270
- $btn-success-border: hsla(0, 100%, 100%, 0);
161
+ $btn-success-border: hsla(0, 100%, 100%, 0) !default;
271
162
 
272
163
  $btn-info-color: #fff !default;
273
164
  $btn-info-bg: $brand-info !default;
274
- $btn-info-border: hsla(0, 100%, 100%, 0);
165
+ $btn-info-border: hsla(0, 100%, 100%, 0) !default;
275
166
 
276
167
  $btn-warning-color: #fff !default;
277
168
  $btn-warning-bg: $brand-warning !default;
278
- $btn-warning-border: hsla(0, 100%, 100%, 0);
169
+ $btn-warning-border: hsla(0, 100%, 100%, 0) !default;
279
170
 
280
171
  $btn-danger-color: #fff !default;
281
172
  $btn-danger-bg: $brand-danger !default;
282
- $btn-danger-border: hsla(0, 100%, 100%, 0);
173
+ $btn-danger-border: hsla(0, 100%, 100%, 0) !default;
283
174
 
284
175
  $btn-link-disabled-color: $gray-light !default;
285
176
 
@@ -296,11 +187,11 @@ $input-bg-disabled: $gray-lighter !default;
296
187
  //** Text color for `<input>`s
297
188
  $input-color: $body-bg !default;
298
189
  //** `<input>` border color
299
- $input-border: hsla(0, 100%, 100%, 0);
190
+ $input-border: hsla(0, 100%, 100%, 0) !default;
300
191
  //** `<input>` border radius
301
192
  $input-border-radius: $border-radius-base !default;
302
193
  //** Border color for inputs on focus
303
- $input-border-focus: hsla(0, 100%, 100%, 0);
194
+ $input-border-focus: hsla(0, 100%, 100%, 0) !default;
304
195
 
305
196
  //** Placeholder text color
306
197
  $input-color-placeholder: #ccc !default;
@@ -318,7 +209,7 @@ $legend-border-color: $table-border-color !default;
318
209
  //** Background color for textual input addons
319
210
  $input-group-addon-bg: $btn-default-bg !default;
320
211
  //** Border color for textual input addons
321
- $input-group-addon-border-color: hsla(0, 100%, 100%, 0);
212
+ $input-group-addon-border-color: hsla(0, 100%, 100%, 0) !default;
322
213
 
323
214
 
324
215
  //== Dropdowns
@@ -328,9 +219,9 @@ $input-group-addon-border-color: hsla(0, 100%, 100%, 0);
328
219
  //** Background for the dropdown menu.
329
220
  $dropdown-bg: $well-bg !default;
330
221
  //** Dropdown menu `border-color`.
331
- $dropdown-border: hsla(0, 100%, 100%, 0);
222
+ $dropdown-border: hsla(0, 100%, 100%, 0) !default;
332
223
  //** Dropdown menu `border-color` **for IE8**.
333
- $dropdown-fallback-border: hsla(0, 100%, 100%, 0);
224
+ $dropdown-fallback-border: hsla(0, 100%, 100%, 0) !default;
334
225
  //** Divider color for between dropdown items.
335
226
  $dropdown-divider-bg: $body-bg !default;
336
227
 
@@ -352,7 +243,7 @@ $dropdown-link-disabled-color: $body-bg !default;
352
243
  //** Text color for headers within dropdown menus.
353
244
  $dropdown-header-color: $body-bg !default;
354
245
 
355
- // Note: Deprecated @dropdown-caret-color as of v3.1.0
246
+ //** Deprecated `@dropdown-caret-color` as of v3.1.0
356
247
  $dropdown-caret-color: #000 !default;
357
248
 
358
249
 
@@ -365,13 +256,67 @@ $dropdown-caret-color: #000 !default;
365
256
 
366
257
  $zindex-navbar: 1000 !default;
367
258
  $zindex-dropdown: 1000 !default;
368
- $zindex-popover: 1010 !default;
369
- $zindex-tooltip: 1030 !default;
259
+ $zindex-popover: 1060 !default;
260
+ $zindex-tooltip: 1070 !default;
370
261
  $zindex-navbar-fixed: 1030 !default;
371
262
  $zindex-modal-background: 1040 !default;
372
263
  $zindex-modal: 1050 !default;
373
264
 
374
265
 
266
+ //== Media queries breakpoints
267
+ //
268
+ //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
269
+
270
+ // Extra small screen / phone
271
+ //** Deprecated `@screen-xs` as of v3.0.1
272
+ $screen-xs: 480px !default;
273
+ //** Deprecated `@screen-xs-min` as of v3.2.0
274
+ $screen-xs-min: $screen-xs !default;
275
+ //** Deprecated `@screen-phone` as of v3.0.1
276
+ $screen-phone: $screen-xs-min !default;
277
+
278
+ // Small screen / tablet
279
+ //** Deprecated `@screen-sm` as of v3.0.1
280
+ $screen-sm: 768px !default;
281
+ $screen-sm-min: $screen-sm !default;
282
+ //** Deprecated `@screen-tablet` as of v3.0.1
283
+ $screen-tablet: $screen-sm-min !default;
284
+
285
+ // Medium screen / desktop
286
+ //** Deprecated `@screen-md` as of v3.0.1
287
+ $screen-md: 992px !default;
288
+ $screen-md-min: $screen-md !default;
289
+ //** Deprecated `@screen-desktop` as of v3.0.1
290
+ $screen-desktop: $screen-md-min !default;
291
+
292
+ // Large screen / wide desktop
293
+ //** Deprecated `@screen-lg` as of v3.0.1
294
+ $screen-lg: 1200px !default;
295
+ $screen-lg-min: $screen-lg !default;
296
+ //** Deprecated `@screen-lg-desktop` as of v3.0.1
297
+ $screen-lg-desktop: $screen-lg-min !default;
298
+
299
+ // So media queries don't overlap when required, provide a maximum
300
+ $screen-xs-max: ($screen-sm-min - 1) !default;
301
+ $screen-sm-max: ($screen-md-min - 1) !default;
302
+ $screen-md-max: ($screen-lg-min - 1) !default;
303
+
304
+
305
+ //== Grid system
306
+ //
307
+ //## Define your custom responsive grid.
308
+
309
+ //** Number of columns in the grid.
310
+ $grid-columns: 12 !default;
311
+ //** Padding between columns. Gets divided in half for the left and right.
312
+ $grid-gutter-width: 30px !default;
313
+ // Navbar collapse
314
+ //** Point at which the navbar becomes uncollapsed.
315
+ $grid-float-breakpoint: $screen-sm-min !default;
316
+ //** Point at which the navbar begins collapsing.
317
+ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
318
+
319
+
375
320
  //== Container sizes
376
321
  //
377
322
  //## Define the maximum width of `.container` for different screen sizes.
@@ -392,6 +337,66 @@ $container-large-desktop: ((1140px + $grid-gutter-width)) !default;
392
337
  $container-lg: $container-large-desktop !default;
393
338
 
394
339
 
340
+ //== Navbar
341
+ //
342
+ //##
343
+
344
+ // Basics of a navbar
345
+ $navbar-height: 40px !default;
346
+ $navbar-margin-bottom: $line-height-computed !default;
347
+ $navbar-border-radius: $border-radius-base !default;
348
+ $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
349
+ $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
350
+ $navbar-collapse-max-height: 340px !default;
351
+
352
+ $navbar-default-color: $text-color !default;
353
+ $navbar-default-border: hsla(0, 100%, 100%, 0) !default;
354
+
355
+ // Navbar links
356
+ $navbar-default-link-color: $text-color !default;
357
+ $navbar-default-link-hover-color: $navbar-default-link-color !default;
358
+ $navbar-default-link-active-color: $navbar-default-link-color !default;
359
+ $navbar-default-link-active-bg: darken($navbar-default-bg, 3%) !default;
360
+ $navbar-default-link-disabled-color: #ccc !default;
361
+ $navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0) !default;
362
+
363
+ // Navbar brand label
364
+ $navbar-default-brand-color: $navbar-default-link-color !default;
365
+ $navbar-default-brand-hover-color: $navbar-default-link-color !default;
366
+ $navbar-default-brand-hover-bg: hsla(0, 100%, 100%, 0) !default;
367
+
368
+ // Navbar toggle
369
+ $navbar-default-toggle-hover-bg: $navbar-default-link-hover-bg !default;
370
+ $navbar-default-toggle-icon-bar-bg: $text-color !default;
371
+ $navbar-default-toggle-border-color: hsla(0, 100%, 100%, 0) !default;
372
+
373
+
374
+ // Inverted navbar
375
+ // Reset inverted navbar basics
376
+ $navbar-inverse-color: $text-color !default;
377
+ $navbar-inverse-bg: $brand-primary !default;
378
+ $navbar-inverse-border: hsla(0, 100%, 100%, 0) !default;
379
+
380
+ // Inverted navbar links
381
+ $navbar-inverse-link-color: $text-color !default;
382
+ $navbar-inverse-link-hover-color: $navbar-inverse-link-color !default;
383
+ $navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 5%) !default;
384
+ $navbar-inverse-link-active-color: $navbar-inverse-link-color !default;
385
+ $navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 5%) !default;
386
+ $navbar-inverse-link-disabled-color: #444 !default;
387
+ $navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0) !default;
388
+
389
+ // Inverted navbar brand label
390
+ $navbar-inverse-brand-color: $navbar-inverse-link-color !default;
391
+ $navbar-inverse-brand-hover-color: $navbar-inverse-link-color !default;
392
+ $navbar-inverse-brand-hover-bg: hsla(0, 100%, 100%, 0) !default;
393
+
394
+ // Inverted navbar toggle
395
+ $navbar-inverse-toggle-hover-bg: $navbar-inverse-link-hover-bg !default;
396
+ $navbar-inverse-toggle-icon-bar-bg: $text-color !default;
397
+ $navbar-inverse-toggle-border-color: hsla(0, 100%, 100%, 0) !default;
398
+
399
+
395
400
  //== Navs
396
401
  //
397
402
  //##
@@ -406,7 +411,7 @@ $nav-disabled-link-hover-color: $well-bg !default;
406
411
  $nav-open-link-hover-color: $text-color !default;
407
412
 
408
413
  //== Tabs
409
- $nav-tabs-border-color: hsla(0, 100%, 100%, 0);
414
+ $nav-tabs-border-color: hsla(0, 100%, 100%, 0) !default;
410
415
 
411
416
  $nav-tabs-link-hover-border-color: $table-border-color !default;
412
417
 
@@ -429,19 +434,19 @@ $nav-pills-active-link-hover-color: $component-active-color !default;
429
434
 
430
435
  $pagination-color: $text-color !default;
431
436
  $pagination-bg: $well-bg !default;
432
- $pagination-border: hsla(0, 100%, 100%, 0);
437
+ $pagination-border: hsla(0, 100%, 100%, 0) !default;
433
438
 
434
439
  $pagination-hover-color: $text-color !default;
435
440
  $pagination-hover-bg: $table-bg-hover !default;
436
- $pagination-hover-border: hsla(0, 100%, 100%, 0);
441
+ $pagination-hover-border: hsla(0, 100%, 100%, 0) !default;
437
442
 
438
443
  $pagination-active-color: $text-color !default;
439
444
  $pagination-active-bg: $brand-primary !default;
440
- $pagination-active-border: hsla(0, 100%, 100%, 0);
445
+ $pagination-active-border: hsla(0, 100%, 100%, 0) !default;
441
446
 
442
447
  $pagination-disabled-color: darken($table-bg-hover, 10%) !default;
443
448
  $pagination-disabled-bg: $well-bg !default;
444
- $pagination-disabled-border: hsla(0, 100%, 100%, 0);
449
+ $pagination-disabled-border: hsla(0, 100%, 100%, 0) !default;
445
450
 
446
451
 
447
452
  //== Pager
@@ -477,19 +482,19 @@ $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
477
482
 
478
483
  $state-success-text: $text-color !default;
479
484
  $state-success-bg: $brand-success !default;
480
- $state-success-border: hsla(0, 100%, 100%, 0);
485
+ $state-success-border: hsla(0, 100%, 100%, 0) !default;
481
486
 
482
487
  $state-info-text: $text-color !default;
483
488
  $state-info-bg: $brand-info !default;
484
- $state-info-border: hsla(0, 100%, 100%, 0);
489
+ $state-info-border: hsla(0, 100%, 100%, 0) !default;
485
490
 
486
491
  $state-warning-text: $text-color !default;
487
492
  $state-warning-bg: $brand-warning !default;
488
- $state-warning-border: hsla(0, 100%, 100%, 0);
493
+ $state-warning-border: hsla(0, 100%, 100%, 0) !default;
489
494
 
490
495
  $state-danger-text: $text-color !default;
491
496
  $state-danger-bg: $brand-danger !default;
492
- $state-danger-border: hsla(0, 100%, 100%, 0);
497
+ $state-danger-border: hsla(0, 100%, 100%, 0) !default;
493
498
 
494
499
 
495
500
  //== Tooltips
@@ -519,9 +524,9 @@ $popover-bg: $well-bg !default;
519
524
  //** Popover maximum width
520
525
  $popover-max-width: 276px !default;
521
526
  //** Popover border color
522
- $popover-border-color: hsla(0, 100%, 100%, 0);
527
+ $popover-border-color: hsla(0, 100%, 100%, 0) !default;
523
528
  //** Popover fallback border color
524
- $popover-fallback-border-color: hsla(0, 100%, 100%, 0);
529
+ $popover-fallback-border-color: hsla(0, 100%, 100%, 0) !default;
525
530
 
526
531
  //** Popover title background color
527
532
  $popover-title-bg: $table-bg-hover !default;
@@ -534,9 +539,9 @@ $popover-arrow-color: $well-bg !default;
534
539
  //** Popover outer arrow width
535
540
  $popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
536
541
  //** Popover outer arrow color
537
- $popover-arrow-outer-color: hsla(0, 100%, 100%, 0);
542
+ $popover-arrow-outer-color: hsla(0, 100%, 100%, 0) !default;
538
543
  //** Popover outer arrow fallback color
539
- $popover-arrow-outer-fallback-color: hsla(0, 100%, 100%, 0);
544
+ $popover-arrow-outer-fallback-color: hsla(0, 100%, 100%, 0) !default;
540
545
 
541
546
 
542
547
  //== Labels
@@ -577,9 +582,9 @@ $modal-title-line-height: $line-height-base !default;
577
582
  //** Background color of modal content area
578
583
  $modal-content-bg: $well-bg !default;
579
584
  //** Modal content border color
580
- $modal-content-border-color: hsla(0, 100%, 100%, 0);
585
+ $modal-content-border-color: hsla(0, 100%, 100%, 0) !default;
581
586
  //** Modal content border color **for IE8**
582
- $modal-content-fallback-border-color: hsla(0, 100%, 100%, 0);
587
+ $modal-content-fallback-border-color: hsla(0, 100%, 100%, 0) !default;
583
588
 
584
589
  //** Modal backdrop background color
585
590
  $modal-backdrop-bg: #000 !default;
@@ -648,21 +653,30 @@ $progress-bar-info-bg: $brand-info !default;
648
653
  //** Background color on `.list-group-item`
649
654
  $list-group-bg: $well-bg !default;
650
655
  //** `.list-group-item` border color
651
- $list-group-border: hsla(0, 100%, 100%, 0);
656
+ $list-group-border: hsla(0, 100%, 100%, 0) !default;
652
657
  //** List group border radius
653
658
  $list-group-border-radius: $border-radius-base !default;
654
659
 
655
- //** Background color of single list elements on hover
660
+ //** Background color of single list items on hover
656
661
  $list-group-hover-bg: $table-bg-hover !default;
657
- //** Text color of active list elements
662
+ //** Text color of active list items
658
663
  $list-group-active-color: $component-active-color !default;
659
- //** Background color of active list elements
664
+ //** Background color of active list items
660
665
  $list-group-active-bg: $component-active-bg !default;
661
666
  //** Border color of active list elements
662
667
  $list-group-active-border: $list-group-active-bg !default;
668
+ //** Text color for content within active list items
663
669
  $list-group-active-text-color: lighten($list-group-active-bg, 40%) !default;
664
670
 
671
+ //** Text color of disabled list items
672
+ $list-group-disabled-color: $gray-light !default;
673
+ //** Background color of disabled list items
674
+ $list-group-disabled-bg: $gray-lighter !default;
675
+ //** Text color for content within disabled list items
676
+ $list-group-disabled-text-color: $list-group-disabled-color !default;
677
+
665
678
  $list-group-link-color: $text-color !default;
679
+ $list-group-link-hover-color: $list-group-link-color !default;
666
680
  $list-group-link-heading-color: $text-color !default;
667
681
 
668
682
 
@@ -672,34 +686,36 @@ $list-group-link-heading-color: $text-color !default;
672
686
 
673
687
  $panel-bg: $well-bg !default;
674
688
  $panel-body-padding: 15px !default;
689
+ $panel-heading-padding: 10px 15px !default;
690
+ $panel-footer-padding: $panel-heading-padding !default;
675
691
  $panel-border-radius: $border-radius-base !default;
676
692
 
677
693
  //** Border color for elements within panels
678
- $panel-inner-border: hsla(0, 100%, 100%, 0);
694
+ $panel-inner-border: hsla(0, 100%, 100%, 0) !default;
679
695
  $panel-footer-bg: $table-bg-hover !default;
680
696
 
681
697
  $panel-default-text: $gray-dark !default;
682
- $panel-default-border: hsla(0, 100%, 100%, 0);
698
+ $panel-default-border: hsla(0, 100%, 100%, 0) !default;
683
699
  $panel-default-heading-bg: #f5f5f5 !default;
684
700
 
685
701
  $panel-primary-text: #fff !default;
686
- $panel-primary-border: hsla(0, 100%, 100%, 0);
702
+ $panel-primary-border: hsla(0, 100%, 100%, 0) !default;
687
703
  $panel-primary-heading-bg: $brand-primary !default;
688
704
 
689
705
  $panel-success-text: $state-success-text !default;
690
- $panel-success-border: hsla(0, 100%, 100%, 0);
706
+ $panel-success-border: hsla(0, 100%, 100%, 0) !default;
691
707
  $panel-success-heading-bg: $state-success-bg !default;
692
708
 
693
709
  $panel-info-text: $state-info-text !default;
694
- $panel-info-border: hsla(0, 100%, 100%, 0);
710
+ $panel-info-border: hsla(0, 100%, 100%, 0) !default;
695
711
  $panel-info-heading-bg: $state-info-bg !default;
696
712
 
697
713
  $panel-warning-text: $state-warning-text !default;
698
- $panel-warning-border: hsla(0, 100%, 100%, 0);
714
+ $panel-warning-border: hsla(0, 100%, 100%, 0) !default;
699
715
  $panel-warning-heading-bg: $state-warning-bg !default;
700
716
 
701
717
  $panel-danger-text: $state-danger-text !default;
702
- $panel-danger-border: hsla(0, 100%, 100%, 0);
718
+ $panel-danger-border: hsla(0, 100%, 100%, 0) !default;
703
719
  $panel-danger-heading-bg: $state-danger-bg !default;
704
720
 
705
721
 
@@ -803,6 +819,8 @@ $pre-scrollable-max-height: 340px !default;
803
819
  //
804
820
  //##
805
821
 
822
+ //** Horizontal offset for forms and lists.
823
+ $component-offset-horizontal: 180px !default;
806
824
  //** Text muted color
807
825
  $text-muted: $table-border-color !default;
808
826
  //** Abbreviations and acronyms border color
@@ -817,14 +835,9 @@ $blockquote-font-size: ($font-size-base * 1.25) !default;
817
835
  $blockquote-border-color: $table-border-color !default;
818
836
  //** Page header border color
819
837
  $page-header-border-color: $gray-lighter !default;
820
-
821
-
822
- //== Miscellaneous
823
- //
824
- //##
825
-
838
+ //** Width of horizontal description list titles
839
+ $dl-horizontal-offset: $component-offset-horizontal !default;
826
840
  //** Horizontal line color.
827
841
  $hr-border: $table-border-color !default;
828
842
 
829
- //** Horizontal offset for forms and lists.
830
- $component-offset-horizontal: 180px !default;
843
+