bootstrap-generators 3.2.0 → 3.3.1

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 (143) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -3
  3. data/Rakefile +9 -18
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +31 -21
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +38 -24
  7. data/lib/generators/bootstrap/install/templates/assets/stylesheets/starter.scss +2 -1
  8. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
  9. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +5 -3
  10. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim +7 -4
  11. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +10 -9
  12. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +12 -9
  13. data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim +15 -11
  14. data/readme-template.md.erb +3 -1
  15. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
  16. data/vendor/assets/javascripts/bootstrap/affix.js +43 -23
  17. data/vendor/assets/javascripts/bootstrap/alert.js +6 -4
  18. data/vendor/assets/javascripts/bootstrap/button.js +16 -10
  19. data/vendor/assets/javascripts/bootstrap/carousel.js +27 -10
  20. data/vendor/assets/javascripts/bootstrap/collapse.js +69 -28
  21. data/vendor/assets/javascripts/bootstrap/dropdown.js +20 -10
  22. data/vendor/assets/javascripts/bootstrap/modal.js +67 -23
  23. data/vendor/assets/javascripts/bootstrap/popover.js +13 -7
  24. data/vendor/assets/javascripts/bootstrap/scrollspy.js +12 -7
  25. data/vendor/assets/javascripts/bootstrap/tab.js +41 -16
  26. data/vendor/assets/javascripts/bootstrap/tooltip.js +60 -39
  27. data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
  28. data/vendor/assets/stylesheets/bootstrap.css.erb +332 -203
  29. data/vendor/assets/stylesheets/bootstrap.css.map +1 -0
  30. data/vendor/twitter/bootstrap/less/badges.less +7 -1
  31. data/vendor/twitter/bootstrap/less/button-groups.less +16 -13
  32. data/vendor/twitter/bootstrap/less/buttons.less +7 -4
  33. data/vendor/twitter/bootstrap/less/carousel.less +24 -0
  34. data/vendor/twitter/bootstrap/less/code.less +1 -0
  35. data/vendor/twitter/bootstrap/less/component-animations.less +5 -2
  36. data/vendor/twitter/bootstrap/less/dropdowns.less +3 -5
  37. data/vendor/twitter/bootstrap/less/forms.less +46 -40
  38. data/vendor/twitter/bootstrap/less/glyphicons.less +2 -1
  39. data/vendor/twitter/bootstrap/less/jumbotron.less +6 -5
  40. data/vendor/twitter/bootstrap/less/list-group.less +1 -8
  41. data/vendor/twitter/bootstrap/less/media.less +27 -36
  42. data/vendor/twitter/bootstrap/less/mixins/buttons.less +2 -0
  43. data/vendor/twitter/bootstrap/less/mixins/forms.less +5 -1
  44. data/vendor/twitter/bootstrap/less/mixins/grid-framework.less +2 -2
  45. data/vendor/twitter/bootstrap/less/mixins/image.less +0 -1
  46. data/vendor/twitter/bootstrap/less/mixins/labels.less +1 -1
  47. data/vendor/twitter/bootstrap/less/mixins/vendor-prefixes.less +6 -3
  48. data/vendor/twitter/bootstrap/less/modals.less +3 -5
  49. data/vendor/twitter/bootstrap/less/navbar.less +30 -25
  50. data/vendor/twitter/bootstrap/less/navs.less +3 -1
  51. data/vendor/twitter/bootstrap/less/normalize.less +5 -3
  52. data/vendor/twitter/bootstrap/less/pager.less +1 -2
  53. data/vendor/twitter/bootstrap/less/pagination.less +1 -1
  54. data/vendor/twitter/bootstrap/less/panels.less +21 -3
  55. data/vendor/twitter/bootstrap/less/popovers.less +6 -4
  56. data/vendor/twitter/bootstrap/less/print.less +102 -96
  57. data/vendor/twitter/bootstrap/less/progress-bars.less +1 -19
  58. data/vendor/twitter/bootstrap/less/responsive-embed.less +2 -1
  59. data/vendor/twitter/bootstrap/less/scaffolding.less +1 -1
  60. data/vendor/twitter/bootstrap/less/tables.less +11 -10
  61. data/vendor/twitter/bootstrap/less/theme.less +23 -9
  62. data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
  63. data/vendor/twitter/bootstrap/less/tooltip.less +12 -4
  64. data/vendor/twitter/bootstrap/less/type.less +0 -11
  65. data/vendor/twitter/bootstrap/less/utilities.less +0 -1
  66. data/vendor/twitter/bootstrap/less/variables.less +31 -21
  67. data/vendor/twitter/bootstrap/sass/_bootstrap-compass.scss +7 -0
  68. data/vendor/twitter/bootstrap/sass/_bootstrap-mincer.scss +17 -0
  69. data/vendor/twitter/bootstrap/sass/_bootstrap-sprockets.scss +7 -0
  70. data/vendor/twitter/bootstrap/sass/_bootstrap.scss +50 -0
  71. data/vendor/twitter/bootstrap/sass/{_alerts.scss → bootstrap/_alerts.scss} +0 -0
  72. data/vendor/twitter/bootstrap/sass/{_badges.scss → bootstrap/_badges.scss} +7 -1
  73. data/vendor/twitter/bootstrap/sass/{_breadcrumbs.scss → bootstrap/_breadcrumbs.scss} +0 -0
  74. data/vendor/twitter/bootstrap/sass/{_button-groups.scss → bootstrap/_button-groups.scss} +18 -15
  75. data/vendor/twitter/bootstrap/sass/{_buttons.scss → bootstrap/_buttons.scss} +8 -5
  76. data/vendor/twitter/bootstrap/sass/{_carousel.scss → bootstrap/_carousel.scss} +25 -1
  77. data/vendor/twitter/bootstrap/sass/{_close.scss → bootstrap/_close.scss} +0 -0
  78. data/vendor/twitter/bootstrap/sass/{_code.scss → bootstrap/_code.scss} +1 -0
  79. data/vendor/twitter/bootstrap/sass/{_component-animations.scss → bootstrap/_component-animations.scss} +5 -2
  80. data/vendor/twitter/bootstrap/sass/{_dropdowns.scss → bootstrap/_dropdowns.scss} +4 -6
  81. data/vendor/twitter/bootstrap/sass/{_forms.scss → bootstrap/_forms.scss} +53 -43
  82. data/vendor/twitter/bootstrap/sass/{_glyphicons.scss → bootstrap/_glyphicons.scss} +7 -10
  83. data/vendor/twitter/bootstrap/sass/{_grid.scss → bootstrap/_grid.scss} +4 -4
  84. data/vendor/twitter/bootstrap/sass/{_input-groups.scss → bootstrap/_input-groups.scss} +0 -0
  85. data/vendor/twitter/bootstrap/sass/{_jumbotron.scss → bootstrap/_jumbotron.scss} +6 -5
  86. data/vendor/twitter/bootstrap/sass/{_labels.scss → bootstrap/_labels.scss} +0 -0
  87. data/vendor/twitter/bootstrap/sass/{_list-group.scss → bootstrap/_list-group.scss} +1 -8
  88. data/vendor/twitter/bootstrap/sass/bootstrap/_media.scss +47 -0
  89. data/vendor/twitter/bootstrap/sass/{_mixins.scss → bootstrap/_mixins.scss} +0 -0
  90. data/vendor/twitter/bootstrap/sass/{_modals.scss → bootstrap/_modals.scss} +4 -6
  91. data/vendor/twitter/bootstrap/sass/{_navbar.scss → bootstrap/_navbar.scss} +36 -33
  92. data/vendor/twitter/bootstrap/sass/{_navs.scss → bootstrap/_navs.scss} +5 -3
  93. data/vendor/twitter/bootstrap/sass/{_normalize.scss → bootstrap/_normalize.scss} +5 -3
  94. data/vendor/twitter/bootstrap/sass/{_pager.scss → bootstrap/_pager.scss} +2 -3
  95. data/vendor/twitter/bootstrap/sass/{_pagination.scss → bootstrap/_pagination.scss} +1 -1
  96. data/vendor/twitter/bootstrap/sass/{_panels.scss → bootstrap/_panels.scss} +22 -4
  97. data/vendor/twitter/bootstrap/sass/{_popovers.scss → bootstrap/_popovers.scss} +6 -4
  98. data/vendor/twitter/bootstrap/sass/bootstrap/_print.scss +107 -0
  99. data/vendor/twitter/bootstrap/sass/{_progress-bars.scss → bootstrap/_progress-bars.scss} +2 -20
  100. data/vendor/twitter/bootstrap/sass/{_responsive-embed.scss → bootstrap/_responsive-embed.scss} +2 -1
  101. data/vendor/twitter/bootstrap/sass/{_responsive-utilities.scss → bootstrap/_responsive-utilities.scss} +0 -0
  102. data/vendor/twitter/bootstrap/sass/{_scaffolding.scss → bootstrap/_scaffolding.scss} +3 -3
  103. data/vendor/twitter/bootstrap/sass/{_tables.scss → bootstrap/_tables.scss} +11 -10
  104. data/vendor/twitter/bootstrap/sass/{_theme.scss → bootstrap/_theme.scss} +27 -13
  105. data/vendor/twitter/bootstrap/sass/{_thumbnails.scss → bootstrap/_thumbnails.scss} +2 -2
  106. data/vendor/twitter/bootstrap/sass/{_tooltip.scss → bootstrap/_tooltip.scss} +12 -4
  107. data/vendor/twitter/bootstrap/sass/{_type.scss → bootstrap/_type.scss} +10 -16
  108. data/vendor/twitter/bootstrap/sass/{_utilities.scss → bootstrap/_utilities.scss} +3 -4
  109. data/vendor/twitter/bootstrap/sass/{_variables.scss → bootstrap/_variables.scss} +38 -24
  110. data/vendor/twitter/bootstrap/sass/{_wells.scss → bootstrap/_wells.scss} +0 -0
  111. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_alerts.scss +0 -0
  112. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_background-variant.scss +0 -0
  113. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_border-radius.scss +0 -0
  114. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_buttons.scss +2 -0
  115. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_center-block.scss +0 -0
  116. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_clearfix.scss +0 -0
  117. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_forms.scss +5 -1
  118. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_gradients.scss +0 -0
  119. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid-framework.scss +0 -0
  120. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid.scss +2 -2
  121. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_hide-text.scss +1 -1
  122. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_image.scss +0 -1
  123. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_labels.scss +1 -1
  124. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_list-group.scss +0 -0
  125. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-divider.scss +0 -0
  126. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-vertical-align.scss +0 -0
  127. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_opacity.scss +0 -0
  128. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_pagination.scss +0 -0
  129. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_panels.scss +0 -0
  130. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_progress-bar.scss +1 -1
  131. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_reset-filter.scss +0 -0
  132. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_resize.scss +0 -0
  133. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_responsive-visibility.scss +0 -0
  134. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_size.scss +0 -0
  135. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_tab-focus.scss +0 -0
  136. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_table-row.scss +0 -0
  137. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-emphasis.scss +0 -0
  138. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-overflow.scss +0 -0
  139. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_vendor-prefixes.scss +6 -3
  140. metadata +76 -72
  141. data/vendor/twitter/bootstrap/sass/_media.scss +0 -56
  142. data/vendor/twitter/bootstrap/sass/_print.scss +0 -101
  143. data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -50
@@ -11,7 +11,12 @@
11
11
  display: none;
12
12
  max-width: @popover-max-width;
13
13
  padding: 1px;
14
- text-align: left; // Reset given new insertion method
14
+ // Reset font and text propertes given new insertion method
15
+ font-family: @font-family-base;
16
+ font-size: @font-size-base;
17
+ font-weight: normal;
18
+ line-height: @line-height-base;
19
+ text-align: left;
15
20
  background-color: @popover-bg;
16
21
  background-clip: padding-box;
17
22
  border: 1px solid @popover-fallback-border-color;
@@ -33,8 +38,6 @@
33
38
  margin: 0; // reset heading margin
34
39
  padding: 8px 14px;
35
40
  font-size: @font-size-base;
36
- font-weight: normal;
37
- line-height: 18px;
38
41
  background-color: @popover-title-bg;
39
42
  border-bottom: 1px solid darken(@popover-title-bg, 5%);
40
43
  border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
@@ -129,5 +132,4 @@
129
132
  bottom: -@popover-arrow-width;
130
133
  }
131
134
  }
132
-
133
135
  }
@@ -1,101 +1,107 @@
1
- //
2
- // Basic print styles
3
- // --------------------------------------------------
4
- // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
1
+ /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
2
+
3
+ // ==========================================================================
4
+ // Print styles.
5
+ // Inlined to avoid the additional HTTP request: h5bp.com/r
6
+ // ==========================================================================
5
7
 
6
8
  @media print {
9
+ *,
10
+ *:before,
11
+ *:after {
12
+ background: transparent !important;
13
+ color: #000 !important; // Black prints faster: h5bp.com/s
14
+ box-shadow: none !important;
15
+ text-shadow: none !important;
16
+ }
17
+
18
+ a,
19
+ a:visited {
20
+ text-decoration: underline;
21
+ }
22
+
23
+ a[href]:after {
24
+ content: " (" attr(href) ")";
25
+ }
26
+
27
+ abbr[title]:after {
28
+ content: " (" attr(title) ")";
29
+ }
30
+
31
+ // Don't show links that are fragment identifiers,
32
+ // or use the `javascript:` pseudo protocol
33
+ a[href^="#"]:after,
34
+ a[href^="javascript:"]:after {
35
+ content: "";
36
+ }
37
+
38
+ pre,
39
+ blockquote {
40
+ border: 1px solid #999;
41
+ page-break-inside: avoid;
42
+ }
43
+
44
+ thead {
45
+ display: table-header-group; // h5bp.com/t
46
+ }
47
+
48
+ tr,
49
+ img {
50
+ page-break-inside: avoid;
51
+ }
7
52
 
8
- * {
9
- text-shadow: none !important;
10
- color: #000 !important; // Black prints faster: h5bp.com/s
11
- background: transparent !important;
12
- box-shadow: none !important;
13
- }
14
-
15
- a,
16
- a:visited {
17
- text-decoration: underline;
18
- }
19
-
20
- a[href]:after {
21
- content: " (" attr(href) ")";
22
- }
23
-
24
- abbr[title]:after {
25
- content: " (" attr(title) ")";
26
- }
27
-
28
- // Don't show links for images, or javascript/internal links
29
- a[href^="javascript:"]:after,
30
- a[href^="#"]:after {
31
- content: "";
32
- }
33
-
34
- pre,
35
- blockquote {
36
- border: 1px solid #999;
37
- page-break-inside: avoid;
38
- }
39
-
40
- thead {
41
- display: table-header-group; // h5bp.com/t
42
- }
43
-
44
- tr,
45
- img {
46
- page-break-inside: avoid;
47
- }
48
-
49
- img {
50
- max-width: 100% !important;
51
- }
52
-
53
- p,
54
- h2,
55
- h3 {
56
- orphans: 3;
57
- widows: 3;
58
- }
59
-
60
- h2,
61
- h3 {
62
- page-break-after: avoid;
63
- }
64
-
65
- // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
66
- // Once fixed, we can just straight up remove this.
67
- select {
68
- background: #fff !important;
69
- }
70
-
71
- // Bootstrap components
72
- .navbar {
73
- display: none;
74
- }
75
- .table {
76
- td,
77
- th {
78
- background-color: #fff !important;
79
- }
80
- }
81
- .btn,
82
- .dropup > .btn {
83
- > .caret {
84
- border-top-color: #000 !important;
85
- }
86
- }
87
- .label {
88
- border: 1px solid #000;
89
- }
90
-
91
- .table {
92
- border-collapse: collapse !important;
93
- }
94
- .table-bordered {
95
- th,
96
- td {
97
- border: 1px solid #ddd !important;
98
- }
99
- }
53
+ img {
54
+ max-width: 100% !important;
55
+ }
56
+
57
+ p,
58
+ h2,
59
+ h3 {
60
+ orphans: 3;
61
+ widows: 3;
62
+ }
63
+
64
+ h2,
65
+ h3 {
66
+ page-break-after: avoid;
67
+ }
68
+
69
+ // Bootstrap specific changes start
70
+ //
71
+ // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
72
+ // Once fixed, we can just straight up remove this.
73
+ select {
74
+ background: #fff !important;
75
+ }
76
+
77
+ // Bootstrap components
78
+ .navbar {
79
+ display: none;
80
+ }
81
+ .btn,
82
+ .dropup > .btn {
83
+ > .caret {
84
+ border-top-color: #000 !important;
85
+ }
86
+ }
87
+ .label {
88
+ border: 1px solid #000;
89
+ }
90
+
91
+ .table {
92
+ border-collapse: collapse !important;
93
+
94
+ td,
95
+ th {
96
+ background-color: #fff !important;
97
+ }
98
+ }
99
+ .table-bordered {
100
+ th,
101
+ td {
102
+ border: 1px solid #ddd !important;
103
+ }
104
+ }
100
105
 
106
+ // Bootstrap specific changes end
101
107
  }
@@ -19,7 +19,6 @@
19
19
  }
20
20
 
21
21
 
22
-
23
22
  // Bar itself
24
23
  // -------------------------
25
24
 
@@ -29,7 +28,7 @@
29
28
  height: @line-height-computed;
30
29
  margin-bottom: @line-height-computed;
31
30
  background-color: @progress-bg;
32
- border-radius: @border-radius-base;
31
+ border-radius: @progress-border-radius;
33
32
  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
34
33
  }
35
34
 
@@ -67,23 +66,6 @@
67
66
  .animation(progress-bar-stripes 2s linear infinite);
68
67
  }
69
68
 
70
- // Account for lower percentages
71
- .progress-bar {
72
- &[aria-valuenow="1"],
73
- &[aria-valuenow="2"] {
74
- min-width: 30px;
75
- }
76
-
77
- &[aria-valuenow="0"] {
78
- color: @gray-light;
79
- min-width: 30px;
80
- background-color: transparent;
81
- background-image: none;
82
- box-shadow: none;
83
- }
84
- }
85
-
86
-
87
69
 
88
70
  // Variations
89
71
  // -------------------------
@@ -12,7 +12,8 @@
12
12
  .embed-responsive-item,
13
13
  iframe,
14
14
  embed,
15
- object {
15
+ object,
16
+ video {
16
17
  position: absolute;
17
18
  top: 0;
18
19
  left: 0;
@@ -52,7 +52,7 @@ a {
52
52
  &:hover,
53
53
  &:focus {
54
54
  color: @link-hover-color;
55
- text-decoration: underline;
55
+ text-decoration: @link-hover-decoration;
56
56
  }
57
57
 
58
58
  &:focus {
@@ -6,6 +6,12 @@
6
6
  table {
7
7
  background-color: @table-bg;
8
8
  }
9
+ caption {
10
+ padding-top: @table-cell-padding;
11
+ padding-bottom: @table-cell-padding;
12
+ color: @text-muted;
13
+ text-align: left;
14
+ }
9
15
  th {
10
16
  text-align: left;
11
17
  }
@@ -106,10 +112,7 @@ th {
106
112
 
107
113
  .table-striped {
108
114
  > tbody > tr:nth-child(odd) {
109
- > td,
110
- > th {
111
- background-color: @table-bg-accent;
112
- }
115
+ background-color: @table-bg-accent;
113
116
  }
114
117
  }
115
118
 
@@ -120,10 +123,7 @@ th {
120
123
 
121
124
  .table-hover {
122
125
  > tbody > tr:hover {
123
- > td,
124
- > th {
125
- background-color: @table-bg-hover;
126
- }
126
+ background-color: @table-bg-hover;
127
127
  }
128
128
  }
129
129
 
@@ -169,14 +169,15 @@ table {
169
169
  // will display normally.
170
170
 
171
171
  .table-responsive {
172
+ overflow-x: auto;
173
+ min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
174
+
172
175
  @media screen and (max-width: @screen-xs-max) {
173
176
  width: 100%;
174
177
  margin-bottom: (@line-height-computed * 0.75);
175
178
  overflow-y: hidden;
176
- overflow-x: auto;
177
179
  -ms-overflow-style: -ms-autohiding-scrollbar;
178
180
  border: 1px solid @table-border-color;
179
- -webkit-overflow-scrolling: touch;
180
181
 
181
182
  // Tighten up spacing
182
183
  > .table {
@@ -7,7 +7,6 @@
7
7
  @import "mixins.less";
8
8
 
9
9
 
10
-
11
10
  //
12
11
  // Buttons
13
12
  // --------------------------------------------------
@@ -28,6 +27,10 @@
28
27
  &.active {
29
28
  .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
30
29
  }
30
+
31
+ .badge {
32
+ text-shadow: none;
33
+ }
31
34
  }
32
35
 
33
36
  // Mixin for generating new styles
@@ -74,7 +77,6 @@
74
77
  .btn-danger { .btn-styles(@btn-danger-bg); }
75
78
 
76
79
 
77
-
78
80
  //
79
81
  // Images
80
82
  // --------------------------------------------------
@@ -85,7 +87,6 @@
85
87
  }
86
88
 
87
89
 
88
-
89
90
  //
90
91
  // Dropdowns
91
92
  // --------------------------------------------------
@@ -103,7 +104,6 @@
103
104
  }
104
105
 
105
106
 
106
-
107
107
  //
108
108
  // Navbar
109
109
  // --------------------------------------------------
@@ -116,8 +116,9 @@
116
116
  @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
117
117
  .box-shadow(@shadow);
118
118
 
119
+ .navbar-nav > .open > a,
119
120
  .navbar-nav > .active > a {
120
- #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
121
+ #gradient > .vertical(@start-color: darken(@navbar-default-link-active-bg, 5%); @end-color: darken(@navbar-default-link-active-bg, 2%));
121
122
  .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
122
123
  }
123
124
  }
@@ -131,8 +132,9 @@
131
132
  #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
132
133
  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
133
134
 
135
+ .navbar-nav > .open > a,
134
136
  .navbar-nav > .active > a {
135
- #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
137
+ #gradient > .vertical(@start-color: @navbar-inverse-link-active-bg; @end-color: lighten(@navbar-inverse-link-active-bg, 2.5%));
136
138
  .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
137
139
  }
138
140
 
@@ -149,6 +151,17 @@
149
151
  border-radius: 0;
150
152
  }
151
153
 
154
+ // Fix active state of dropdown items in collapsed mode
155
+ @media (max-width: @grid-float-breakpoint-max) {
156
+ .navbar .navbar-nav .open .dropdown-menu > .active > a {
157
+ &,
158
+ &:hover,
159
+ &:focus {
160
+ color: #fff;
161
+ #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
162
+ }
163
+ }
164
+ }
152
165
 
153
166
 
154
167
  //
@@ -175,7 +188,6 @@
175
188
  .alert-danger { .alert-styles(@alert-danger-bg); }
176
189
 
177
190
 
178
-
179
191
  //
180
192
  // Progress bars
181
193
  // --------------------------------------------------
@@ -218,8 +230,11 @@
218
230
  text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
219
231
  #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
220
232
  border-color: darken(@list-group-active-border, 7.5%);
221
- }
222
233
 
234
+ .badge {
235
+ text-shadow: none;
236
+ }
237
+ }
223
238
 
224
239
 
225
240
  //
@@ -245,7 +260,6 @@
245
260
  .panel-danger > .panel-heading { .panel-heading-styles(@panel-danger-heading-bg); }
246
261
 
247
262
 
248
-
249
263
  //
250
264
  // Wells
251
265
  // --------------------------------------------------