bootswatch-sass 3.3.2 → 3.3.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (90) hide show
  1. checksums.yaml +4 -4
  2. data/assets/javascripts/bootstrap/affix.js +5 -5
  3. data/assets/javascripts/bootstrap/alert.js +2 -2
  4. data/assets/javascripts/bootstrap/button.js +13 -9
  5. data/assets/javascripts/bootstrap/carousel.js +6 -6
  6. data/assets/javascripts/bootstrap/collapse.js +7 -7
  7. data/assets/javascripts/bootstrap/dropdown.js +47 -43
  8. data/assets/javascripts/bootstrap/modal.js +44 -31
  9. data/assets/javascripts/bootstrap/popover.js +3 -8
  10. data/assets/javascripts/bootstrap/scrollspy.js +17 -20
  11. data/assets/javascripts/bootstrap/tab.js +6 -4
  12. data/assets/javascripts/bootstrap/tooltip.js +73 -31
  13. data/assets/javascripts/bootstrap/transition.js +1 -1
  14. data/assets/stylesheets/_bootstrap.scss +6 -0
  15. data/assets/stylesheets/bootstrap/_alerts.scss +2 -2
  16. data/assets/stylesheets/bootstrap/_badges.scss +7 -6
  17. data/assets/stylesheets/bootstrap/_button-groups.scss +3 -2
  18. data/assets/stylesheets/bootstrap/_buttons.scss +13 -5
  19. data/assets/stylesheets/bootstrap/_carousel.scss +2 -2
  20. data/assets/stylesheets/bootstrap/_component-animations.scss +1 -2
  21. data/assets/stylesheets/bootstrap/_dropdowns.scss +4 -2
  22. data/assets/stylesheets/bootstrap/_forms.scss +56 -15
  23. data/assets/stylesheets/bootstrap/_glyphicons.scss +15 -9
  24. data/assets/stylesheets/bootstrap/_input-groups.scss +1 -0
  25. data/assets/stylesheets/bootstrap/_jumbotron.scss +6 -4
  26. data/assets/stylesheets/bootstrap/_list-group.scss +9 -3
  27. data/assets/stylesheets/bootstrap/_media.scss +5 -0
  28. data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
  29. data/assets/stylesheets/bootstrap/_modals.scss +3 -1
  30. data/assets/stylesheets/bootstrap/_navbar.scss +0 -1
  31. data/assets/stylesheets/bootstrap/_navs.scss +0 -2
  32. data/assets/stylesheets/bootstrap/_normalize.scss +8 -11
  33. data/assets/stylesheets/bootstrap/_pagination.scss +3 -2
  34. data/assets/stylesheets/bootstrap/_panels.scss +6 -0
  35. data/assets/stylesheets/bootstrap/_popovers.scss +4 -8
  36. data/assets/stylesheets/bootstrap/_print.scss +0 -6
  37. data/assets/stylesheets/bootstrap/_responsive-embed.scss +8 -8
  38. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +4 -2
  39. data/assets/stylesheets/bootstrap/_scaffolding.scss +11 -0
  40. data/assets/stylesheets/bootstrap/_theme.scss +23 -5
  41. data/assets/stylesheets/bootstrap/_tooltip.scss +4 -6
  42. data/assets/stylesheets/bootstrap/_type.scss +1 -1
  43. data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
  44. data/assets/stylesheets/bootstrap/_variables.scss +12 -2
  45. data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
  46. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +18 -2
  47. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
  48. data/assets/stylesheets/bootstrap/mixins/_grid.scss +2 -2
  49. data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +1 -1
  50. data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
  51. data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
  52. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
  53. data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -1
  54. data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
  55. data/assets/stylesheets/cerulean/_bootswatch.scss +7 -1
  56. data/assets/stylesheets/cerulean/_variables.scss +392 -381
  57. data/assets/stylesheets/cosmo/_bootswatch.scss +26 -2
  58. data/assets/stylesheets/cosmo/_variables.scss +392 -381
  59. data/assets/stylesheets/cyborg/_bootswatch.scss +26 -2
  60. data/assets/stylesheets/cyborg/_variables.scss +392 -381
  61. data/assets/stylesheets/darkly/_bootswatch.scss +22 -4
  62. data/assets/stylesheets/darkly/_variables.scss +392 -381
  63. data/assets/stylesheets/flatly/_bootswatch.scss +21 -3
  64. data/assets/stylesheets/flatly/_variables.scss +392 -381
  65. data/assets/stylesheets/journal/_bootswatch.scss +26 -2
  66. data/assets/stylesheets/journal/_variables.scss +392 -381
  67. data/assets/stylesheets/lumen/_bootswatch.scss +47 -8
  68. data/assets/stylesheets/lumen/_variables.scss +392 -381
  69. data/assets/stylesheets/paper/_bootswatch.scss +214 -76
  70. data/assets/stylesheets/paper/_variables.scss +392 -381
  71. data/assets/stylesheets/readable/_bootswatch.scss +16 -24
  72. data/assets/stylesheets/readable/_variables.scss +392 -381
  73. data/assets/stylesheets/sandstone/_bootswatch.scss +7 -4
  74. data/assets/stylesheets/sandstone/_variables.scss +392 -381
  75. data/assets/stylesheets/simplex/_bootswatch.scss +32 -5
  76. data/assets/stylesheets/simplex/_variables.scss +392 -381
  77. data/assets/stylesheets/slate/_bootswatch.scss +25 -1
  78. data/assets/stylesheets/slate/_variables.scss +392 -381
  79. data/assets/stylesheets/spacelab/_bootswatch.scss +4 -4
  80. data/assets/stylesheets/spacelab/_variables.scss +392 -381
  81. data/assets/stylesheets/superhero/_bootswatch.scss +26 -2
  82. data/assets/stylesheets/superhero/_variables.scss +392 -381
  83. data/assets/stylesheets/united/_bootswatch.scss +15 -2
  84. data/assets/stylesheets/united/_variables.scss +392 -381
  85. data/assets/stylesheets/yeti/_bootswatch.scss +2 -2
  86. data/assets/stylesheets/yeti/_variables.scss +392 -381
  87. data/lib/bootswatch-sass/version.rb +1 -1
  88. data/test/dummy/Gemfile +7 -5
  89. data/test/dummy/app/views/home/index.html.erb +1 -1
  90. metadata +4 -3
@@ -67,7 +67,6 @@
67
67
 
68
68
  &.collapse {
69
69
  display: block !important;
70
- visibility: visible !important;
71
70
  height: auto !important;
72
71
  padding-bottom: 0; // Override default setting
73
72
  overflow: visible !important;
@@ -223,11 +223,9 @@
223
223
  .tab-content {
224
224
  > .tab-pane {
225
225
  display: none;
226
- visibility: hidden;
227
226
  }
228
227
  > .active {
229
228
  display: block;
230
- visibility: visible;
231
229
  }
232
230
  }
233
231
 
@@ -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 {
@@ -22,14 +22,14 @@
22
22
  width: 100%;
23
23
  border: 0;
24
24
  }
25
+ }
25
26
 
26
- // Modifier class for 16:9 aspect ratio
27
- &.embed-responsive-16by9 {
28
- padding-bottom: 56.25%;
29
- }
27
+ // Modifier class for 16:9 aspect ratio
28
+ .embed-responsive-16by9 {
29
+ padding-bottom: 56.25%;
30
+ }
30
31
 
31
- // Modifier class for 4:3 aspect ratio
32
- &.embed-responsive-4by3 {
33
- padding-bottom: 75%;
34
- }
32
+ // Modifier class for 4:3 aspect ratio
33
+ .embed-responsive-4by3 {
34
+ padding-bottom: 75%;
35
35
  }
@@ -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
 
@@ -148,3 +148,14 @@ hr {
148
148
  clip: auto;
149
149
  }
150
150
  }
151
+
152
+
153
+ // iOS "clickable elements" fix for role="button"
154
+ //
155
+ // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
156
+ // for traditionally non-focusable elements with role="button"
157
+ // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
158
+
159
+ [role="button"] {
160
+ cursor: pointer;
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,12 +8,11 @@
8
8
  position: absolute;
9
9
  z-index: $zindex-tooltip;
10
10
  display: block;
11
- visibility: visible;
12
- // Reset font and text properties given new insertion method
13
- 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;
14
14
  font-size: $font-size-small;
15
- font-weight: normal;
16
- line-height: 1.4;
15
+
17
16
  @include opacity(0);
18
17
 
19
18
  &.in { @include opacity($tooltip-opacity); }
@@ -29,7 +28,6 @@
29
28
  padding: 3px 8px;
30
29
  color: $tooltip-color;
31
30
  text-align: center;
32
- text-decoration: none;
33
31
  background-color: $tooltip-bg;
34
32
  border-radius: $border-radius-base;
35
33
  }
@@ -234,7 +234,7 @@ abbr[data-original-title] {
234
234
  }
235
235
  .initialism {
236
236
  font-size: 90%;
237
- text-transform: uppercase;
237
+ @extend .text-uppercase;
238
238
  }
239
239
 
240
240
  // Blockquotes
@@ -44,7 +44,6 @@
44
44
 
45
45
  .hidden {
46
46
  display: none !important;
47
- visibility: hidden !important;
48
47
  }
49
48
 
50
49
 
@@ -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
  //
@@ -212,6 +217,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
212
217
  //** Small `.form-control` height
213
218
  $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
214
219
 
220
+ //** `.form-group` margin
221
+ $form-group-margin-bottom: 15px !default;
222
+
215
223
  $legend-color: $gray-dark !default;
216
224
  $legend-border-color: #e5e5e5 !default;
217
225
 
@@ -271,7 +279,8 @@ $zindex-dropdown: 1000 !default;
271
279
  $zindex-popover: 1060 !default;
272
280
  $zindex-tooltip: 1070 !default;
273
281
  $zindex-navbar-fixed: 1030 !default;
274
- $zindex-modal: 1040 !default;
282
+ $zindex-modal-background: 1040 !default;
283
+ $zindex-modal: 1050 !default;
275
284
 
276
285
 
277
286
  //== Media queries breakpoints
@@ -384,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg: #888 !default;
384
393
  $navbar-default-toggle-border-color: #ddd !default;
385
394
 
386
395
 
387
- // Inverted navbar
396
+ //=== Inverted navbar
388
397
  // Reset inverted navbar basics
389
398
  $navbar-inverse-color: lighten($gray-light, 15%) !default;
390
399
  $navbar-inverse-bg: #222 !default;
@@ -485,6 +494,7 @@ $jumbotron-color: inherit !default;
485
494
  $jumbotron-bg: $gray-lighter !default;
486
495
  $jumbotron-heading-color: inherit !default;
487
496
  $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
497
+ $jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;
488
498
 
489
499
 
490
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
  }
@@ -8,15 +8,31 @@
8
8
  background-color: $background;
9
9
  border-color: $border;
10
10
 
11
- &:hover,
12
11
  &:focus,
13
- &.focus,
12
+ &.focus {
13
+ color: $color;
14
+ background-color: darken($background, 10%);
15
+ border-color: darken($border, 25%);
16
+ }
17
+ &:hover {
18
+ color: $color;
19
+ background-color: darken($background, 10%);
20
+ border-color: darken($border, 12%);
21
+ }
14
22
  &:active,
15
23
  &.active,
16
24
  .open > &.dropdown-toggle {
17
25
  color: $color;
18
26
  background-color: darken($background, 10%);
19
27
  border-color: darken($border, 12%);
28
+
29
+ &:hover,
30
+ &:focus,
31
+ &.focus {
32
+ color: $color;
33
+ background-color: darken($background, 17%);
34
+ border-color: darken($border, 25%);
35
+ }
20
36
  }
21
37
  &:active,
22
38
  &.active,
@@ -13,8 +13,8 @@
13
13
  // Prevent columns from collapsing when empty
14
14
  min-height: 1px;
15
15
  // Inner gutter via padding
16
- padding-left: ($grid-gutter-width / 2);
17
- padding-right: ($grid-gutter-width / 2);
16
+ padding-left: ceil(($grid-gutter-width / 2));
17
+ padding-right: floor(($grid-gutter-width / 2));
18
18
  }
19
19
  }
20
20
 
@@ -13,8 +13,8 @@
13
13
 
14
14
  // Creates a wrapper for a series of columns
15
15
  @mixin make-row($gutter: $grid-gutter-width) {
16
- margin-left: ($gutter / -2);
17
- margin-right: ($gutter / -2);
16
+ margin-left: ceil(($gutter / -2));
17
+ margin-right: floor(($gutter / -2));
18
18
  @include clearfix;
19
19
  }
20
20
 
@@ -1,6 +1,6 @@
1
1
  // CSS image replacement
2
2
  //
3
- // Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
3
+ // Heads up! v3 launched with only `.hide-text()`, but per our pattern for
4
4
  // mixins being reused as classes with the same name, this doesn't hold up. As
5
5
  // of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
6
6
  //
@@ -5,10 +5,11 @@
5
5
  color: $color;
6
6
  background-color: $background;
7
7
 
8
- // [converter] extracted a& to a.list-group-item-#{$state}
8
+ // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state}
9
9
  }
10
10
 
11
- a.list-group-item-#{$state} {
11
+ a.list-group-item-#{$state},
12
+ button.list-group-item-#{$state} {
12
13
  color: $color;
13
14
 
14
15
  .list-group-item-heading {