twbs_sass_rails 0.9.2 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/README.md +1 -1
  4. data/app/assets/fonts/glyphicons-halflings-regular.svg +1 -1
  5. data/lib/twbs_sass_rails/version.rb +1 -1
  6. data/twbs_sass_rails.gemspec +6 -6
  7. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +43 -23
  8. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +6 -4
  9. data/vendor/assets/javascripts/twbs/bootstrap/button.js +16 -10
  10. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +26 -10
  11. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +69 -28
  12. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +20 -10
  13. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +22 -21
  14. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +13 -7
  15. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +12 -7
  16. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +41 -16
  17. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +60 -39
  18. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +1 -1
  19. data/vendor/assets/stylesheets/twbs/bootstrap/_button-groups.scss +18 -11
  20. data/vendor/assets/stylesheets/twbs/bootstrap/_buttons.scss +8 -5
  21. data/vendor/assets/stylesheets/twbs/bootstrap/_carousel.scss +25 -1
  22. data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +1 -0
  23. data/vendor/assets/stylesheets/twbs/bootstrap/_component-animations.scss +5 -2
  24. data/vendor/assets/stylesheets/twbs/bootstrap/_dropdowns.scss +4 -6
  25. data/vendor/assets/stylesheets/twbs/bootstrap/_forms.scss +51 -28
  26. data/vendor/assets/stylesheets/twbs/bootstrap/_glyphicons.scss +2 -1
  27. data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +4 -4
  28. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +4 -4
  29. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +1 -0
  30. data/vendor/assets/stylesheets/twbs/bootstrap/_media.scss +27 -36
  31. data/vendor/assets/stylesheets/twbs/bootstrap/_modals.scss +3 -4
  32. data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +35 -33
  33. data/vendor/assets/stylesheets/twbs/bootstrap/_navs.scss +5 -3
  34. data/vendor/assets/stylesheets/twbs/bootstrap/_normalize.scss +5 -3
  35. data/vendor/assets/stylesheets/twbs/bootstrap/_pager.scss +2 -3
  36. data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +1 -1
  37. data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +22 -4
  38. data/vendor/assets/stylesheets/twbs/bootstrap/_popovers.scss +5 -4
  39. data/vendor/assets/stylesheets/twbs/bootstrap/_print.scss +102 -96
  40. data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +2 -20
  41. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-embed.scss +2 -1
  42. data/vendor/assets/stylesheets/twbs/bootstrap/_scaffolding.scss +3 -3
  43. data/vendor/assets/stylesheets/twbs/bootstrap/_tables.scss +11 -10
  44. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +16 -14
  45. data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +2 -2
  46. data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +10 -16
  47. data/vendor/assets/stylesheets/twbs/bootstrap/_utilities.scss +3 -4
  48. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +29 -19
  49. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_buttons.scss +2 -0
  50. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_forms.scss +5 -1
  51. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid.scss +2 -2
  52. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_hide-text.scss +1 -1
  53. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_image.scss +0 -1
  54. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_labels.scss +1 -1
  55. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_progress-bar.scss +1 -1
  56. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_vendor-prefixes.scss +6 -3
  57. metadata +24 -30
@@ -10,7 +10,7 @@
10
10
  margin-bottom: 0;
11
11
  padding-left: 0; // Override default ul/ol
12
12
  list-style: none;
13
- @include clearfix();
13
+ @include clearfix;
14
14
 
15
15
  > li {
16
16
  position: relative;
@@ -36,7 +36,7 @@
36
36
  color: $nav-disabled-link-hover-color;
37
37
  text-decoration: none;
38
38
  background-color: transparent;
39
- cursor: not-allowed;
39
+ cursor: $cursor-disabled;
40
40
  }
41
41
  }
42
42
  }
@@ -57,7 +57,7 @@
57
57
  // we missed it. We don't currently support this anywhere, but in the interest
58
58
  // of maintaining backward compatibility in case you use it, it's deprecated.
59
59
  .nav-divider {
60
- @include nav-divider();
60
+ @include nav-divider;
61
61
  }
62
62
 
63
63
  // Prevent IE8 from misplacing imgs
@@ -223,9 +223,11 @@
223
223
  .tab-content {
224
224
  > .tab-pane {
225
225
  display: none;
226
+ visibility: hidden;
226
227
  }
227
228
  > .active {
228
229
  display: block;
230
+ visibility: visible;
229
231
  }
230
232
  }
231
233
 
@@ -1,4 +1,4 @@
1
- /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
1
+ /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
2
2
 
3
3
  //
4
4
  // 1. Set default font family to sans-serif.
@@ -25,7 +25,8 @@ body {
25
25
 
26
26
  //
27
27
  // Correct `block` display not defined for any HTML5 element in IE 8/9.
28
- // Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
28
+ // Correct `block` display not defined for `details` or `summary` in IE 10/11
29
+ // and Firefox.
29
30
  // Correct `block` display not defined for `main` in IE 11.
30
31
  //
31
32
 
@@ -38,6 +39,7 @@ footer,
38
39
  header,
39
40
  hgroup,
40
41
  main,
42
+ menu,
41
43
  nav,
42
44
  section,
43
45
  summary {
@@ -85,7 +87,7 @@ template {
85
87
  //
86
88
 
87
89
  a {
88
- background: transparent;
90
+ background-color: transparent;
89
91
  }
90
92
 
91
93
  //
@@ -8,7 +8,7 @@
8
8
  margin: $line-height-computed 0;
9
9
  list-style: none;
10
10
  text-align: center;
11
- @include clearfix();
11
+ @include clearfix;
12
12
  li {
13
13
  display: inline;
14
14
  > a,
@@ -48,8 +48,7 @@
48
48
  > span {
49
49
  color: $pager-disabled-color;
50
50
  background-color: $pager-bg;
51
- cursor: not-allowed;
51
+ cursor: $cursor-disabled;
52
52
  }
53
53
  }
54
-
55
54
  }
@@ -69,7 +69,7 @@
69
69
  color: $pagination-disabled-color;
70
70
  background-color: $pagination-disabled-bg;
71
71
  border-color: $pagination-disabled-border;
72
- cursor: not-allowed;
72
+ cursor: $cursor-disabled;
73
73
  }
74
74
  }
75
75
  }
@@ -15,7 +15,7 @@
15
15
  // Panel contents
16
16
  .panel-body {
17
17
  padding: $panel-body-padding;
18
- @include clearfix();
18
+ @include clearfix;
19
19
  }
20
20
 
21
21
  // Optional heading
@@ -56,7 +56,8 @@
56
56
  // any kind of custom content between the two.
57
57
 
58
58
  .panel {
59
- > .list-group {
59
+ > .list-group,
60
+ > .panel-collapse > .list-group {
60
61
  margin-bottom: 0;
61
62
 
62
63
  .list-group-item {
@@ -100,6 +101,11 @@
100
101
  > .table-responsive > .table,
101
102
  > .panel-collapse > .table {
102
103
  margin-bottom: 0;
104
+
105
+ caption {
106
+ padding-left: $panel-body-padding;
107
+ padding-right: $panel-body-padding;
108
+ }
103
109
  }
104
110
  // Add border top radius for first one
105
111
  > .table:first-child,
@@ -109,6 +115,9 @@
109
115
  > thead:first-child,
110
116
  > tbody:first-child {
111
117
  > tr:first-child {
118
+ border-top-left-radius: ($panel-border-radius - 1);
119
+ border-top-right-radius: ($panel-border-radius - 1);
120
+
112
121
  td:first-child,
113
122
  th:first-child {
114
123
  border-top-left-radius: ($panel-border-radius - 1);
@@ -128,6 +137,9 @@
128
137
  > tbody:last-child,
129
138
  > tfoot:last-child {
130
139
  > tr:last-child {
140
+ border-bottom-left-radius: ($panel-border-radius - 1);
141
+ border-bottom-right-radius: ($panel-border-radius - 1);
142
+
131
143
  td:first-child,
132
144
  th:first-child {
133
145
  border-bottom-left-radius: ($panel-border-radius - 1);
@@ -140,7 +152,9 @@
140
152
  }
141
153
  }
142
154
  > .panel-body + .table,
143
- > .panel-body + .table-responsive {
155
+ > .panel-body + .table-responsive,
156
+ > .table + .panel-body,
157
+ > .table-responsive + .panel-body {
144
158
  border-top: 1px solid $table-border-color;
145
159
  }
146
160
  > .table > tbody:first-child > tr:first-child th,
@@ -202,6 +216,7 @@
202
216
  .panel {
203
217
  margin-bottom: 0;
204
218
  border-radius: $panel-border-radius;
219
+
205
220
  + .panel {
206
221
  margin-top: 5px;
207
222
  }
@@ -209,10 +224,13 @@
209
224
 
210
225
  .panel-heading {
211
226
  border-bottom: 0;
212
- + .panel-collapse > .panel-body {
227
+
228
+ + .panel-collapse > .panel-body,
229
+ + .panel-collapse > .list-group {
213
230
  border-top: 1px solid $panel-inner-border;
214
231
  }
215
232
  }
233
+
216
234
  .panel-footer {
217
235
  border-top: 0;
218
236
  + .panel-collapse .panel-body {
@@ -11,7 +11,11 @@
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-size: $font-size-base;
16
+ font-weight: normal;
17
+ line-height: $line-height-base;
18
+ text-align: left;
15
19
  background-color: $popover-bg;
16
20
  background-clip: padding-box;
17
21
  border: 1px solid $popover-fallback-border-color;
@@ -33,8 +37,6 @@
33
37
  margin: 0; // reset heading margin
34
38
  padding: 8px 14px;
35
39
  font-size: $font-size-base;
36
- font-weight: normal;
37
- line-height: 18px;
38
40
  background-color: $popover-title-bg;
39
41
  border-bottom: 1px solid darken($popover-title-bg, 5%);
40
42
  border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
@@ -129,5 +131,4 @@
129
131
  bottom: -$popover-arrow-width;
130
132
  }
131
133
  }
132
-
133
134
  }
@@ -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
  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
34
33
  }
35
34
 
@@ -54,7 +53,7 @@
54
53
  // `.progress-bar`.
55
54
  .progress-striped .progress-bar,
56
55
  .progress-bar-striped {
57
- @include gradient-striped();
56
+ @include gradient-striped;
58
57
  background-size: 40px 40px;
59
58
  }
60
59
 
@@ -67,23 +66,6 @@
67
66
  @include 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,11 +52,11 @@ 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 {
59
- @include tab-focus();
59
+ @include tab-focus;
60
60
  }
61
61
  }
62
62
 
@@ -79,7 +79,7 @@ img {
79
79
 
80
80
  // Responsive images (ensure images don't scale beyond their parents)
81
81
  .img-responsive {
82
- @include img-responsive();
82
+ @include img-responsive;
83
83
  }
84
84
 
85
85
  // Rounded corners
@@ -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";
8
8
 
9
9
 
10
-
11
10
  //
12
11
  // Buttons
13
12
  // --------------------------------------------------
@@ -28,12 +27,16 @@
28
27
  &.active {
29
28
  @include 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
34
37
  @mixin btn-styles($btn-color: #555) {
35
38
  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
36
- @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
39
+ @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
37
40
  background-repeat: repeat-x;
38
41
  border-color: darken($btn-color, 14%);
39
42
 
@@ -74,7 +77,6 @@
74
77
  .btn-danger { @include 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
  // --------------------------------------------------
@@ -111,13 +111,14 @@
111
111
  // Default navbar
112
112
  .navbar-default {
113
113
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
114
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
114
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
115
115
  border-radius: $navbar-border-radius;
116
116
  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
117
117
  @include box-shadow($shadow);
118
118
 
119
+ .navbar-nav > .open > a,
119
120
  .navbar-nav > .active > a {
120
- @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
121
+ @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
121
122
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
122
123
  }
123
124
  }
@@ -129,10 +130,11 @@
129
130
  // Inverted navbar
130
131
  .navbar-inverse {
131
132
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
132
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
133
+ @include 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
- @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
137
+ @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
136
138
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
137
139
  }
138
140
 
@@ -150,7 +152,6 @@
150
152
  }
151
153
 
152
154
 
153
-
154
155
  //
155
156
  // Alerts
156
157
  // --------------------------------------------------
@@ -175,7 +176,6 @@
175
176
  .alert-danger { @include alert-styles($alert-danger-bg); }
176
177
 
177
178
 
178
-
179
179
  //
180
180
  // Progress bars
181
181
  // --------------------------------------------------
@@ -200,7 +200,7 @@
200
200
  // Reset the striped class because our mixins don't do multiple gradients and
201
201
  // the above custom styles override the new `.progress-bar-striped` in v3.2.0.
202
202
  .progress-bar-striped {
203
- @include gradient-striped();
203
+ @include gradient-striped;
204
204
  }
205
205
 
206
206
 
@@ -218,8 +218,11 @@
218
218
  text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
219
219
  @include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
220
220
  border-color: darken($list-group-active-border, 7.5%);
221
- }
222
221
 
222
+ .badge {
223
+ text-shadow: none;
224
+ }
225
+ }
223
226
 
224
227
 
225
228
  //
@@ -245,7 +248,6 @@
245
248
  .panel-danger > .panel-heading { @include panel-heading-styles($panel-danger-heading-bg); }
246
249
 
247
250
 
248
-
249
251
  //
250
252
  // Wells
251
253
  // --------------------------------------------------
@@ -12,11 +12,11 @@
12
12
  background-color: $thumbnail-bg;
13
13
  border: 1px solid $thumbnail-border;
14
14
  border-radius: $thumbnail-border-radius;
15
- @include transition(all .2s ease-in-out);
15
+ @include transition(border .2s ease-in-out);
16
16
 
17
17
  > img,
18
18
  a > img {
19
- @include img-responsive();
19
+ @include img-responsive;
20
20
  margin-left: auto;
21
21
  margin-right: auto;
22
22
  }