bootstrap-sass 3.3.7 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (103) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +4 -10
  3. data/CHANGELOG.md +5 -0
  4. data/Gemfile +1 -4
  5. data/README.md +26 -58
  6. data/Rakefile +10 -8
  7. data/assets/javascripts/bootstrap-sprockets.js +3 -3
  8. data/assets/javascripts/bootstrap.js +120 -89
  9. data/assets/javascripts/bootstrap.min.js +3 -4
  10. data/assets/javascripts/bootstrap/affix.js +7 -5
  11. data/assets/javascripts/bootstrap/alert.js +6 -5
  12. data/assets/javascripts/bootstrap/button.js +4 -4
  13. data/assets/javascripts/bootstrap/carousel.js +16 -7
  14. data/assets/javascripts/bootstrap/collapse.js +6 -6
  15. data/assets/javascripts/bootstrap/dropdown.js +5 -5
  16. data/assets/javascripts/bootstrap/modal.js +43 -24
  17. data/assets/javascripts/bootstrap/popover.js +6 -6
  18. data/assets/javascripts/bootstrap/scrollspy.js +4 -4
  19. data/assets/javascripts/bootstrap/tab.js +10 -10
  20. data/assets/javascripts/bootstrap/tooltip.js +6 -6
  21. data/assets/javascripts/bootstrap/transition.js +5 -5
  22. data/assets/stylesheets/_bootstrap.scss +2 -2
  23. data/assets/stylesheets/bootstrap/_alerts.scss +3 -3
  24. data/assets/stylesheets/bootstrap/_badges.scss +3 -3
  25. data/assets/stylesheets/bootstrap/_breadcrumbs.scss +2 -2
  26. data/assets/stylesheets/bootstrap/_button-groups.scss +5 -5
  27. data/assets/stylesheets/bootstrap/_buttons.scss +4 -4
  28. data/assets/stylesheets/bootstrap/_carousel.scss +26 -25
  29. data/assets/stylesheets/bootstrap/_close.scss +1 -0
  30. data/assets/stylesheets/bootstrap/_code.scss +3 -3
  31. data/assets/stylesheets/bootstrap/_component-animations.scss +1 -0
  32. data/assets/stylesheets/bootstrap/_dropdowns.scss +20 -23
  33. data/assets/stylesheets/bootstrap/_forms.scss +47 -57
  34. data/assets/stylesheets/bootstrap/_glyphicons.scss +9 -9
  35. data/assets/stylesheets/bootstrap/_grid.scss +10 -0
  36. data/assets/stylesheets/bootstrap/_input-groups.scss +2 -2
  37. data/assets/stylesheets/bootstrap/_jumbotron.scss +5 -5
  38. data/assets/stylesheets/bootstrap/_labels.scss +1 -1
  39. data/assets/stylesheets/bootstrap/_list-group.scss +30 -32
  40. data/assets/stylesheets/bootstrap/_media.scss +1 -1
  41. data/assets/stylesheets/bootstrap/_modals.scss +6 -6
  42. data/assets/stylesheets/bootstrap/_navbar.scss +75 -81
  43. data/assets/stylesheets/bootstrap/_navs.scss +4 -4
  44. data/assets/stylesheets/bootstrap/_normalize.scss +5 -2
  45. data/assets/stylesheets/bootstrap/_pager.scss +2 -2
  46. data/assets/stylesheets/bootstrap/_pagination.scss +12 -15
  47. data/assets/stylesheets/bootstrap/_panels.scss +4 -4
  48. data/assets/stylesheets/bootstrap/_popovers.scss +47 -52
  49. data/assets/stylesheets/bootstrap/_print.scss +90 -92
  50. data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
  51. data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -2
  52. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +3 -3
  53. data/assets/stylesheets/bootstrap/_scaffolding.scss +7 -7
  54. data/assets/stylesheets/bootstrap/_tables.scss +23 -23
  55. data/assets/stylesheets/bootstrap/_theme.scss +21 -17
  56. data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
  57. data/assets/stylesheets/bootstrap/_tooltip.scss +38 -27
  58. data/assets/stylesheets/bootstrap/_type.scss +10 -10
  59. data/assets/stylesheets/bootstrap/_variables.scss +6 -6
  60. data/assets/stylesheets/bootstrap/_wells.scss +2 -2
  61. data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
  62. data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
  63. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +6 -10
  64. data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
  65. data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
  66. data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
  67. data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
  68. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +1 -1
  69. data/assets/stylesheets/bootstrap/mixins/_grid.scss +7 -7
  70. data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
  71. data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
  72. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +4 -4
  73. data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
  74. data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +0 -4
  75. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +1 -1
  76. data/bootstrap-sass.gemspec +5 -4
  77. data/bower.json +1 -1
  78. data/composer.json +1 -1
  79. data/lib/bootstrap-sass.rb +13 -16
  80. data/lib/bootstrap-sass/version.rb +2 -2
  81. data/package-lock.json +1611 -0
  82. data/package.json +3 -3
  83. data/tasks/converter/less_conversion.rb +7 -8
  84. data/tasks/converter/network.rb +2 -2
  85. data/templates/project/_bootstrap-variables.sass +7 -7
  86. data/test/compilation_test.rb +24 -12
  87. data/test/dummy_rails/config/application.rb +1 -0
  88. data/test/dummy_rails/config/boot.rb +1 -1
  89. data/test/dummy_sass_only/Gemfile +1 -1
  90. data/test/dummy_sass_only/compile.rb +14 -7
  91. data/test/dummy_sass_only/import_all.scss +2 -0
  92. data/test/gemfiles/default.gemfile +3 -0
  93. data/test/node_sass_compile_test.sh +4 -3
  94. data/test/sass_test.rb +10 -7
  95. data/test/sprockets_rails_test.rb +12 -8
  96. data/test/test_helper.rb +2 -1
  97. metadata +33 -26
  98. data/test/compass_test.rb +0 -9
  99. data/test/dummy_sass_only/import_all.sass +0 -2
  100. data/test/gemfiles/rails_head.gemfile +0 -17
  101. data/test/gemfiles/sass_3_3.gemfile +0 -9
  102. data/test/gemfiles/sass_3_4.gemfile +0 -7
  103. data/test/gemfiles/sass_head.gemfile +0 -6
@@ -1,6 +1,6 @@
1
1
  /*!
2
- * Bootstrap v3.3.7 (http://getbootstrap.com)
3
- * Copyright 2011-2016 Twitter, Inc.
2
+ * Bootstrap v3.4.0 (https://getbootstrap.com/)
3
+ * Copyright 2011-2018 Twitter, Inc.
4
4
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
5
5
  */
6
6
 
@@ -23,14 +23,14 @@
23
23
  .btn-info,
24
24
  .btn-warning,
25
25
  .btn-danger {
26
- text-shadow: 0 -1px 0 rgba(0,0,0,.2);
27
- $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
26
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
27
+ $shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
28
28
  @include box-shadow($shadow);
29
29
 
30
30
  // Reset the shadow
31
31
  &:active,
32
32
  &.active {
33
- @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
33
+ @include box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125));
34
34
  }
35
35
 
36
36
  &.disabled,
@@ -88,7 +88,11 @@
88
88
  }
89
89
 
90
90
  // Apply the mixin to the buttons
91
- .btn-default { @include btn-styles($btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
91
+ .btn-default {
92
+ @include btn-styles($btn-default-bg);
93
+ text-shadow: 0 1px 0 #fff;
94
+ border-color: #ccc;
95
+ }
92
96
  .btn-primary { @include btn-styles($btn-primary-bg); }
93
97
  .btn-success { @include btn-styles($btn-success-bg); }
94
98
  .btn-info { @include btn-styles($btn-info-bg); }
@@ -102,7 +106,7 @@
102
106
 
103
107
  .thumbnail,
104
108
  .img-thumbnail {
105
- @include box-shadow(0 1px 2px rgba(0,0,0,.075));
109
+ @include box-shadow(0 1px 2px rgba(0, 0, 0, .075));
106
110
  }
107
111
 
108
112
 
@@ -132,18 +136,18 @@
132
136
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
133
137
  @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
134
138
  border-radius: $navbar-border-radius;
135
- $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
139
+ $shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
136
140
  @include box-shadow($shadow);
137
141
 
138
142
  .navbar-nav > .open > a,
139
143
  .navbar-nav > .active > a {
140
144
  @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
141
- @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
145
+ @include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075));
142
146
  }
143
147
  }
144
148
  .navbar-brand,
145
149
  .navbar-nav > li > a {
146
- text-shadow: 0 1px 0 rgba(255,255,255,.25);
150
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
147
151
  }
148
152
 
149
153
  // Inverted navbar
@@ -154,12 +158,12 @@
154
158
  .navbar-nav > .open > a,
155
159
  .navbar-nav > .active > a {
156
160
  @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
157
- @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
161
+ @include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .25));
158
162
  }
159
163
 
160
164
  .navbar-brand,
161
165
  .navbar-nav > li > a {
162
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
166
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
163
167
  }
164
168
  }
165
169
 
@@ -189,8 +193,8 @@
189
193
 
190
194
  // Common styles
191
195
  .alert {
192
- text-shadow: 0 1px 0 rgba(255,255,255,.2);
193
- $shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);
196
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
197
+ $shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
194
198
  @include box-shadow($shadow);
195
199
  }
196
200
 
@@ -241,7 +245,7 @@
241
245
 
242
246
  .list-group {
243
247
  border-radius: $border-radius-base;
244
- @include box-shadow(0 1px 2px rgba(0,0,0,.075));
248
+ @include box-shadow(0 1px 2px rgba(0, 0, 0, .075));
245
249
  }
246
250
  .list-group-item.active,
247
251
  .list-group-item.active:hover,
@@ -262,7 +266,7 @@
262
266
 
263
267
  // Common styles
264
268
  .panel {
265
- @include box-shadow(0 1px 2px rgba(0,0,0,.05));
269
+ @include box-shadow(0 1px 2px rgba(0, 0, 0, .05));
266
270
  }
267
271
 
268
272
  // Mixin for generating new styles
@@ -286,6 +290,6 @@
286
290
  .well {
287
291
  @include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg);
288
292
  border-color: darken($well-bg, 10%);
289
- $shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);
293
+ $shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
290
294
  @include box-shadow($shadow);
291
295
  }
@@ -17,8 +17,8 @@
17
17
  > img,
18
18
  a > img {
19
19
  @include img-responsive;
20
- margin-left: auto;
21
20
  margin-right: auto;
21
+ margin-left: auto;
22
22
  }
23
23
 
24
24
  // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
@@ -15,33 +15,25 @@
15
15
 
16
16
  @include opacity(0);
17
17
 
18
- &.in { @include opacity($tooltip-opacity); }
19
- &.top { margin-top: -3px; padding: $tooltip-arrow-width 0; }
20
- &.right { margin-left: 3px; padding: 0 $tooltip-arrow-width; }
21
- &.bottom { margin-top: 3px; padding: $tooltip-arrow-width 0; }
22
- &.left { margin-left: -3px; padding: 0 $tooltip-arrow-width; }
23
- }
24
-
25
- // Wrapper for the tooltip content
26
- .tooltip-inner {
27
- max-width: $tooltip-max-width;
28
- padding: 3px 8px;
29
- color: $tooltip-color;
30
- text-align: center;
31
- background-color: $tooltip-bg;
32
- border-radius: $border-radius-base;
33
- }
18
+ &.in { @include opacity($tooltip-opacity); }
19
+ &.top {
20
+ padding: $tooltip-arrow-width 0;
21
+ margin-top: -3px;
22
+ }
23
+ &.right {
24
+ padding: 0 $tooltip-arrow-width;
25
+ margin-left: 3px;
26
+ }
27
+ &.bottom {
28
+ padding: $tooltip-arrow-width 0;
29
+ margin-top: 3px;
30
+ }
31
+ &.left {
32
+ padding: 0 $tooltip-arrow-width;
33
+ margin-left: -3px;
34
+ }
34
35
 
35
- // Arrows
36
- .tooltip-arrow {
37
- position: absolute;
38
- width: 0;
39
- height: 0;
40
- border-color: transparent;
41
- border-style: solid;
42
- }
43
- // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
44
- .tooltip {
36
+ // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
45
37
  &.top .tooltip-arrow {
46
38
  bottom: 0;
47
39
  left: 50%;
@@ -50,8 +42,8 @@
50
42
  border-top-color: $tooltip-arrow-color;
51
43
  }
52
44
  &.top-left .tooltip-arrow {
53
- bottom: 0;
54
45
  right: $tooltip-arrow-width;
46
+ bottom: 0;
55
47
  margin-bottom: -$tooltip-arrow-width;
56
48
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
57
49
  border-top-color: $tooltip-arrow-color;
@@ -99,3 +91,22 @@
99
91
  border-bottom-color: $tooltip-arrow-color;
100
92
  }
101
93
  }
94
+
95
+ // Wrapper for the tooltip content
96
+ .tooltip-inner {
97
+ max-width: $tooltip-max-width;
98
+ padding: 3px 8px;
99
+ color: $tooltip-color;
100
+ text-align: center;
101
+ background-color: $tooltip-bg;
102
+ border-radius: $border-radius-base;
103
+ }
104
+
105
+ // Arrows
106
+ .tooltip-arrow {
107
+ position: absolute;
108
+ width: 0;
109
+ height: 0;
110
+ border-color: transparent;
111
+ border-style: solid;
112
+ }
@@ -15,7 +15,7 @@ h1, h2, h3, h4, h5, h6,
15
15
 
16
16
  small,
17
17
  .small {
18
- font-weight: normal;
18
+ font-weight: 400;
19
19
  line-height: 1;
20
20
  color: $headings-small-color;
21
21
  }
@@ -82,8 +82,8 @@ small,
82
82
 
83
83
  mark,
84
84
  .mark {
85
- background-color: $state-warning-bg;
86
85
  padding: .2em;
86
+ background-color: $state-warning-bg;
87
87
  }
88
88
 
89
89
  // Alignment
@@ -176,8 +176,8 @@ ol {
176
176
 
177
177
  > li {
178
178
  display: inline-block;
179
- padding-left: 5px;
180
179
  padding-right: 5px;
180
+ padding-left: 5px;
181
181
  }
182
182
  }
183
183
 
@@ -191,7 +191,7 @@ dd {
191
191
  line-height: $line-height-base;
192
192
  }
193
193
  dt {
194
- font-weight: bold;
194
+ font-weight: 700;
195
195
  }
196
196
  dd {
197
197
  margin-left: 0; // Undo browser default
@@ -226,12 +226,12 @@ dd {
226
226
  // -------------------------
227
227
 
228
228
  // Abbreviations and acronyms
229
- abbr[title],
230
229
  // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
230
+ abbr[title],
231
231
  abbr[data-original-title] {
232
232
  cursor: help;
233
- border-bottom: 1px dotted $abbr-border-color;
234
233
  }
234
+
235
235
  .initialism {
236
236
  font-size: 90%;
237
237
  @extend .text-uppercase;
@@ -263,7 +263,7 @@ blockquote {
263
263
  color: $blockquote-small-color;
264
264
 
265
265
  &:before {
266
- content: '\2014 \00A0'; // em dash, nbsp
266
+ content: "\2014 \00A0"; // em dash, nbsp
267
267
  }
268
268
  }
269
269
  }
@@ -275,17 +275,17 @@ blockquote {
275
275
  blockquote.pull-right {
276
276
  padding-right: 15px;
277
277
  padding-left: 0;
278
+ text-align: right;
278
279
  border-right: 5px solid $blockquote-border-color;
279
280
  border-left: 0;
280
- text-align: right;
281
281
 
282
282
  // Account for citation
283
283
  footer,
284
284
  small,
285
285
  .small {
286
- &:before { content: ''; }
286
+ &:before { content: ""; }
287
287
  &:after {
288
- content: '\00A0 \2014'; // nbsp, em dash
288
+ content: "\00A0 \2014"; // nbsp, em dash
289
289
  }
290
290
  }
291
291
  }
@@ -51,14 +51,14 @@ $font-family-base: $font-family-sans-serif !default;
51
51
 
52
52
  $font-size-base: 14px !default;
53
53
  $font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
54
- $font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
54
+ $font-size-small: ceil(($font-size-base * .85)) !default; // ~12px
55
55
 
56
56
  $font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
57
57
  $font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
58
58
  $font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
59
59
  $font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
60
60
  $font-size-h5: $font-size-base !default;
61
- $font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
61
+ $font-size-h6: ceil(($font-size-base * .85)) !default; // ~12px
62
62
 
63
63
  //** Unit-less `line-height` for use in components like buttons.
64
64
  $line-height-base: 1.428571429 !default; // 20/14
@@ -239,7 +239,7 @@ $cursor-disabled: not-allowed !default;
239
239
  //** Background for the dropdown menu.
240
240
  $dropdown-bg: #fff !default;
241
241
  //** Dropdown menu `border-color`.
242
- $dropdown-border: rgba(0,0,0,.15) !default;
242
+ $dropdown-border: rgba(0, 0, 0, .15) !default;
243
243
  //** Dropdown menu `border-color` **for IE8**.
244
244
  $dropdown-fallback-border: #ccc !default;
245
245
  //** Divider color for between dropdown items.
@@ -545,7 +545,7 @@ $popover-bg: #fff !default;
545
545
  //** Popover maximum width
546
546
  $popover-max-width: 276px !default;
547
547
  //** Popover border color
548
- $popover-border-color: rgba(0,0,0,.2) !default;
548
+ $popover-border-color: rgba(0, 0, 0, .2) !default;
549
549
  //** Popover fallback border color
550
550
  $popover-fallback-border-color: #ccc !default;
551
551
 
@@ -603,7 +603,7 @@ $modal-title-line-height: $line-height-base !default;
603
603
  //** Background color of modal content area
604
604
  $modal-content-bg: #fff !default;
605
605
  //** Modal content border color
606
- $modal-content-border-color: rgba(0,0,0,.2) !default;
606
+ $modal-content-border-color: rgba(0, 0, 0, .2) !default;
607
607
  //** Modal content border color **for IE8**
608
608
  $modal-content-fallback-border-color: #999 !default;
609
609
 
@@ -808,7 +808,7 @@ $breadcrumb-separator: "/" !default;
808
808
  //
809
809
  //##
810
810
 
811
- $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;
811
+ $carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, .6) !default;
812
812
 
813
813
  $carousel-control-color: #fff !default;
814
814
  $carousel-control-width: 15% !default;
@@ -11,10 +11,10 @@
11
11
  background-color: $well-bg;
12
12
  border: 1px solid $well-border;
13
13
  border-radius: $border-radius-base;
14
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
14
+ @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05));
15
15
  blockquote {
16
16
  border-color: #ddd;
17
- border-color: rgba(0,0,0,.15);
17
+ border-color: rgba(0, 0, 0, .15);
18
18
  }
19
19
  }
20
20
 
@@ -1,13 +1,14 @@
1
1
  // Alerts
2
2
 
3
3
  @mixin alert-variant($background, $border, $text-color) {
4
+ color: $text-color;
4
5
  background-color: $background;
5
6
  border-color: $border;
6
- color: $text-color;
7
7
 
8
8
  hr {
9
9
  border-top-color: darken($border, 5%);
10
10
  }
11
+
11
12
  .alert-link {
12
13
  color: darken($text-color, 10%);
13
14
  }
@@ -1,18 +1,18 @@
1
1
  // Single side border-radius
2
2
 
3
3
  @mixin border-top-radius($radius) {
4
+ border-top-left-radius: $radius;
4
5
  border-top-right-radius: $radius;
5
- border-top-left-radius: $radius;
6
6
  }
7
7
  @mixin border-right-radius($radius) {
8
+ border-top-right-radius: $radius;
8
9
  border-bottom-right-radius: $radius;
9
- border-top-right-radius: $radius;
10
10
  }
11
11
  @mixin border-bottom-radius($radius) {
12
12
  border-bottom-right-radius: $radius;
13
- border-bottom-left-radius: $radius;
13
+ border-bottom-left-radius: $radius;
14
14
  }
15
15
  @mixin border-left-radius($radius) {
16
+ border-top-left-radius: $radius;
16
17
  border-bottom-left-radius: $radius;
17
- border-top-left-radius: $radius;
18
18
  }
@@ -12,33 +12,29 @@
12
12
  &.focus {
13
13
  color: $color;
14
14
  background-color: darken($background, 10%);
15
- border-color: darken($border, 25%);
15
+ border-color: darken($border, 25%);
16
16
  }
17
17
  &:hover {
18
18
  color: $color;
19
19
  background-color: darken($background, 10%);
20
- border-color: darken($border, 12%);
20
+ border-color: darken($border, 12%);
21
21
  }
22
22
  &:active,
23
23
  &.active,
24
24
  .open > &.dropdown-toggle {
25
25
  color: $color;
26
26
  background-color: darken($background, 10%);
27
- border-color: darken($border, 12%);
27
+ background-image: none;
28
+ border-color: darken($border, 12%);
28
29
 
29
30
  &:hover,
30
31
  &:focus,
31
32
  &.focus {
32
33
  color: $color;
33
34
  background-color: darken($background, 17%);
34
- border-color: darken($border, 25%);
35
+ border-color: darken($border, 25%);
35
36
  }
36
37
  }
37
- &:active,
38
- &.active,
39
- .open > &.dropdown-toggle {
40
- background-image: none;
41
- }
42
38
  &.disabled,
43
39
  &[disabled],
44
40
  fieldset[disabled] & {
@@ -46,7 +42,7 @@
46
42
  &:focus,
47
43
  &.focus {
48
44
  background-color: $background;
49
- border-color: $border;
45
+ border-color: $border;
50
46
  }
51
47
  }
52
48
 
@@ -2,6 +2,6 @@
2
2
 
3
3
  @mixin center-block() {
4
4
  display: block;
5
- margin-left: auto;
6
5
  margin-right: auto;
6
+ margin-left: auto;
7
7
  }