bootswatch-rails 3.1.1.1 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
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
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d78b0e8d50d0cba15222c48be5495e7cf2708f51
4
- data.tar.gz: ecf9af425a989d623a4ba7d3717a3b2d753aa349
3
+ metadata.gz: 4f53dbc7f1b107a85279a722b3dba59dae3b22a1
4
+ data.tar.gz: 7b21979c41742443cb331c39c01847c08a0c9f46
5
5
  SHA512:
6
- metadata.gz: 21788dac536353c34bd1fbc0e9a6e7d92d943b84b4605825d3ddef367b9bece923875c29cae822b2865190a38e9011ed5d0370caf288efecb431d4cf25cf19ce
7
- data.tar.gz: 07a437d8d882e7199e87bb3d1b8c46b4d7ce43b716a13e49f6e81d20bfcfdb2c4f4f9d3e1d809e6b8248327e89de6c214c891116992491667690952e152aed1b
6
+ metadata.gz: 2934f3189205785ef7b3afc9ccbd307544dcae04de07e01c29a905cacd94566ff2d10bf1336f8432a4e393fa9a9aa7122daaef924de7536553eb9771caa9c140
7
+ data.tar.gz: a50a44db9ddd3bded9abe7945ba9170c6d5e6293694af2436f93d7567040a9f902261d6f6d1b7f371f39fc3b8eb2549744f06c831f288b5c0ef79203b8039d19
data/HISTORY.md CHANGED
@@ -1,3 +1,7 @@
1
+ ## 3.2.0 (2014-07-12)
2
+
3
+ * Update all themes to current bootswatch versions (3.2.0)
4
+
1
5
  ## 3.0.0 (2013-10-17)
2
6
 
3
7
  * Update all themes to current bootswatch versions (3.0.0)
data/README.md CHANGED
@@ -5,7 +5,7 @@
5
5
  This gem is meant to be used with
6
6
  [bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass). It gives
7
7
  you complete scss versions of [bootswatches](http://bootswatch.com) for use in
8
- your Rails 3 asset pipeline, just like bootstrap-sass gives you scss version of
8
+ your Rails asset pipeline, just like bootstrap-sass gives you scss version of
9
9
  bootstrap itself.
10
10
 
11
11
  ## Installation
@@ -87,14 +87,15 @@ Included bootswatches
87
87
  4. Push to the branch (`git push origin my-new-feature`)
88
88
  5. Create new Pull Request
89
89
 
90
+ Please see [CONTRIBUTING](https://github.com/maxim/bootswatch-rails/blob/master/CONTRIBUTING.md) for more detail. (Dont change the scss files by hand, use the converter and rearranger first, and make your changes in those if possible)
91
+
92
+
90
93
  #### Note about converter
91
94
  I am trying to automate this project as much as possible, so I wrote a script
92
95
  that does most of the work converting less to scss. If you want to contribute a
93
96
  fix that's easily automatable and you know ruby, please add a processor to the
94
97
  converter.
95
98
 
96
- Note on 3.0.0 conversion: This was converted using a simple grunt task in the [bootswatch-scss](https://github.com/log0ymxm/bootswatch-scss) repo.
97
-
98
99
  ## Credits
99
100
 
100
101
  Big thanks to these guys.
data/converter CHANGED
@@ -108,6 +108,14 @@ rewrite_image_paths = lambda do |line, _|
108
108
  end
109
109
  end
110
110
 
111
+ remove_icon_font_path = lambda do |line, _|
112
+ if line =~ /^\s*\$icon-font-path/
113
+ ""
114
+ else
115
+ line
116
+ end
117
+ end
118
+
111
119
  mark_variables_default = lambda do |line, _|
112
120
  if line =~ /^\s*\$/ && line.include?(':')
113
121
  line.sub(';', ' !default;')
@@ -134,6 +142,7 @@ line_processors = [
134
142
  if File.basename(src_file_path) =~ /variables/
135
143
  line_processors += [
136
144
  rewrite_image_paths,
145
+ remove_icon_font_path,
137
146
  mark_variables_default
138
147
  ]
139
148
  end
@@ -1,5 +1,5 @@
1
1
  module Bootswatch
2
2
  module Rails
3
- VERSION = '3.1.1.1'
3
+ VERSION = '3.2.0'
4
4
  end
5
5
  end
@@ -1,4 +1,4 @@
1
- // Amelia 3.1.1
1
+ // Amelia 3.2.0
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -95,6 +95,10 @@ legend {
95
95
  color: #fff;
96
96
  }
97
97
 
98
+ .input-group-addon {
99
+ color: $btn-default-color;
100
+ }
101
+
98
102
  .has-warning {
99
103
  .help-block,
100
104
  .control-label,
@@ -106,6 +110,10 @@ legend {
106
110
  .form-control:focus {
107
111
  border-color: lighten($brand-warning, 20%);
108
112
  }
113
+
114
+ .input-group-addon {
115
+ border: none;
116
+ }
109
117
  }
110
118
 
111
119
  .has-error {
@@ -119,6 +127,10 @@ legend {
119
127
  .form-control:focus {
120
128
  border-color: lighten($brand-primary, 40%);
121
129
  }
130
+
131
+ .input-group-addon {
132
+ border: none;
133
+ }
122
134
  }
123
135
 
124
136
  .has-success {
@@ -132,10 +144,10 @@ legend {
132
144
  .form-control:focus {
133
145
  border-color: lighten($brand-success, 20%);
134
146
  }
135
- }
136
147
 
137
- .input-group-addon {
138
- color: $btn-default-color;
148
+ .input-group-addon {
149
+ border: none;
150
+ }
139
151
  }
140
152
 
141
153
  // Navs =======================================================================
@@ -1,7 +1,8 @@
1
- // Amelia 3.1.1
1
+ // Amelia 3.2.0
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
5
+
5
6
  //== Colors
6
7
  //
7
8
  //## Gray and brand colors for use across Bootstrap.
@@ -21,7 +22,7 @@ $brand-danger: #DF6E1E !default;
21
22
 
22
23
  //== Scaffolding
23
24
  //
24
- // ## Settings for some of the most global styles.
25
+ //## Settings for some of the most global styles.
25
26
 
26
27
  //** Background color for `<body>`.
27
28
  $body-bg: #108A93 !default;
@@ -33,15 +34,6 @@ $link-color: lighten($brand-warning, 15%) !default;
33
34
  //** Link hover color set via `darken()` function.
34
35
  $link-hover-color: $link-color !default;
35
36
 
36
- //== Miscellaneous
37
- //
38
- //##
39
-
40
- //** Horizontal line color.
41
- $hr-border: darken($body-bg, 5%) !default;
42
-
43
- //** Horizontal offset for forms and lists.
44
- $component-offset-horizontal: 180px !default;
45
37
 
46
38
  //== Typography
47
39
  //
@@ -76,14 +68,43 @@ $headings-line-height: 1.1 !default;
76
68
  $headings-color: inherit !default;
77
69
 
78
70
 
79
- //-- Iconography
71
+ //== Iconography
80
72
  //
81
- //## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
82
-
73
+ //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
83
74
 
75
+ //** Load fonts from this directory.
76
+ //** File name for all font files.
84
77
  $icon-font-name: "glyphicons-halflings-regular" !default;
78
+ //** Element ID within SVG icon file.
85
79
  $icon-font-svg-id: "glyphicons_halflingsregular" !default;
86
80
 
81
+ //== Type
82
+ //
83
+ //##
84
+
85
+ //** Horizontal offset for forms and lists.
86
+ $component-offset-horizontal: 180px !default;
87
+ //** Text muted color
88
+ $text-muted: rgba(255, 255, 255, 0.6) !default;
89
+ //** Abbreviations and acronyms border color
90
+ $abbr-border-color: $gray-light !default;
91
+ //** Headings small color
92
+ $headings-small-color: $gray-light !default;
93
+ //** Blockquote small color
94
+ $blockquote-small-color: rgba(255, 255, 255, 0.6) !default;
95
+ //** Blockquote font size
96
+ $blockquote-font-size: ($font-size-base * 1.25) !default;
97
+ //** Blockquote border color
98
+ $blockquote-border-color: rgba(255, 255, 255, 0.6) !default;
99
+ //** Page header border color
100
+ $page-header-border-color: darken($body-bg, 5%) !default;
101
+ //** Width of horizontal description list titles
102
+ $dl-horizontal-offset: $component-offset-horizontal !default;
103
+ //** Horizontal line color.
104
+ $hr-border: darken($body-bg, 5%) !default;
105
+
106
+
107
+
87
108
  //== Components
88
109
  //
89
110
  //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -128,7 +149,7 @@ $table-cell-padding: 8px !default;
128
149
  $table-condensed-cell-padding: 5px !default;
129
150
 
130
151
  //** Default background color used for all tables.
131
- $table-bg: transparent !default;
152
+ $table-bg: hsla(0, 100%, 100%, 0) !default;
132
153
  //** Background color used for `.table-striped`.
133
154
  $table-bg-accent: darken($body-bg, 2.5%) !default;
134
155
  //** Background color used for `.table-hover`.
@@ -222,25 +243,25 @@ $dropdown-fallback-border: #ccc !default;
222
243
  //** Divider color for between dropdown items.
223
244
  $dropdown-divider-bg: #e5e5e5 !default;
224
245
 
225
- //** Active dropdown menu item text color.
226
- $dropdown-link-active-color: #fff !default;
227
- //** Active dropdown menu item background color.
228
- $dropdown-link-active-bg: $component-active-bg !default;
229
-
230
246
  //** Dropdown link text color.
231
247
  $dropdown-link-color: $gray-dark !default;
232
248
  //** Hover color for dropdown links.
233
249
  $dropdown-link-hover-color: #fff !default;
250
+ //** Active dropdown menu item background color.
251
+ $dropdown-link-active-bg: $component-active-bg !default;
234
252
  //** Hover background for dropdown links.
235
253
  $dropdown-link-hover-bg: $dropdown-link-active-bg !default;
236
254
 
255
+ //** Active dropdown menu item text color.
256
+ $dropdown-link-active-color: #fff !default;
257
+
237
258
  //** Disabled dropdown menu item background color.
238
259
  $dropdown-link-disabled-color: $gray-lighter !default;
239
260
 
240
261
  //** Text color for headers within dropdown menus.
241
262
  $dropdown-header-color: $gray-lighter !default;
242
263
 
243
- // Note: Deprecated @dropdown-caret-color as of v3.1.0
264
+ //** Deprecated `@dropdown-caret-color` as of v3.1.0
244
265
  $dropdown-caret-color: #000 !default;
245
266
 
246
267
 
@@ -253,8 +274,8 @@ $dropdown-caret-color: #000 !default;
253
274
 
254
275
  $zindex-navbar: 1000 !default;
255
276
  $zindex-dropdown: 1000 !default;
256
- $zindex-popover: 1010 !default;
257
- $zindex-tooltip: 1030 !default;
277
+ $zindex-popover: 1060 !default;
278
+ $zindex-tooltip: 1070 !default;
258
279
  $zindex-navbar-fixed: 1030 !default;
259
280
  $zindex-modal-background: 1040 !default;
260
281
  $zindex-modal: 1050 !default;
@@ -265,27 +286,32 @@ $zindex-modal: 1050 !default;
265
286
  //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
266
287
 
267
288
  // Extra small screen / phone
268
- // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
289
+ //** Deprecated `@screen-xs` as of v3.0.1
269
290
  $screen-xs: 480px !default;
291
+ //** Deprecated `@screen-xs-min` as of v3.2.0
270
292
  $screen-xs-min: $screen-xs !default;
293
+ //** Deprecated `@screen-phone` as of v3.0.1
271
294
  $screen-phone: $screen-xs-min !default;
272
295
 
273
296
  // Small screen / tablet
274
- // Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
297
+ //** Deprecated `@screen-sm` as of v3.0.1
275
298
  $screen-sm: 768px !default;
276
299
  $screen-sm-min: $screen-sm !default;
300
+ //** Deprecated `@screen-tablet` as of v3.0.1
277
301
  $screen-tablet: $screen-sm-min !default;
278
302
 
279
303
  // Medium screen / desktop
280
- // Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
304
+ //** Deprecated `@screen-md` as of v3.0.1
281
305
  $screen-md: 992px !default;
282
306
  $screen-md-min: $screen-md !default;
307
+ //** Deprecated `@screen-desktop` as of v3.0.1
283
308
  $screen-desktop: $screen-md-min !default;
284
309
 
285
310
  // Large screen / wide desktop
286
- // Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
311
+ //** Deprecated `@screen-lg` as of v3.0.1
287
312
  $screen-lg: 1200px !default;
288
313
  $screen-lg-min: $screen-lg !default;
314
+ //** Deprecated `@screen-lg-desktop` as of v3.0.1
289
315
  $screen-lg-desktop: $screen-lg-min !default;
290
316
 
291
317
  // So media queries don't overlap when required, provide a maximum
@@ -352,7 +378,7 @@ $navbar-default-link-hover-bg: lighten($navbar-default-bg, 10%) !def
352
378
  $navbar-default-link-active-color: #fff !default;
353
379
  $navbar-default-link-active-bg: $navbar-default-link-hover-bg !default;
354
380
  $navbar-default-link-disabled-color: #ccc !default;
355
- $navbar-default-link-disabled-bg: transparent !default;
381
+ $navbar-default-link-disabled-bg: hsla(0, 100%, 100%, 0) !default;
356
382
 
357
383
  // Navbar brand label
358
384
  $navbar-default-brand-color: $navbar-default-link-color !default;
@@ -378,7 +404,7 @@ $navbar-inverse-link-hover-bg: lighten($navbar-inverse-bg, 10%) !de
378
404
  $navbar-inverse-link-active-color: #fff !default;
379
405
  $navbar-inverse-link-active-bg: $navbar-inverse-link-hover-bg !default;
380
406
  $navbar-inverse-link-disabled-color: #444 !default;
381
- $navbar-inverse-link-disabled-bg: transparent !default;
407
+ $navbar-inverse-link-disabled-bg: hsla(0, 100%, 100%, 0) !default;
382
408
 
383
409
  // Inverted navbar brand label
384
410
  $navbar-inverse-brand-color: $navbar-inverse-link-color !default;
@@ -407,14 +433,14 @@ $nav-open-link-hover-color: $nav-link-hover-bg !default;
407
433
  //== Tabs
408
434
  $nav-tabs-border-color: $nav-link-hover-bg !default;
409
435
 
410
- $nav-tabs-link-hover-border-color: transparent !default;
436
+ $nav-tabs-link-hover-border-color: hsla(0, 100%, 100%, 0) !default;
411
437
 
412
438
  $nav-tabs-active-link-hover-bg: $nav-link-hover-bg !default;
413
439
  $nav-tabs-active-link-hover-color: #fff !default;
414
- $nav-tabs-active-link-hover-border-color: transparent !default;
440
+ $nav-tabs-active-link-hover-border-color: hsla(0, 100%, 100%, 0) !default;
415
441
 
416
- $nav-tabs-justified-link-border-color: transparent !default;
417
- $nav-tabs-justified-active-link-border-color: transparent !default;
442
+ $nav-tabs-justified-link-border-color: hsla(0, 100%, 100%, 0) !default;
443
+ $nav-tabs-justified-active-link-border-color: hsla(0, 100%, 100%, 0) !default;
418
444
 
419
445
  //== Pills
420
446
  $nav-pills-border-radius: $border-radius-base !default;
@@ -428,19 +454,19 @@ $nav-pills-active-link-hover-color: #fff !default;
428
454
 
429
455
  $pagination-color: $link-color !default;
430
456
  $pagination-bg: lighten($body-bg, 5%) !default;
431
- $pagination-border: transparent !default;
457
+ $pagination-border: hsla(0, 100%, 100%, 0) !default;
432
458
 
433
459
  $pagination-hover-color: $link-hover-color !default;
434
460
  $pagination-hover-bg: $component-active-bg !default;
435
- $pagination-hover-border: transparent !default;
461
+ $pagination-hover-border: hsla(0, 100%, 100%, 0) !default;
436
462
 
437
463
  $pagination-active-color: #fff !default;
438
464
  $pagination-active-bg: lighten($body-bg, 10%) !default;
439
- $pagination-active-border: transparent !default;
465
+ $pagination-active-border: hsla(0, 100%, 100%, 0) !default;
440
466
 
441
467
  $pagination-disabled-color: #fff !default;
442
468
  $pagination-disabled-bg: lighten($body-bg, 5%) !default;
443
- $pagination-disabled-border: transparent !default;
469
+ $pagination-disabled-border: hsla(0, 100%, 100%, 0) !default;
444
470
 
445
471
 
446
472
  //== Pager
@@ -651,17 +677,26 @@ $list-group-border: darken($body-bg, 5%) !default;
651
677
  //** List group border radius
652
678
  $list-group-border-radius: $border-radius-base !default;
653
679
 
654
- //** Background color of single list elements on hover
680
+ //** Background color of single list items on hover
655
681
  $list-group-hover-bg: lighten($body-bg, 10%) !default;
656
- //** Text color of active list elements
682
+ //** Text color of active list items
657
683
  $list-group-active-color: $component-active-color !default;
658
- //** Background color of active list elements
684
+ //** Background color of active list items
659
685
  $list-group-active-bg: $component-active-bg !default;
660
686
  //** Border color of active list elements
661
687
  $list-group-active-border: $list-group-border !default;
688
+ //** Text color for content within active list items
662
689
  $list-group-active-text-color: lighten($list-group-active-bg, 40%) !default;
663
690
 
691
+ //** Text color of disabled list items
692
+ $list-group-disabled-color: $gray-light !default;
693
+ //** Background color of disabled list items
694
+ $list-group-disabled-bg: $gray-lighter !default;
695
+ //** Text color for content within disabled list items
696
+ $list-group-disabled-text-color: $list-group-disabled-color !default;
697
+
664
698
  $list-group-link-color: $link-color !default;
699
+ $list-group-link-hover-color: $list-group-link-color !default;
665
700
  $list-group-link-heading-color: #fff !default;
666
701
 
667
702
 
@@ -671,16 +706,18 @@ $list-group-link-heading-color: #fff !default;
671
706
 
672
707
  $panel-bg: lighten($body-bg, 5%) !default;
673
708
  $panel-body-padding: 15px !default;
709
+ $panel-heading-padding: 10px 15px !default;
710
+ $panel-footer-padding: $panel-heading-padding !default;
674
711
  $panel-border-radius: $border-radius-base !default;
675
-
676
- $panel-default-text: #fff !default;
677
- $panel-default-border: darken($body-bg, 5%) !default;
678
712
  $panel-default-heading-bg: lighten($body-bg, 15%) !default;
679
713
 
680
714
  //** Border color for elements within panels
681
715
  $panel-inner-border: darken($body-bg, 5%) !default;
682
716
  $panel-footer-bg: $panel-default-heading-bg !default;
683
717
 
718
+ $panel-default-text: #fff !default;
719
+ $panel-default-border: darken($body-bg, 5%) !default;
720
+
684
721
  $panel-primary-text: #fff !default;
685
722
  $panel-primary-border: $brand-primary !default;
686
723
  $panel-primary-heading-bg: $brand-primary !default;
@@ -804,23 +841,3 @@ $pre-bg: #f5f5f5 !default;
804
841
  $pre-color: $gray-dark !default;
805
842
  $pre-border-color: #ccc !default;
806
843
  $pre-scrollable-max-height: 340px !default;
807
-
808
-
809
- //== Type
810
- //
811
- //##
812
-
813
- //** Text muted color
814
- $text-muted: rgba(255, 255, 255, 0.6) !default;
815
- //** Abbreviations and acronyms border color
816
- $abbr-border-color: $gray-light !default;
817
- //** Headings small color
818
- $headings-small-color: $gray-light !default;
819
- //** Blockquote small color
820
- $blockquote-small-color: rgba(255, 255, 255, 0.6) !default;
821
- //** Blockquote font size
822
- $blockquote-font-size: ($font-size-base * 1.25) !default;
823
- //** Blockquote border color
824
- $blockquote-border-color: rgba(255, 255, 255, 0.6) !default;
825
- //** Page header border color
826
- $page-header-border-color: darken($body-bg, 5%) !default;
@@ -1,4 +1,4 @@
1
- // Cerulean 3.1.1
1
+ // Cerulean 3.2.0
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
- }
18
17
 
19
- .navbar .navbar-nav > li > a,
20
- .navbar-brand {
21
- text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
18
+ .navbar-nav > li > a,
19
+ .navbar-brand {
20
+ text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
21
+ }
22
22
  }
23
23
 
24
24
  .navbar-default {