twbs_sass_rails 3.4.0 → 3.5.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 (53) hide show
  1. checksums.yaml +4 -4
  2. data/Appraisals +2 -2
  3. data/CHANGELOG.md +5 -0
  4. data/gemfiles/rails_4.1.gemfile +1 -1
  5. data/gemfiles/rails_4.2.gemfile +1 -1
  6. data/lib/twbs_sass_rails/version.rb +1 -1
  7. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +3 -3
  8. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +2 -2
  9. data/vendor/assets/javascripts/twbs/bootstrap/button.js +13 -9
  10. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +2 -2
  11. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +2 -2
  12. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +46 -42
  13. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +5 -7
  14. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +2 -2
  15. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +2 -2
  16. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +5 -3
  17. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +58 -20
  18. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +1 -1
  19. data/vendor/assets/javascripts/twbs/bootstrap.js +2 -2
  20. data/vendor/assets/stylesheets/twbs/_bootstrap.scss +6 -0
  21. data/vendor/assets/stylesheets/twbs/bootstrap/_badges.scss +1 -1
  22. data/vendor/assets/stylesheets/twbs/bootstrap/_button-groups.scss +3 -2
  23. data/vendor/assets/stylesheets/twbs/bootstrap/_buttons.scss +13 -5
  24. data/vendor/assets/stylesheets/twbs/bootstrap/_carousel.scss +2 -2
  25. data/vendor/assets/stylesheets/twbs/bootstrap/_dropdowns.scss +3 -1
  26. data/vendor/assets/stylesheets/twbs/bootstrap/_forms.scss +46 -13
  27. data/vendor/assets/stylesheets/twbs/bootstrap/_glyphicons.scss +11 -9
  28. data/vendor/assets/stylesheets/twbs/bootstrap/_input-groups.scss +1 -0
  29. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +5 -3
  30. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +9 -3
  31. data/vendor/assets/stylesheets/twbs/bootstrap/_media.scss +5 -0
  32. data/vendor/assets/stylesheets/twbs/bootstrap/_mixins.scss +1 -0
  33. data/vendor/assets/stylesheets/twbs/bootstrap/_normalize.scss +8 -11
  34. data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +3 -2
  35. data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +6 -0
  36. data/vendor/assets/stylesheets/twbs/bootstrap/_popovers.scss +4 -8
  37. data/vendor/assets/stylesheets/twbs/bootstrap/_print.scss +0 -6
  38. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-utilities.scss +4 -2
  39. data/vendor/assets/stylesheets/twbs/bootstrap/_scaffolding.scss +1 -2
  40. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +23 -5
  41. data/vendor/assets/stylesheets/twbs/bootstrap/_tooltip.scss +4 -5
  42. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +7 -1
  43. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_background-variant.scss +2 -1
  44. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_buttons.scss +18 -2
  45. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid-framework.scss +2 -2
  46. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid.scss +2 -2
  47. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_hide-text.scss +1 -1
  48. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_list-group.scss +3 -2
  49. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_pagination.scss +2 -1
  50. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_reset-text.scss +18 -0
  51. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_responsive-visibility.scss +1 -1
  52. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_text-emphasis.scss +2 -1
  53. metadata +3 -2
@@ -36,6 +36,7 @@
36
36
  margin-left: -5px; // Offset the first child's margin
37
37
  @include clearfix;
38
38
 
39
+ .btn,
39
40
  .btn-group,
40
41
  .input-group {
41
42
  float: left;
@@ -172,11 +173,11 @@
172
173
  border-radius: 0;
173
174
  }
174
175
  &:first-child:not(:last-child) {
175
- border-top-right-radius: $border-radius-base;
176
+ border-top-right-radius: $btn-border-radius-base;
176
177
  @include border-bottom-radius(0);
177
178
  }
178
179
  &:last-child:not(:first-child) {
179
- border-bottom-left-radius: $border-radius-base;
180
+ border-bottom-left-radius: $btn-border-radius-base;
180
181
  @include border-top-radius(0);
181
182
  }
182
183
  }
@@ -17,7 +17,7 @@
17
17
  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
18
18
  border: 1px solid transparent;
19
19
  white-space: nowrap;
20
- @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
20
+ @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
21
21
  @include user-select(none);
22
22
 
23
23
  &,
@@ -47,10 +47,18 @@
47
47
  &[disabled],
48
48
  fieldset[disabled] & {
49
49
  cursor: $cursor-disabled;
50
- pointer-events: none; // Future-proof disabling of clicks
51
50
  @include opacity(.65);
52
51
  @include box-shadow(none);
53
52
  }
53
+
54
+ // [converter] extracted a& to a.btn
55
+ }
56
+
57
+ a.btn {
58
+ &.disabled,
59
+ fieldset[disabled] & {
60
+ pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
61
+ }
54
62
  }
55
63
 
56
64
 
@@ -126,14 +134,14 @@
126
134
 
127
135
  .btn-lg {
128
136
  // line-height: ensure even-numbered height of button next to large input
129
- @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
137
+ @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large);
130
138
  }
131
139
  .btn-sm {
132
140
  // line-height: ensure proper height of button next to small input
133
- @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
141
+ @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small);
134
142
  }
135
143
  .btn-xs {
136
- @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
144
+ @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small);
137
145
  }
138
146
 
139
147
 
@@ -29,7 +29,7 @@
29
29
  @media all and (transform-3d), (-webkit-transform-3d) {
30
30
  @include transition-transform(0.6s ease-in-out);
31
31
  @include backface-visibility(hidden);
32
- @include perspective(1000);
32
+ @include perspective(1000px);
33
33
 
34
34
  &.next,
35
35
  &.active.right {
@@ -130,6 +130,7 @@
130
130
  .glyphicon-chevron-right {
131
131
  position: absolute;
132
132
  top: 50%;
133
+ margin-top: -10px;
133
134
  z-index: 5;
134
135
  display: inline-block;
135
136
  }
@@ -147,7 +148,6 @@
147
148
  .icon-next {
148
149
  width: 20px;
149
150
  height: 20px;
150
- margin-top: -10px;
151
151
  line-height: 1;
152
152
  font-family: serif;
153
153
  }
@@ -11,6 +11,7 @@
11
11
  margin-left: 2px;
12
12
  vertical-align: middle;
13
13
  border-top: $caret-width-base dashed;
14
+ border-top: $caret-width-base solid \9; // IE8
14
15
  border-right: $caret-width-base solid transparent;
15
16
  border-left: $caret-width-base solid transparent;
16
17
  }
@@ -184,7 +185,8 @@
184
185
  // Reverse the caret
185
186
  .caret {
186
187
  border-top: 0;
187
- border-bottom: $caret-width-base solid;
188
+ border-bottom: $caret-width-base dashed;
189
+ border-bottom: $caret-width-base solid \9; // IE8
188
190
  content: "";
189
191
  }
190
192
  // Different positioning for bottom up menu
@@ -56,7 +56,6 @@ input[type="checkbox"] {
56
56
  line-height: normal;
57
57
  }
58
58
 
59
- // Set the height of file controls to match text inputs
60
59
  input[type="file"] {
61
60
  display: block;
62
61
  }
@@ -177,13 +176,17 @@ input[type="search"] {
177
176
  // text within the input to become vertically misaligned. As a workaround, we
178
177
  // set a pixel line-height that matches the given height of the input, but only
179
178
  // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
179
+ //
180
+ // Note that as of 8.3, iOS doesn't support `datetime` or `week`.
180
181
 
181
182
  @media screen and (-webkit-min-device-pixel-ratio: 0) {
182
183
  input[type="date"],
183
184
  input[type="time"],
184
185
  input[type="datetime-local"],
185
186
  input[type="month"] {
186
- line-height: $input-height-base;
187
+ &.form-control {
188
+ line-height: $input-height-base;
189
+ }
187
190
 
188
191
  &.input-sm,
189
192
  .input-group-sm & {
@@ -321,29 +324,53 @@ input[type="checkbox"] {
321
324
 
322
325
  @include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
323
326
  .form-group-sm {
324
-
325
- @include input-size('.form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
326
-
327
- .form-control-static {
327
+ .form-control {
328
328
  height: $input-height-small;
329
329
  padding: $padding-small-vertical $padding-small-horizontal;
330
330
  font-size: $font-size-small;
331
331
  line-height: $line-height-small;
332
+ border-radius: $input-border-radius-small;
333
+ }
334
+ select.form-control {
335
+ height: $input-height-small;
336
+ line-height: $input-height-small;
337
+ }
338
+ textarea.form-control,
339
+ select[multiple].form-control {
340
+ height: auto;
341
+ }
342
+ .form-control-static {
343
+ height: $input-height-small;
332
344
  min-height: ($line-height-computed + $font-size-small);
345
+ padding: ($padding-small-vertical + 1) $padding-small-horizontal;
346
+ font-size: $font-size-small;
347
+ line-height: $line-height-small;
333
348
  }
334
349
  }
335
350
 
336
351
  @include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
337
352
  .form-group-lg {
338
-
339
- @include input-size('.form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
340
-
341
- .form-control-static {
353
+ .form-control {
342
354
  height: $input-height-large;
343
355
  padding: $padding-large-vertical $padding-large-horizontal;
344
356
  font-size: $font-size-large;
345
357
  line-height: $line-height-large;
358
+ border-radius: $input-border-radius-large;
359
+ }
360
+ select.form-control {
361
+ height: $input-height-large;
362
+ line-height: $input-height-large;
363
+ }
364
+ textarea.form-control,
365
+ select[multiple].form-control {
366
+ height: auto;
367
+ }
368
+ .form-control-static {
369
+ height: $input-height-large;
346
370
  min-height: ($line-height-computed + $font-size-large);
371
+ padding: ($padding-large-vertical + 1) $padding-large-horizontal;
372
+ font-size: $font-size-large;
373
+ line-height: $line-height-large;
347
374
  }
348
375
  }
349
376
 
@@ -374,12 +401,16 @@ input[type="checkbox"] {
374
401
  text-align: center;
375
402
  pointer-events: none;
376
403
  }
377
- .input-lg + .form-control-feedback {
404
+ .input-lg + .form-control-feedback,
405
+ .input-group-lg + .form-control-feedback,
406
+ .form-group-lg .form-control + .form-control-feedback {
378
407
  width: $input-height-large;
379
408
  height: $input-height-large;
380
409
  line-height: $input-height-large;
381
410
  }
382
- .input-sm + .form-control-feedback {
411
+ .input-sm + .form-control-feedback,
412
+ .input-group-sm + .form-control-feedback,
413
+ .form-group-sm .form-control + .form-control-feedback {
383
414
  width: $input-height-small;
384
415
  height: $input-height-small;
385
416
  line-height: $input-height-small;
@@ -554,7 +585,7 @@ input[type="checkbox"] {
554
585
  // Reposition the icon because it's now within a grid column and columns have
555
586
  // `position: relative;` on them. Also accounts for the grid gutter padding.
556
587
  .has-feedback .form-control-feedback {
557
- right: ($grid-gutter-width / 2);
588
+ right: floor(($grid-gutter-width / 2));
558
589
  }
559
590
 
560
591
  // Form group sizes
@@ -565,6 +596,7 @@ input[type="checkbox"] {
565
596
  @media (min-width: $screen-sm-min) {
566
597
  .control-label {
567
598
  padding-top: (($padding-large-vertical * $line-height-large) + 1);
599
+ font-size: $font-size-large;
568
600
  }
569
601
  }
570
602
  }
@@ -572,6 +604,7 @@ input[type="checkbox"] {
572
604
  @media (min-width: $screen-sm-min) {
573
605
  .control-label {
574
606
  padding-top: ($padding-small-vertical + 1);
607
+ font-size: $font-size-small;
575
608
  }
576
609
  }
577
610
  }
@@ -7,15 +7,17 @@
7
7
  //
8
8
  // <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
9
9
 
10
- // Import the fonts
11
- @font-face {
12
- font-family: 'Glyphicons Halflings';
13
- src: font-url('#{$icon-font-name}.eot');
14
- src: font-url('#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
15
- font-url('#{$icon-font-name}.woff2') format('woff2'),
16
- font-url('#{$icon-font-name}.woff') format('woff'),
17
- font-url('#{$icon-font-name}.ttf') format('truetype'),
18
- font-url('#{$icon-font-name}.svg##{$icon-font-svg-id}') format('svg');
10
+ @at-root {
11
+ // Import the fonts
12
+ @font-face {
13
+ font-family: 'Glyphicons Halflings';
14
+ src: font-url('#{$icon-font-name}.eot');
15
+ src: font-url('#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
16
+ font-url('#{$icon-font-name}.woff2') format('woff2'),
17
+ font-url('#{$icon-font-name}.woff') format('woff'),
18
+ font-url('#{$icon-font-name}.ttf') format('truetype'),
19
+ font-url('#{$icon-font-name}.svg##{$icon-font-svg-id}') format('svg');
20
+ }
19
21
  }
20
22
 
21
23
  // Catchall baseclass
@@ -160,6 +160,7 @@
160
160
  &:last-child {
161
161
  > .btn,
162
162
  > .btn-group {
163
+ z-index: 2;
163
164
  margin-left: -1px;
164
165
  }
165
166
  }
@@ -4,7 +4,8 @@
4
4
 
5
5
 
6
6
  .jumbotron {
7
- padding: $jumbotron-padding ($jumbotron-padding / 2);
7
+ padding-top: $jumbotron-padding;
8
+ padding-bottom: $jumbotron-padding;
8
9
  margin-bottom: $jumbotron-padding;
9
10
  color: $jumbotron-color;
10
11
  background-color: $jumbotron-bg;
@@ -34,7 +35,8 @@
34
35
  }
35
36
 
36
37
  @media screen and (min-width: $screen-sm-min) {
37
- padding: ($jumbotron-padding * 1.6) 0;
38
+ padding-top: ($jumbotron-padding * 1.6);
39
+ padding-bottom: ($jumbotron-padding * 1.6);
38
40
 
39
41
  .container &,
40
42
  .container-fluid & {
@@ -44,7 +46,7 @@
44
46
 
45
47
  h1,
46
48
  .h1 {
47
- font-size: ($font-size-base * 4.5);
49
+ font-size: $jumbotron-heading-font-size;
48
50
  }
49
51
  }
50
52
  }
@@ -38,12 +38,13 @@
38
38
  }
39
39
 
40
40
 
41
- // Linked list items
41
+ // Interactive list items
42
42
  //
43
- // Use anchor elements instead of `li`s or `div`s to create linked list items.
43
+ // Use anchor or button elements instead of `li`s or `div`s to create interactive items.
44
44
  // Includes an extra `.active` modifier class for showing selected items.
45
45
 
46
- a.list-group-item {
46
+ a.list-group-item,
47
+ button.list-group-item {
47
48
  color: $list-group-link-color;
48
49
 
49
50
  .list-group-item-heading {
@@ -59,6 +60,11 @@ a.list-group-item {
59
60
  }
60
61
  }
61
62
 
63
+ button.list-group-item {
64
+ width: 100%;
65
+ text-align: left;
66
+ }
67
+
62
68
  .list-group-item {
63
69
  // Disabled state
64
70
  &.disabled,
@@ -19,6 +19,11 @@
19
19
 
20
20
  .media-object {
21
21
  display: block;
22
+
23
+ // Fix collapse in webkit from max-width: 100% and display: table-cell.
24
+ &.img-thumbnail {
25
+ max-width: none;
26
+ }
22
27
  }
23
28
 
24
29
  .media-right,
@@ -11,6 +11,7 @@
11
11
  @import "mixins/responsive-visibility";
12
12
  @import "mixins/size";
13
13
  @import "mixins/tab-focus";
14
+ @import "mixins/reset-text";
14
15
  @import "mixins/text-emphasis";
15
16
  @import "mixins/text-overflow";
16
17
  @import "mixins/vendor-prefixes";
@@ -1,9 +1,9 @@
1
- /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
1
+ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
2
2
 
3
3
  //
4
4
  // 1. Set default font family to sans-serif.
5
- // 2. Prevent iOS text size adjust after orientation change, without disabling
6
- // user zoom.
5
+ // 2. Prevent iOS and IE text size adjust after device orientation change,
6
+ // without disabling user zoom.
7
7
  //
8
8
 
9
9
  html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
71
71
 
72
72
  //
73
73
  // Address `[hidden]` styling not present in IE 8/9/10.
74
- // Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
74
+ // Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
75
75
  //
76
76
 
77
77
  [hidden],
@@ -91,7 +91,8 @@ a {
91
91
  }
92
92
 
93
93
  //
94
- // Improve readability when focused and also mouse hovered in all browsers.
94
+ // Improve readability of focused elements when they are also in an
95
+ // active/hover state.
95
96
  //
96
97
 
97
98
  a:active,
@@ -209,7 +210,6 @@ figure {
209
210
  //
210
211
 
211
212
  hr {
212
- -moz-box-sizing: content-box;
213
213
  box-sizing: content-box;
214
214
  height: 0;
215
215
  }
@@ -350,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {
350
350
 
351
351
  //
352
352
  // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
353
- // 2. Address `box-sizing` set to `border-box` in Safari and Chrome
354
- // (include `-moz` to future-proof).
353
+ // 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
355
354
  //
356
355
 
357
356
  input[type="search"] {
358
357
  -webkit-appearance: textfield; // 1
359
- -moz-box-sizing: content-box;
360
- -webkit-box-sizing: content-box; // 2
361
- box-sizing: content-box;
358
+ box-sizing: content-box; //2
362
359
  }
363
360
 
364
361
  //
@@ -40,6 +40,7 @@
40
40
  > li > span {
41
41
  &:hover,
42
42
  &:focus {
43
+ z-index: 3;
43
44
  color: $pagination-hover-color;
44
45
  background-color: $pagination-hover-bg;
45
46
  border-color: $pagination-hover-border;
@@ -79,10 +80,10 @@
79
80
 
80
81
  // Large
81
82
  .pagination-lg {
82
- @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large);
83
+ @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
83
84
  }
84
85
 
85
86
  // Small
86
87
  .pagination-sm {
87
- @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small);
88
+ @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
88
89
  }
@@ -76,6 +76,7 @@
76
76
  @include border-top-radius(($panel-border-radius - 1));
77
77
  }
78
78
  }
79
+
79
80
  // Add border bottom radius for last one
80
81
  &:last-child {
81
82
  .list-group-item:last-child {
@@ -84,6 +85,11 @@
84
85
  }
85
86
  }
86
87
  }
88
+ > .panel-heading + .panel-collapse > .list-group {
89
+ .list-group-item:first-child {
90
+ @include border-top-radius(0);
91
+ }
92
+ }
87
93
  }
88
94
  // Collapse space between when there's no additional content.
89
95
  .panel-heading + .list-group {
@@ -11,12 +11,11 @@
11
11
  display: none;
12
12
  max-width: $popover-max-width;
13
13
  padding: 1px;
14
- // Reset font and text properties given new insertion method
15
- font-family: $font-family-base;
14
+ // Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
15
+ // So reset our font and text properties to avoid inheriting weird values.
16
+ @include reset-text;
16
17
  font-size: $font-size-base;
17
- font-weight: normal;
18
- line-height: $line-height-base;
19
- text-align: left;
18
+
20
19
  background-color: $popover-bg;
21
20
  background-clip: padding-box;
22
21
  border: 1px solid $popover-fallback-border-color;
@@ -24,9 +23,6 @@
24
23
  border-radius: $border-radius-large;
25
24
  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
26
25
 
27
- // Overrides for proper insertion
28
- white-space: normal;
29
-
30
26
  // Offset the popover to account for the popover arrow
31
27
  &.top { margin-top: -$popover-arrow-width; }
32
28
  &.right { margin-left: $popover-arrow-width; }
@@ -67,12 +67,6 @@
67
67
  }
68
68
 
69
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
70
 
77
71
  // Bootstrap components
78
72
  .navbar {
@@ -18,8 +18,10 @@
18
18
  // Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
19
19
  // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
20
20
 
21
- @-ms-viewport {
22
- width: device-width;
21
+ @at-root {
22
+ @-ms-viewport {
23
+ width: device-width;
24
+ }
23
25
  }
24
26
 
25
27
 
@@ -155,8 +155,7 @@ hr {
155
155
  // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
156
156
  // for traditionally non-focusable elements with role="button"
157
157
  // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
158
- // Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged
159
158
 
160
159
  [role="button"] {
161
160
  cursor: pointer;
162
- }
161
+ }
@@ -1,3 +1,8 @@
1
+ /*!
2
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
3
+ * Copyright 2011-2015 Twitter, Inc.
4
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
5
+ */
1
6
 
2
7
  //
3
8
  // Load core variables and mixins
@@ -28,6 +33,12 @@
28
33
  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
29
34
  }
30
35
 
36
+ &.disabled,
37
+ &[disabled],
38
+ fieldset[disabled] & {
39
+ @include box-shadow(none);
40
+ }
41
+
31
42
  .badge {
32
43
  text-shadow: none;
33
44
  }
@@ -53,10 +64,17 @@
53
64
  }
54
65
 
55
66
  &.disabled,
56
- &:disabled,
57
- &[disabled] {
58
- background-color: darken($btn-color, 12%);
59
- background-image: none;
67
+ &[disabled],
68
+ fieldset[disabled] & {
69
+ &,
70
+ &:hover,
71
+ &:focus,
72
+ &.focus,
73
+ &:active,
74
+ &.active {
75
+ background-color: darken($btn-color, 12%);
76
+ background-image: none;
77
+ }
60
78
  }
61
79
  }
62
80
 
@@ -132,7 +150,7 @@
132
150
  .navbar-inverse {
133
151
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
134
152
  @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
135
-
153
+ border-radius: $navbar-border-radius;
136
154
  .navbar-nav > .open > a,
137
155
  .navbar-nav > .active > a {
138
156
  @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
@@ -8,11 +8,11 @@
8
8
  position: absolute;
9
9
  z-index: $zindex-tooltip;
10
10
  display: block;
11
- // Reset font and text properties given new insertion method
12
- font-family: $font-family-base;
11
+ // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
12
+ // So reset our font and text properties to avoid inheriting weird values.
13
+ @include reset-text;
13
14
  font-size: $font-size-small;
14
- font-weight: normal;
15
- line-height: 1.4;
15
+
16
16
  @include opacity(0);
17
17
 
18
18
  &.in { @include opacity($tooltip-opacity); }
@@ -28,7 +28,6 @@
28
28
  padding: 3px 8px;
29
29
  color: $tooltip-color;
30
30
  text-align: center;
31
- text-decoration: none;
32
31
  background-color: $tooltip-bg;
33
32
  border-radius: $border-radius-base;
34
33
  }
@@ -175,6 +175,11 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
175
175
 
176
176
  $btn-link-disabled-color: $gray-light !default;
177
177
 
178
+ // Allows for customizing button radius independently from global border radius
179
+ $btn-border-radius-base: $border-radius-base !default;
180
+ $btn-border-radius-large: $border-radius-large !default;
181
+ $btn-border-radius-small: $border-radius-small !default;
182
+
178
183
 
179
184
  //== Forms
180
185
  //
@@ -388,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg: #888 !default;
388
393
  $navbar-default-toggle-border-color: #ddd !default;
389
394
 
390
395
 
391
- // Inverted navbar
396
+ //=== Inverted navbar
392
397
  // Reset inverted navbar basics
393
398
  $navbar-inverse-color: lighten($gray-light, 15%) !default;
394
399
  $navbar-inverse-bg: #222 !default;
@@ -489,6 +494,7 @@ $jumbotron-color: inherit !default;
489
494
  $jumbotron-bg: $gray-lighter !default;
490
495
  $jumbotron-heading-color: inherit !default;
491
496
  $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
497
+ $jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;
492
498
 
493
499
 
494
500
  //== Form states and alerts
@@ -5,7 +5,8 @@
5
5
  #{$parent} {
6
6
  background-color: $color;
7
7
  }
8
- a#{$parent}:hover {
8
+ a#{$parent}:hover,
9
+ a#{$parent}:focus {
9
10
  background-color: darken($color, 10%);
10
11
  }
11
12
  }