bootstrap-on-rails 3.2.0 → 3.3.1

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 (90) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -1
  3. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  4. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
  5. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  6. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  7. data/app/assets/javascripts/bootstrap/affix.js +43 -23
  8. data/app/assets/javascripts/bootstrap/alert.js +6 -4
  9. data/app/assets/javascripts/bootstrap/button.js +16 -10
  10. data/app/assets/javascripts/bootstrap/carousel.js +27 -10
  11. data/app/assets/javascripts/bootstrap/collapse.js +69 -28
  12. data/app/assets/javascripts/bootstrap/dropdown.js +20 -10
  13. data/app/assets/javascripts/bootstrap/modal.js +67 -23
  14. data/app/assets/javascripts/bootstrap/popover.js +13 -7
  15. data/app/assets/javascripts/bootstrap/scrollspy.js +12 -7
  16. data/app/assets/javascripts/bootstrap/tab.js +41 -16
  17. data/app/assets/javascripts/bootstrap/tooltip.js +60 -39
  18. data/app/assets/javascripts/bootstrap/transition.js +1 -1
  19. data/app/assets/stylesheets/bootstrap/alerts.less +0 -0
  20. data/app/assets/stylesheets/bootstrap/badges.less +7 -1
  21. data/app/assets/stylesheets/bootstrap/bootstrap.less +0 -0
  22. data/app/assets/stylesheets/bootstrap/breadcrumbs.less +0 -0
  23. data/app/assets/stylesheets/bootstrap/button-groups.less +16 -13
  24. data/app/assets/stylesheets/bootstrap/buttons.less +7 -4
  25. data/app/assets/stylesheets/bootstrap/carousel.less +24 -0
  26. data/app/assets/stylesheets/bootstrap/close.less +0 -0
  27. data/app/assets/stylesheets/bootstrap/code.less +1 -0
  28. data/app/assets/stylesheets/bootstrap/component-animations.less +5 -2
  29. data/app/assets/stylesheets/bootstrap/dropdowns.less +3 -5
  30. data/app/assets/stylesheets/bootstrap/forms.less +46 -40
  31. data/app/assets/stylesheets/bootstrap/glyphicons.less +7 -6
  32. data/app/assets/stylesheets/bootstrap/grid.less +0 -0
  33. data/app/assets/stylesheets/bootstrap/input-groups.less +0 -0
  34. data/app/assets/stylesheets/bootstrap/jumbotron.less +6 -5
  35. data/app/assets/stylesheets/bootstrap/labels.less +0 -0
  36. data/app/assets/stylesheets/bootstrap/list-group.less +1 -8
  37. data/app/assets/stylesheets/bootstrap/media.less +27 -36
  38. data/app/assets/stylesheets/bootstrap/mixins.less +0 -0
  39. data/app/assets/stylesheets/bootstrap/mixins/alerts.less +0 -0
  40. data/app/assets/stylesheets/bootstrap/mixins/background-variant.less +0 -0
  41. data/app/assets/stylesheets/bootstrap/mixins/border-radius.less +0 -0
  42. data/app/assets/stylesheets/bootstrap/mixins/buttons.less +2 -0
  43. data/app/assets/stylesheets/bootstrap/mixins/center-block.less +0 -0
  44. data/app/assets/stylesheets/bootstrap/mixins/clearfix.less +0 -0
  45. data/app/assets/stylesheets/bootstrap/mixins/forms.less +5 -1
  46. data/app/assets/stylesheets/bootstrap/mixins/gradients.less +0 -0
  47. data/app/assets/stylesheets/bootstrap/mixins/grid-framework.less +2 -2
  48. data/app/assets/stylesheets/bootstrap/mixins/grid.less +0 -0
  49. data/app/assets/stylesheets/bootstrap/mixins/hide-text.less +0 -0
  50. data/app/assets/stylesheets/bootstrap/mixins/image.less +0 -1
  51. data/app/assets/stylesheets/bootstrap/mixins/labels.less +1 -1
  52. data/app/assets/stylesheets/bootstrap/mixins/list-group.less +0 -0
  53. data/app/assets/stylesheets/bootstrap/mixins/nav-divider.less +0 -0
  54. data/app/assets/stylesheets/bootstrap/mixins/nav-vertical-align.less +0 -0
  55. data/app/assets/stylesheets/bootstrap/mixins/opacity.less +0 -0
  56. data/app/assets/stylesheets/bootstrap/mixins/pagination.less +0 -0
  57. data/app/assets/stylesheets/bootstrap/mixins/panels.less +0 -0
  58. data/app/assets/stylesheets/bootstrap/mixins/progress-bar.less +0 -0
  59. data/app/assets/stylesheets/bootstrap/mixins/reset-filter.less +0 -0
  60. data/app/assets/stylesheets/bootstrap/mixins/resize.less +0 -0
  61. data/app/assets/stylesheets/bootstrap/mixins/responsive-visibility.less +0 -0
  62. data/app/assets/stylesheets/bootstrap/mixins/size.less +0 -0
  63. data/app/assets/stylesheets/bootstrap/mixins/tab-focus.less +0 -0
  64. data/app/assets/stylesheets/bootstrap/mixins/table-row.less +0 -0
  65. data/app/assets/stylesheets/bootstrap/mixins/text-emphasis.less +0 -0
  66. data/app/assets/stylesheets/bootstrap/mixins/text-overflow.less +0 -0
  67. data/app/assets/stylesheets/bootstrap/mixins/vendor-prefixes.less +6 -3
  68. data/app/assets/stylesheets/bootstrap/modals.less +3 -5
  69. data/app/assets/stylesheets/bootstrap/navbar.less +30 -25
  70. data/app/assets/stylesheets/bootstrap/navs.less +3 -1
  71. data/app/assets/stylesheets/bootstrap/normalize.less +5 -3
  72. data/app/assets/stylesheets/bootstrap/pager.less +1 -2
  73. data/app/assets/stylesheets/bootstrap/pagination.less +1 -1
  74. data/app/assets/stylesheets/bootstrap/panels.less +21 -3
  75. data/app/assets/stylesheets/bootstrap/popovers.less +6 -4
  76. data/app/assets/stylesheets/bootstrap/print.less +102 -96
  77. data/app/assets/stylesheets/bootstrap/progress-bars.less +1 -19
  78. data/app/assets/stylesheets/bootstrap/responsive-embed.less +2 -1
  79. data/app/assets/stylesheets/bootstrap/responsive-utilities.less +0 -0
  80. data/app/assets/stylesheets/bootstrap/scaffolding.less +1 -1
  81. data/app/assets/stylesheets/bootstrap/tables.less +11 -10
  82. data/app/assets/stylesheets/bootstrap/theme.less +23 -9
  83. data/app/assets/stylesheets/bootstrap/thumbnails.less +1 -1
  84. data/app/assets/stylesheets/bootstrap/tooltip.less +12 -4
  85. data/app/assets/stylesheets/bootstrap/type.less +0 -11
  86. data/app/assets/stylesheets/bootstrap/utilities.less +0 -1
  87. data/app/assets/stylesheets/bootstrap/variables.less +31 -20
  88. data/app/assets/stylesheets/bootstrap/wells.less +0 -0
  89. data/lib/bootstrap-on-rails/version.rb +1 -1
  90. metadata +2 -2
@@ -7,7 +7,6 @@
7
7
  @import "mixins.less";
8
8
 
9
9
 
10
-
11
10
  //
12
11
  // Buttons
13
12
  // --------------------------------------------------
@@ -28,6 +27,10 @@
28
27
  &.active {
29
28
  .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
@@ -74,7 +77,6 @@
74
77
  .btn-danger { .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
  // --------------------------------------------------
@@ -116,8 +116,9 @@
116
116
  @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
117
117
  .box-shadow(@shadow);
118
118
 
119
+ .navbar-nav > .open > a,
119
120
  .navbar-nav > .active > a {
120
- #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
121
+ #gradient > .vertical(@start-color: darken(@navbar-default-link-active-bg, 5%); @end-color: darken(@navbar-default-link-active-bg, 2%));
121
122
  .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
122
123
  }
123
124
  }
@@ -131,8 +132,9 @@
131
132
  #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
132
133
  .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
- #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
137
+ #gradient > .vertical(@start-color: @navbar-inverse-link-active-bg; @end-color: lighten(@navbar-inverse-link-active-bg, 2.5%));
136
138
  .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
137
139
  }
138
140
 
@@ -149,6 +151,17 @@
149
151
  border-radius: 0;
150
152
  }
151
153
 
154
+ // Fix active state of dropdown items in collapsed mode
155
+ @media (max-width: @grid-float-breakpoint-max) {
156
+ .navbar .navbar-nav .open .dropdown-menu > .active > a {
157
+ &,
158
+ &:hover,
159
+ &:focus {
160
+ color: #fff;
161
+ #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
162
+ }
163
+ }
164
+ }
152
165
 
153
166
 
154
167
  //
@@ -175,7 +188,6 @@
175
188
  .alert-danger { .alert-styles(@alert-danger-bg); }
176
189
 
177
190
 
178
-
179
191
  //
180
192
  // Progress bars
181
193
  // --------------------------------------------------
@@ -218,8 +230,11 @@
218
230
  text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
219
231
  #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
220
232
  border-color: darken(@list-group-active-border, 7.5%);
221
- }
222
233
 
234
+ .badge {
235
+ text-shadow: none;
236
+ }
237
+ }
223
238
 
224
239
 
225
240
  //
@@ -245,7 +260,6 @@
245
260
  .panel-danger > .panel-heading { .panel-heading-styles(@panel-danger-heading-bg); }
246
261
 
247
262
 
248
-
249
263
  //
250
264
  // Wells
251
265
  // --------------------------------------------------
@@ -12,7 +12,7 @@
12
12
  background-color: @thumbnail-bg;
13
13
  border: 1px solid @thumbnail-border;
14
14
  border-radius: @thumbnail-border-radius;
15
- .transition(all .2s ease-in-out);
15
+ .transition(border .2s ease-in-out);
16
16
 
17
17
  > img,
18
18
  a > img {
@@ -9,7 +9,10 @@
9
9
  z-index: @zindex-tooltip;
10
10
  display: block;
11
11
  visibility: visible;
12
+ // Reset font and text propertes given new insertion method
13
+ font-family: @font-family-base;
12
14
  font-size: @font-size-small;
15
+ font-weight: normal;
13
16
  line-height: 1.4;
14
17
  .opacity(0);
15
18
 
@@ -39,6 +42,7 @@
39
42
  border-color: transparent;
40
43
  border-style: solid;
41
44
  }
45
+ // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
42
46
  .tooltip {
43
47
  &.top .tooltip-arrow {
44
48
  bottom: 0;
@@ -49,13 +53,15 @@
49
53
  }
50
54
  &.top-left .tooltip-arrow {
51
55
  bottom: 0;
52
- left: @tooltip-arrow-width;
56
+ right: @tooltip-arrow-width;
57
+ margin-bottom: -@tooltip-arrow-width;
53
58
  border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
54
59
  border-top-color: @tooltip-arrow-color;
55
60
  }
56
61
  &.top-right .tooltip-arrow {
57
62
  bottom: 0;
58
- right: @tooltip-arrow-width;
63
+ left: @tooltip-arrow-width;
64
+ margin-bottom: -@tooltip-arrow-width;
59
65
  border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
60
66
  border-top-color: @tooltip-arrow-color;
61
67
  }
@@ -82,13 +88,15 @@
82
88
  }
83
89
  &.bottom-left .tooltip-arrow {
84
90
  top: 0;
85
- left: @tooltip-arrow-width;
91
+ right: @tooltip-arrow-width;
92
+ margin-top: -@tooltip-arrow-width;
86
93
  border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
87
94
  border-bottom-color: @tooltip-arrow-color;
88
95
  }
89
96
  &.bottom-right .tooltip-arrow {
90
97
  top: 0;
91
- right: @tooltip-arrow-width;
98
+ left: @tooltip-arrow-width;
99
+ margin-top: -@tooltip-arrow-width;
92
100
  border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
93
101
  border-bottom-color: @tooltip-arrow-color;
94
102
  }
@@ -80,11 +80,6 @@ small,
80
80
  font-size: floor((100% * @font-size-small / @font-size-base));
81
81
  }
82
82
 
83
- // Undo browser default styling
84
- cite {
85
- font-style: normal;
86
- }
87
-
88
83
  mark,
89
84
  .mark {
90
85
  background-color: @state-warning-bg;
@@ -299,12 +294,6 @@ blockquote.pull-right {
299
294
  }
300
295
  }
301
296
 
302
- // Quotes
303
- blockquote:before,
304
- blockquote:after {
305
- content: "";
306
- }
307
-
308
297
  // Addresses
309
298
  address {
310
299
  margin-bottom: @line-height-computed;
@@ -53,5 +53,4 @@
53
53
 
54
54
  .affix {
55
55
  position: fixed;
56
- .translate3d(0, 0, 0);
57
56
  }
@@ -7,13 +7,14 @@
7
7
  //
8
8
  //## Gray and brand colors for use across Bootstrap.
9
9
 
10
- @gray-darker: lighten(#000, 13.5%); // #222
11
- @gray-dark: lighten(#000, 20%); // #333
12
- @gray: lighten(#000, 33.5%); // #555
13
- @gray-light: lighten(#000, 46.7%); // #777
14
- @gray-lighter: lighten(#000, 93.5%); // #eee
15
-
16
- @brand-primary: #428bca;
10
+ @gray-base: #000;
11
+ @gray-darker: lighten(@gray-base, 13.5%); // #222
12
+ @gray-dark: lighten(@gray-base, 20%); // #333
13
+ @gray: lighten(@gray-base, 33.5%); // #555
14
+ @gray-light: lighten(@gray-base, 46.7%); // #777
15
+ @gray-lighter: lighten(@gray-base, 93.5%); // #eee
16
+
17
+ @brand-primary: darken(#428bca, 6.5%);
17
18
  @brand-success: #5cb85c;
18
19
  @brand-info: #5bc0de;
19
20
  @brand-warning: #f0ad4e;
@@ -33,6 +34,8 @@
33
34
  @link-color: @brand-primary;
34
35
  //** Link hover color set via `darken()` function.
35
36
  @link-hover-color: darken(@link-color, 15%);
37
+ //** Link hover decoration.
38
+ @link-hover-decoration: underline;
36
39
 
37
40
 
38
41
  //== Typography
@@ -181,13 +184,20 @@
181
184
  @input-color: @gray;
182
185
  //** `<input>` border color
183
186
  @input-border: #ccc;
184
- //** `<input>` border radius
187
+
188
+ // TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
189
+ //** Default `.form-control` border radius
185
190
  @input-border-radius: @border-radius-base;
191
+ //** Large `.form-control` border radius
192
+ @input-border-radius-large: @border-radius-large;
193
+ //** Small `.form-control` border radius
194
+ @input-border-radius-small: @border-radius-small;
195
+
186
196
  //** Border color for inputs on focus
187
197
  @input-border-focus: #66afe9;
188
198
 
189
199
  //** Placeholder text color
190
- @input-color-placeholder: @gray-light;
200
+ @input-color-placeholder: #999;
191
201
 
192
202
  //** Default `.form-control` height
193
203
  @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@@ -204,6 +214,9 @@
204
214
  //** Border color for textual input addons
205
215
  @input-group-addon-border-color: @input-border;
206
216
 
217
+ //** Disabled cursor for form controls and buttons.
218
+ @cursor-disabled: not-allowed;
219
+
207
220
 
208
221
  //== Dropdowns
209
222
  //
@@ -252,8 +265,7 @@
252
265
  @zindex-popover: 1060;
253
266
  @zindex-tooltip: 1070;
254
267
  @zindex-navbar-fixed: 1030;
255
- @zindex-modal-background: 1040;
256
- @zindex-modal: 1050;
268
+ @zindex-modal: 1040;
257
269
 
258
270
 
259
271
  //== Media queries breakpoints
@@ -315,17 +327,17 @@
315
327
  //## Define the maximum width of `.container` for different screen sizes.
316
328
 
317
329
  // Small screen / tablet
318
- @container-tablet: ((720px + @grid-gutter-width));
330
+ @container-tablet: (720px + @grid-gutter-width);
319
331
  //** For `@screen-sm-min` and up.
320
332
  @container-sm: @container-tablet;
321
333
 
322
334
  // Medium screen / desktop
323
- @container-desktop: ((940px + @grid-gutter-width));
335
+ @container-desktop: (940px + @grid-gutter-width);
324
336
  //** For `@screen-md-min` and up.
325
337
  @container-md: @container-desktop;
326
338
 
327
339
  // Large screen / wide desktop
328
- @container-large-desktop: ((1140px + @grid-gutter-width));
340
+ @container-large-desktop: (1140px + @grid-gutter-width);
329
341
  //** For `@screen-lg-min` and up.
330
342
  @container-lg: @container-large-desktop;
331
343
 
@@ -368,12 +380,12 @@
368
380
 
369
381
  // Inverted navbar
370
382
  // Reset inverted navbar basics
371
- @navbar-inverse-color: @gray-light;
383
+ @navbar-inverse-color: lighten(@gray-light, 15%);
372
384
  @navbar-inverse-bg: #222;
373
385
  @navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
374
386
 
375
387
  // Inverted navbar links
376
- @navbar-inverse-link-color: @gray-light;
388
+ @navbar-inverse-link-color: lighten(@gray-light, 15%);
377
389
  @navbar-inverse-link-hover-color: #fff;
378
390
  @navbar-inverse-link-hover-bg: transparent;
379
391
  @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
@@ -403,8 +415,6 @@
403
415
  @nav-disabled-link-color: @gray-light;
404
416
  @nav-disabled-link-hover-color: @gray-light;
405
417
 
406
- @nav-open-link-hover-color: #fff;
407
-
408
418
  //== Tabs
409
419
  @nav-tabs-border-color: #ddd;
410
420
 
@@ -529,7 +539,7 @@
529
539
  //** Popover arrow width
530
540
  @popover-arrow-width: 10px;
531
541
  //** Popover arrow color
532
- @popover-arrow-color: #fff;
542
+ @popover-arrow-color: @popover-bg;
533
543
 
534
544
  //** Popover outer arrow width
535
545
  @popover-arrow-outer-width: (@popover-arrow-width + 1);
@@ -628,6 +638,8 @@
628
638
  @progress-bg: #f5f5f5;
629
639
  //** Progress bar text color
630
640
  @progress-bar-color: #fff;
641
+ //** Variable for setting rounded corners on progress bar.
642
+ @progress-border-radius: @border-radius-base;
631
643
 
632
644
  //** Default progress bar color
633
645
  @progress-bar-bg: @brand-primary;
@@ -843,4 +855,3 @@
843
855
  //** Horizontal line color.
844
856
  @hr-border: @gray-lighter;
845
857
 
846
-
@@ -1,3 +1,3 @@
1
1
  module BootstrapOnRails
2
- VERSION = "3.2.0"
2
+ VERSION = "3.3.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-on-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0
4
+ version: 3.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Torres
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-03 00:00:00.000000000 Z
11
+ date: 2014-12-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: less-rails