bootstrap-generators 3.3.1 → 3.3.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (105) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +11 -3
  3. data/Rakefile +3 -3
  4. data/lib/bootstrap-generators.rb +1 -1
  5. data/lib/bootstrap/generators/version.rb +1 -1
  6. data/lib/generators/bootstrap/install/install_generator.rb +1 -1
  7. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +8 -3
  8. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +11 -9
  9. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +4 -4
  10. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +8 -8
  11. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim +4 -4
  12. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +2 -2
  13. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +15 -15
  14. data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim +2 -2
  15. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/edit.html.erb +2 -2
  16. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/index.html.erb +1 -1
  17. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/new.html.erb +1 -1
  18. data/lib/generators/bootstrap/install/templates/lib/templates/erb/scaffold/show.html.erb +2 -2
  19. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/edit.html.haml +2 -2
  20. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/index.html.haml +2 -2
  21. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/new.html.haml +1 -1
  22. data/lib/generators/bootstrap/install/templates/lib/templates/haml/scaffold/show.html.haml +2 -2
  23. data/lib/generators/bootstrap/install/templates/lib/templates/slim/scaffold/edit.html.slim +2 -2
  24. data/lib/generators/bootstrap/install/templates/lib/templates/slim/scaffold/index.html.slim +1 -1
  25. data/lib/generators/bootstrap/install/templates/lib/templates/slim/scaffold/new.html.slim +1 -1
  26. data/lib/generators/bootstrap/install/templates/lib/templates/slim/scaffold/show.html.slim +2 -2
  27. data/readme-template.md.erb +9 -1
  28. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  29. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +273 -214
  30. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  31. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  32. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  33. data/vendor/assets/javascripts/bootstrap/affix.js +7 -7
  34. data/vendor/assets/javascripts/bootstrap/alert.js +3 -3
  35. data/vendor/assets/javascripts/bootstrap/button.js +3 -3
  36. data/vendor/assets/javascripts/bootstrap/carousel.js +11 -14
  37. data/vendor/assets/javascripts/bootstrap/collapse.js +9 -9
  38. data/vendor/assets/javascripts/bootstrap/dropdown.js +4 -4
  39. data/vendor/assets/javascripts/bootstrap/modal.js +42 -27
  40. data/vendor/assets/javascripts/bootstrap/popover.js +9 -20
  41. data/vendor/assets/javascripts/bootstrap/scrollspy.js +18 -21
  42. data/vendor/assets/javascripts/bootstrap/tab.js +4 -4
  43. data/vendor/assets/javascripts/bootstrap/tooltip.js +26 -28
  44. data/vendor/assets/javascripts/bootstrap/transition.js +2 -2
  45. data/vendor/assets/stylesheets/bootstrap.css.erb +289 -37
  46. data/vendor/assets/stylesheets/bootstrap.css.map +1 -1
  47. data/vendor/twitter/bootstrap/less/alerts.less +5 -0
  48. data/vendor/twitter/bootstrap/less/badges.less +6 -1
  49. data/vendor/twitter/bootstrap/less/button-groups.less +2 -2
  50. data/vendor/twitter/bootstrap/less/buttons.less +1 -1
  51. data/vendor/twitter/bootstrap/less/carousel.less +8 -6
  52. data/vendor/twitter/bootstrap/less/close.less +1 -0
  53. data/vendor/twitter/bootstrap/less/component-animations.less +1 -2
  54. data/vendor/twitter/bootstrap/less/dropdowns.less +3 -2
  55. data/vendor/twitter/bootstrap/less/forms.less +51 -23
  56. data/vendor/twitter/bootstrap/less/glyphicons.less +71 -0
  57. data/vendor/twitter/bootstrap/less/jumbotron.less +1 -0
  58. data/vendor/twitter/bootstrap/less/media.less +14 -0
  59. data/vendor/twitter/bootstrap/less/mixins/vendor-prefixes.less +1 -1
  60. data/vendor/twitter/bootstrap/less/modals.less +3 -1
  61. data/vendor/twitter/bootstrap/less/navbar.less +1 -1
  62. data/vendor/twitter/bootstrap/less/navs.less +0 -2
  63. data/vendor/twitter/bootstrap/less/panels.less +5 -1
  64. data/vendor/twitter/bootstrap/less/popovers.less +1 -1
  65. data/vendor/twitter/bootstrap/less/responsive-embed.less +8 -8
  66. data/vendor/twitter/bootstrap/less/scaffolding.less +12 -0
  67. data/vendor/twitter/bootstrap/less/tables.less +3 -3
  68. data/vendor/twitter/bootstrap/less/theme.less +3 -2
  69. data/vendor/twitter/bootstrap/less/tooltip.less +1 -2
  70. data/vendor/twitter/bootstrap/less/type.less +1 -1
  71. data/vendor/twitter/bootstrap/less/utilities.less +0 -1
  72. data/vendor/twitter/bootstrap/less/variables.less +8 -3
  73. data/vendor/twitter/bootstrap/sass/_bootstrap-compass.scss +2 -0
  74. data/vendor/twitter/bootstrap/sass/_bootstrap-mincer.scss +2 -0
  75. data/vendor/twitter/bootstrap/sass/_bootstrap-sprockets.scss +2 -0
  76. data/vendor/twitter/bootstrap/sass/bootstrap/_alerts.scss +5 -0
  77. data/vendor/twitter/bootstrap/sass/bootstrap/_badges.scss +6 -1
  78. data/vendor/twitter/bootstrap/sass/bootstrap/_button-groups.scss +2 -2
  79. data/vendor/twitter/bootstrap/sass/bootstrap/_buttons.scss +1 -1
  80. data/vendor/twitter/bootstrap/sass/bootstrap/_carousel.scss +8 -6
  81. data/vendor/twitter/bootstrap/sass/bootstrap/_close.scss +1 -0
  82. data/vendor/twitter/bootstrap/sass/bootstrap/_component-animations.scss +1 -2
  83. data/vendor/twitter/bootstrap/sass/bootstrap/_dropdowns.scss +3 -2
  84. data/vendor/twitter/bootstrap/sass/bootstrap/_forms.scss +51 -21
  85. data/vendor/twitter/bootstrap/sass/bootstrap/_glyphicons.scss +71 -0
  86. data/vendor/twitter/bootstrap/sass/bootstrap/_jumbotron.scss +1 -0
  87. data/vendor/twitter/bootstrap/sass/bootstrap/_media.scss +14 -0
  88. data/vendor/twitter/bootstrap/sass/bootstrap/_modals.scss +3 -1
  89. data/vendor/twitter/bootstrap/sass/bootstrap/_navbar.scss +1 -1
  90. data/vendor/twitter/bootstrap/sass/bootstrap/_navs.scss +0 -2
  91. data/vendor/twitter/bootstrap/sass/bootstrap/_panels.scss +5 -1
  92. data/vendor/twitter/bootstrap/sass/bootstrap/_popovers.scss +1 -1
  93. data/vendor/twitter/bootstrap/sass/bootstrap/_responsive-embed.scss +8 -8
  94. data/vendor/twitter/bootstrap/sass/bootstrap/_responsive-utilities.scss +4 -1
  95. data/vendor/twitter/bootstrap/sass/bootstrap/_scaffolding.scss +12 -0
  96. data/vendor/twitter/bootstrap/sass/bootstrap/_tables.scss +3 -3
  97. data/vendor/twitter/bootstrap/sass/bootstrap/_theme.scss +3 -2
  98. data/vendor/twitter/bootstrap/sass/bootstrap/_tooltip.scss +1 -2
  99. data/vendor/twitter/bootstrap/sass/bootstrap/_type.scss +1 -1
  100. data/vendor/twitter/bootstrap/sass/bootstrap/_utilities.scss +0 -1
  101. data/vendor/twitter/bootstrap/sass/bootstrap/_variables.scss +11 -9
  102. data/vendor/twitter/bootstrap/sass/bootstrap/mixins/_hide-text.scss +1 -1
  103. data/vendor/twitter/bootstrap/sass/bootstrap/mixins/_opacity.scss +1 -1
  104. data/vendor/twitter/bootstrap/sass/bootstrap/mixins/_vendor-prefixes.scss +1 -1
  105. metadata +3 -2
@@ -12,6 +12,7 @@
12
12
  font-family: 'Glyphicons Halflings';
13
13
  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
14
14
  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
15
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
15
16
  url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
16
17
  url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
17
18
  url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
@@ -232,3 +233,73 @@
232
233
  .glyphicon-cloud-upload { &:before { content: "\e198"; } }
233
234
  .glyphicon-tree-conifer { &:before { content: "\e199"; } }
234
235
  .glyphicon-tree-deciduous { &:before { content: "\e200"; } }
236
+ .glyphicon-cd { &:before { content: "\e201"; } }
237
+ .glyphicon-save-file { &:before { content: "\e202"; } }
238
+ .glyphicon-open-file { &:before { content: "\e203"; } }
239
+ .glyphicon-level-up { &:before { content: "\e204"; } }
240
+ .glyphicon-copy { &:before { content: "\e205"; } }
241
+ .glyphicon-paste { &:before { content: "\e206"; } }
242
+ // The following 2 Glyphicons are omitted for the time being because
243
+ // they currently use Unicode codepoints that are outside the
244
+ // Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
245
+ // non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
246
+ // Notably, the bug affects some older versions of the Android Browser.
247
+ // More info: https://github.com/twbs/bootstrap/issues/10106
248
+ // .glyphicon-door { &:before { content: "\1f6aa"; } }
249
+ // .glyphicon-key { &:before { content: "\1f511"; } }
250
+ .glyphicon-alert { &:before { content: "\e209"; } }
251
+ .glyphicon-equalizer { &:before { content: "\e210"; } }
252
+ .glyphicon-king { &:before { content: "\e211"; } }
253
+ .glyphicon-queen { &:before { content: "\e212"; } }
254
+ .glyphicon-pawn { &:before { content: "\e213"; } }
255
+ .glyphicon-bishop { &:before { content: "\e214"; } }
256
+ .glyphicon-knight { &:before { content: "\e215"; } }
257
+ .glyphicon-baby-formula { &:before { content: "\e216"; } }
258
+ .glyphicon-tent { &:before { content: "\26fa"; } }
259
+ .glyphicon-blackboard { &:before { content: "\e218"; } }
260
+ .glyphicon-bed { &:before { content: "\e219"; } }
261
+ .glyphicon-apple { &:before { content: "\f8ff"; } }
262
+ .glyphicon-erase { &:before { content: "\e221"; } }
263
+ .glyphicon-hourglass { &:before { content: "\231b"; } }
264
+ .glyphicon-lamp { &:before { content: "\e223"; } }
265
+ .glyphicon-duplicate { &:before { content: "\e224"; } }
266
+ .glyphicon-piggy-bank { &:before { content: "\e225"; } }
267
+ .glyphicon-scissors { &:before { content: "\e226"; } }
268
+ .glyphicon-bitcoin { &:before { content: "\e227"; } }
269
+ .glyphicon-btc { &:before { content: "\e227"; } }
270
+ .glyphicon-xbt { &:before { content: "\e227"; } }
271
+ .glyphicon-yen { &:before { content: "\00a5"; } }
272
+ .glyphicon-jpy { &:before { content: "\00a5"; } }
273
+ .glyphicon-ruble { &:before { content: "\20bd"; } }
274
+ .glyphicon-rub { &:before { content: "\20bd"; } }
275
+ .glyphicon-scale { &:before { content: "\e230"; } }
276
+ .glyphicon-ice-lolly { &:before { content: "\e231"; } }
277
+ .glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } }
278
+ .glyphicon-education { &:before { content: "\e233"; } }
279
+ .glyphicon-option-horizontal { &:before { content: "\e234"; } }
280
+ .glyphicon-option-vertical { &:before { content: "\e235"; } }
281
+ .glyphicon-menu-hamburger { &:before { content: "\e236"; } }
282
+ .glyphicon-modal-window { &:before { content: "\e237"; } }
283
+ .glyphicon-oil { &:before { content: "\e238"; } }
284
+ .glyphicon-grain { &:before { content: "\e239"; } }
285
+ .glyphicon-sunglasses { &:before { content: "\e240"; } }
286
+ .glyphicon-text-size { &:before { content: "\e241"; } }
287
+ .glyphicon-text-color { &:before { content: "\e242"; } }
288
+ .glyphicon-text-background { &:before { content: "\e243"; } }
289
+ .glyphicon-object-align-top { &:before { content: "\e244"; } }
290
+ .glyphicon-object-align-bottom { &:before { content: "\e245"; } }
291
+ .glyphicon-object-align-horizontal{ &:before { content: "\e246"; } }
292
+ .glyphicon-object-align-left { &:before { content: "\e247"; } }
293
+ .glyphicon-object-align-vertical { &:before { content: "\e248"; } }
294
+ .glyphicon-object-align-right { &:before { content: "\e249"; } }
295
+ .glyphicon-triangle-right { &:before { content: "\e250"; } }
296
+ .glyphicon-triangle-left { &:before { content: "\e251"; } }
297
+ .glyphicon-triangle-bottom { &:before { content: "\e252"; } }
298
+ .glyphicon-triangle-top { &:before { content: "\e253"; } }
299
+ .glyphicon-console { &:before { content: "\e254"; } }
300
+ .glyphicon-superscript { &:before { content: "\e255"; } }
301
+ .glyphicon-subscript { &:before { content: "\e256"; } }
302
+ .glyphicon-menu-left { &:before { content: "\e257"; } }
303
+ .glyphicon-menu-right { &:before { content: "\e258"; } }
304
+ .glyphicon-menu-down { &:before { content: "\e259"; } }
305
+ .glyphicon-menu-up { &:before { content: "\e260"; } }
@@ -13,6 +13,7 @@
13
13
  .h1 {
14
14
  color: $jumbotron-heading-color;
15
15
  }
16
+
16
17
  p {
17
18
  margin-bottom: ($jumbotron-padding / 2);
18
19
  font-size: $jumbotron-font-size;
@@ -7,6 +7,20 @@
7
7
  }
8
8
  }
9
9
 
10
+ .media,
11
+ .media-body {
12
+ zoom: 1;
13
+ overflow: hidden;
14
+ }
15
+
16
+ .media-body {
17
+ width: 10000px;
18
+ }
19
+
20
+ .media-object {
21
+ display: block;
22
+ }
23
+
10
24
  .media-right,
11
25
  .media > .pull-right {
12
26
  padding-left: 10px;
@@ -62,10 +62,12 @@
62
62
 
63
63
  // Modal background
64
64
  .modal-backdrop {
65
- position: absolute;
65
+ position: fixed;
66
66
  top: 0;
67
67
  right: 0;
68
+ bottom: 0;
68
69
  left: 0;
70
+ z-index: $zindex-modal-background;
69
71
  background-color: $modal-backdrop-bg;
70
72
  // Fade for backdrop
71
73
  &.fade { @include opacity(0); }
@@ -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;
@@ -331,6 +330,7 @@
331
330
  }
332
331
  // Menu position and menu caret support for dropups via extra dropup class
333
332
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
333
+ margin-bottom: 0;
334
334
  @include border-top-radius($navbar-border-radius);
335
335
  @include border-bottom-radius(0);
336
336
  }
@@ -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
 
@@ -36,7 +36,11 @@
36
36
  font-size: ceil(($font-size-base * 1.125));
37
37
  color: inherit;
38
38
 
39
- > a {
39
+ > a,
40
+ > small,
41
+ > .small,
42
+ > small > a,
43
+ > .small > a {
40
44
  color: inherit;
41
45
  }
42
46
  }
@@ -11,7 +11,7 @@
11
11
  display: none;
12
12
  max-width: $popover-max-width;
13
13
  padding: 1px;
14
- // Reset font and text propertes given new insertion method
14
+ // Reset font and text properties given new insertion method
15
15
  font-family: $font-family-base;
16
16
  font-size: $font-size-base;
17
17
  font-weight: normal;
@@ -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
  }
@@ -26,7 +26,10 @@
26
26
  // Visibility utilities
27
27
  // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
28
28
 
29
- @include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
29
+ @include responsive-invisibility('.visible-xs');
30
+ @include responsive-invisibility('.visible-sm');
31
+ @include responsive-invisibility('.visible-md');
32
+ @include responsive-invisibility('.visible-lg');
30
33
 
31
34
  .visible-xs-block,
32
35
  .visible-xs-inline,
@@ -148,3 +148,15 @@ 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
+ // Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged
159
+
160
+ [role="button"] {
161
+ cursor: pointer;
162
+ }
@@ -111,7 +111,7 @@ th {
111
111
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
112
112
 
113
113
  .table-striped {
114
- > tbody > tr:nth-child(odd) {
114
+ > tbody > tr:nth-of-type(odd) {
115
115
  background-color: $table-bg-accent;
116
116
  }
117
117
  }
@@ -133,7 +133,7 @@ th {
133
133
  // Reset default table behavior
134
134
 
135
135
  table col[class*="col-"] {
136
- position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
136
+ position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
137
137
  float: none;
138
138
  display: table-column;
139
139
  }
@@ -141,7 +141,7 @@ table {
141
141
  td,
142
142
  th {
143
143
  &[class*="col-"] {
144
- position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
144
+ position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
145
145
  float: none;
146
146
  display: table-cell;
147
147
  }
@@ -36,7 +36,7 @@
36
36
  // Mixin for generating new styles
37
37
  @mixin btn-styles($btn-color: #555) {
38
38
  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
39
- @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; see https://github.com/twbs/bootstrap/issues/10620
40
40
  background-repeat: repeat-x;
41
41
  border-color: darken($btn-color, 14%);
42
42
 
@@ -52,6 +52,7 @@
52
52
  border-color: darken($btn-color, 14%);
53
53
  }
54
54
 
55
+ &.disabled,
55
56
  &:disabled,
56
57
  &[disabled] {
57
58
  background-color: darken($btn-color, 12%);
@@ -130,7 +131,7 @@
130
131
  // Inverted navbar
131
132
  .navbar-inverse {
132
133
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
133
- @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
134
+ @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
134
135
 
135
136
  .navbar-nav > .open > a,
136
137
  .navbar-nav > .active > a {
@@ -8,8 +8,7 @@
8
8
  position: absolute;
9
9
  z-index: $zindex-tooltip;
10
10
  display: block;
11
- visibility: visible;
12
- // Reset font and text propertes given new insertion method
11
+ // Reset font and text properties given new insertion method
13
12
  font-family: $font-family-base;
14
13
  font-size: $font-size-small;
15
14
  font-weight: normal;
@@ -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
 
@@ -1,8 +1,4 @@
1
- // When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
2
- // When there no function is defined, `fn('')` is parsed as string that equals the right hand side
3
- // NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
4
- $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
5
-
1
+ $bootstrap-sass-asset-helper: false !default;
6
2
  //
7
3
  // Variables
8
4
  // --------------------------------------------------
@@ -19,7 +15,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555
19
15
  $gray-light: lighten($gray-base, 46.7%) !default; // #777
20
16
  $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
21
17
 
22
- $brand-primary: darken(#428bca, 6.5%) !default;
18
+ $brand-primary: darken(#428bca, 6.5%) !default; // #337ab7
23
19
  $brand-success: #5cb85c !default;
24
20
  $brand-info: #5bc0de !default;
25
21
  $brand-warning: #f0ad4e !default;
@@ -82,7 +78,8 @@ $headings-color: inherit !default;
82
78
 
83
79
  //** Load fonts from this directory.
84
80
 
85
- // [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
81
+ // [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
82
+ // [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
86
83
  $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "bootstrap/") !default;
87
84
 
88
85
  //** File name for all font files.
@@ -107,7 +104,7 @@ $padding-small-horizontal: 10px !default;
107
104
  $padding-xs-vertical: 1px !default;
108
105
  $padding-xs-horizontal: 5px !default;
109
106
 
110
- $line-height-large: 1.33 !default;
107
+ $line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
111
108
  $line-height-small: 1.5 !default;
112
109
 
113
110
  $border-radius-base: 4px !default;
@@ -195,6 +192,7 @@ $input-border: #ccc !default;
195
192
 
196
193
  // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
197
194
  //** Default `.form-control` border radius
195
+ // This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
198
196
  $input-border-radius: $border-radius-base !default;
199
197
  //** Large `.form-control` border radius
200
198
  $input-border-radius-large: $border-radius-large !default;
@@ -214,6 +212,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
214
212
  //** Small `.form-control` height
215
213
  $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
216
214
 
215
+ //** `.form-group` margin
216
+ $form-group-margin-bottom: 15px !default;
217
+
217
218
  $legend-color: $gray-dark !default;
218
219
  $legend-border-color: #e5e5e5 !default;
219
220
 
@@ -273,7 +274,8 @@ $zindex-dropdown: 1000 !default;
273
274
  $zindex-popover: 1060 !default;
274
275
  $zindex-tooltip: 1070 !default;
275
276
  $zindex-navbar-fixed: 1030 !default;
276
- $zindex-modal: 1040 !default;
277
+ $zindex-modal-background: 1040 !default;
278
+ $zindex-modal: 1050 !default;
277
279
 
278
280
 
279
281
  //== Media queries breakpoints
@@ -8,7 +8,7 @@
8
8
 
9
9
  // Deprecated as of v3.0.1 (will be removed in v4)
10
10
  @mixin hide-text() {
11
- font: #{0/0} a;
11
+ font: 0/0 a;
12
12
  color: transparent;
13
13
  text-shadow: none;
14
14
  background-color: transparent;
@@ -4,5 +4,5 @@
4
4
  opacity: $opacity;
5
5
  // IE8 filter
6
6
  $opacity-ie: ($opacity * 100);
7
- filter: #{alpha(opacity=$opacity-ie)};
7
+ filter: alpha(opacity=$opacity-ie);
8
8
  }
@@ -102,7 +102,7 @@
102
102
  // Firefox
103
103
  &::-moz-placeholder {
104
104
  color: $color;
105
- opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
105
+ opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
106
106
  }
107
107
  &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
108
108
  &::-webkit-input-placeholder { color: $color; } // Safari and Chrome
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-generators
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.1
4
+ version: 3.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Décio Ferreira
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-14 00:00:00.000000000 Z
11
+ date: 2015-05-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -111,6 +111,7 @@ files:
111
111
  - vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
112
112
  - vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
113
113
  - vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
114
+ - vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2
114
115
  - vendor/assets/javascripts/bootstrap.js
115
116
  - vendor/assets/javascripts/bootstrap/affix.js
116
117
  - vendor/assets/javascripts/bootstrap/alert.js