less-rails-bootstrap 3.3.4.0 → 3.3.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/twitter/bootstrap/affix.js +3 -3
  3. data/app/assets/javascripts/twitter/bootstrap/alert.js +2 -2
  4. data/app/assets/javascripts/twitter/bootstrap/button.js +13 -9
  5. data/app/assets/javascripts/twitter/bootstrap/carousel.js +2 -2
  6. data/app/assets/javascripts/twitter/bootstrap/collapse.js +2 -2
  7. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +46 -42
  8. data/app/assets/javascripts/twitter/bootstrap/modal.js +5 -7
  9. data/app/assets/javascripts/twitter/bootstrap/popover.js +2 -2
  10. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  11. data/app/assets/javascripts/twitter/bootstrap/tab.js +5 -3
  12. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +58 -20
  13. data/app/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  14. data/app/frameworks/twitter/bootstrap/badges.less +1 -1
  15. data/app/frameworks/twitter/bootstrap/bootstrap.less +6 -0
  16. data/app/frameworks/twitter/bootstrap/button-groups.less +3 -2
  17. data/app/frameworks/twitter/bootstrap/buttons.less +11 -5
  18. data/app/frameworks/twitter/bootstrap/carousel.less +2 -2
  19. data/app/frameworks/twitter/bootstrap/dropdowns.less +3 -1
  20. data/app/frameworks/twitter/bootstrap/forms.less +44 -11
  21. data/app/frameworks/twitter/bootstrap/input-groups.less +1 -0
  22. data/app/frameworks/twitter/bootstrap/jumbotron.less +5 -3
  23. data/app/frameworks/twitter/bootstrap/list-group.less +9 -3
  24. data/app/frameworks/twitter/bootstrap/media.less +5 -0
  25. data/app/frameworks/twitter/bootstrap/mixins.less +1 -0
  26. data/app/frameworks/twitter/bootstrap/mixins/background-variant.less +2 -1
  27. data/app/frameworks/twitter/bootstrap/mixins/buttons.less +18 -2
  28. data/app/frameworks/twitter/bootstrap/mixins/grid-framework.less +2 -2
  29. data/app/frameworks/twitter/bootstrap/mixins/grid.less +2 -2
  30. data/app/frameworks/twitter/bootstrap/mixins/hide-text.less +1 -1
  31. data/app/frameworks/twitter/bootstrap/mixins/list-group.less +2 -1
  32. data/app/frameworks/twitter/bootstrap/mixins/pagination.less +2 -1
  33. data/app/frameworks/twitter/bootstrap/mixins/reset-text.less +18 -0
  34. data/app/frameworks/twitter/bootstrap/mixins/responsive-visibility.less +1 -1
  35. data/app/frameworks/twitter/bootstrap/mixins/text-emphasis.less +2 -1
  36. data/app/frameworks/twitter/bootstrap/normalize.less +8 -11
  37. data/app/frameworks/twitter/bootstrap/pagination.less +3 -2
  38. data/app/frameworks/twitter/bootstrap/panels.less +6 -0
  39. data/app/frameworks/twitter/bootstrap/popovers.less +4 -8
  40. data/app/frameworks/twitter/bootstrap/print.less +0 -6
  41. data/app/frameworks/twitter/bootstrap/scaffolding.less +0 -1
  42. data/app/frameworks/twitter/bootstrap/theme.less +23 -5
  43. data/app/frameworks/twitter/bootstrap/tooltip.less +4 -5
  44. data/app/frameworks/twitter/bootstrap/variables.less +7 -1
  45. data/less-rails-bootstrap.gemspec +2 -2
  46. data/lib/less/rails/bootstrap/version.rb +1 -1
  47. data/test/cases/generators/custom_bootstrap_generator_test.rb +1 -1
  48. metadata +5 -4
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: transition.js v3.3.4
2
+ * Bootstrap: transition.js v3.3.5
3
3
  * http://getbootstrap.com/javascript/#transitions
4
4
  * ========================================================================
5
5
  * Copyright 2011-2015 Twitter, Inc.
@@ -12,7 +12,7 @@
12
12
  font-weight: @badge-font-weight;
13
13
  color: @badge-color;
14
14
  line-height: @badge-line-height;
15
- vertical-align: baseline;
15
+ vertical-align: middle;
16
16
  white-space: nowrap;
17
17
  text-align: center;
18
18
  background-color: @badge-bg;
@@ -1,3 +1,9 @@
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
+ */
6
+
1
7
  // Core variables and mixins
2
8
  @import "variables.less";
3
9
  @import "mixins.less";
@@ -36,6 +36,7 @@
36
36
  margin-left: -5px; // Offset the first child's margin
37
37
  &:extend(.clearfix all);
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
  .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
  .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
- .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
20
+ .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base);
21
21
  .user-select(none);
22
22
 
23
23
  &,
@@ -47,10 +47,16 @@
47
47
  &[disabled],
48
48
  fieldset[disabled] & {
49
49
  cursor: @cursor-disabled;
50
- pointer-events: none; // Future-proof disabling of clicks
51
50
  .opacity(.65);
52
51
  .box-shadow(none);
53
52
  }
53
+
54
+ a& {
55
+ &.disabled,
56
+ fieldset[disabled] & {
57
+ pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
58
+ }
59
+ }
54
60
  }
55
61
 
56
62
 
@@ -126,14 +132,14 @@
126
132
 
127
133
  .btn-lg {
128
134
  // line-height: ensure even-numbered height of button next to large input
129
- .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
135
+ .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large);
130
136
  }
131
137
  .btn-sm {
132
138
  // line-height: ensure proper height of button next to small input
133
- .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
139
+ .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
134
140
  }
135
141
  .btn-xs {
136
- .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
142
+ .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
137
143
  }
138
144
 
139
145
 
@@ -29,7 +29,7 @@
29
29
  @media all and (transform-3d), (-webkit-transform-3d) {
30
30
  .transition-transform(~'0.6s ease-in-out');
31
31
  .backface-visibility(~'hidden');
32
- .perspective(1000);
32
+ .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
  }
@@ -175,13 +174,17 @@ input[type="search"] {
175
174
  // text within the input to become vertically misaligned. As a workaround, we
176
175
  // set a pixel line-height that matches the given height of the input, but only
177
176
  // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
177
+ //
178
+ // Note that as of 8.3, iOS doesn't support `datetime` or `week`.
178
179
 
179
180
  @media screen and (-webkit-min-device-pixel-ratio: 0) {
180
181
  input[type="date"],
181
182
  input[type="time"],
182
183
  input[type="datetime-local"],
183
184
  input[type="month"] {
184
- line-height: @input-height-base;
185
+ &.form-control {
186
+ line-height: @input-height-base;
187
+ }
185
188
 
186
189
  &.input-sm,
187
190
  .input-group-sm & {
@@ -322,14 +325,26 @@ input[type="checkbox"] {
322
325
  }
323
326
  .form-group-sm {
324
327
  .form-control {
325
- .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
326
- }
327
- .form-control-static {
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
 
@@ -338,14 +353,26 @@ input[type="checkbox"] {
338
353
  }
339
354
  .form-group-lg {
340
355
  .form-control {
341
- .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
342
- }
343
- .form-control-static {
344
356
  height: @input-height-large;
345
357
  padding: @padding-large-vertical @padding-large-horizontal;
346
358
  font-size: @font-size-large;
347
359
  line-height: @line-height-large;
360
+ border-radius: @input-border-radius-large;
361
+ }
362
+ select.form-control {
363
+ height: @input-height-large;
364
+ line-height: @input-height-large;
365
+ }
366
+ textarea.form-control,
367
+ select[multiple].form-control {
368
+ height: auto;
369
+ }
370
+ .form-control-static {
371
+ height: @input-height-large;
348
372
  min-height: (@line-height-computed + @font-size-large);
373
+ padding: (@padding-large-vertical + 1) @padding-large-horizontal;
374
+ font-size: @font-size-large;
375
+ line-height: @line-height-large;
349
376
  }
350
377
  }
351
378
 
@@ -376,12 +403,16 @@ input[type="checkbox"] {
376
403
  text-align: center;
377
404
  pointer-events: none;
378
405
  }
379
- .input-lg + .form-control-feedback {
406
+ .input-lg + .form-control-feedback,
407
+ .input-group-lg + .form-control-feedback,
408
+ .form-group-lg .form-control + .form-control-feedback {
380
409
  width: @input-height-large;
381
410
  height: @input-height-large;
382
411
  line-height: @input-height-large;
383
412
  }
384
- .input-sm + .form-control-feedback {
413
+ .input-sm + .form-control-feedback,
414
+ .input-group-sm + .form-control-feedback,
415
+ .form-group-sm .form-control + .form-control-feedback {
385
416
  width: @input-height-small;
386
417
  height: @input-height-small;
387
418
  line-height: @input-height-small;
@@ -550,7 +581,7 @@ input[type="checkbox"] {
550
581
  // Reposition the icon because it's now within a grid column and columns have
551
582
  // `position: relative;` on them. Also accounts for the grid gutter padding.
552
583
  .has-feedback .form-control-feedback {
553
- right: (@grid-gutter-width / 2);
584
+ right: floor((@grid-gutter-width / 2));
554
585
  }
555
586
 
556
587
  // Form group sizes
@@ -561,6 +592,7 @@ input[type="checkbox"] {
561
592
  @media (min-width: @screen-sm-min) {
562
593
  .control-label {
563
594
  padding-top: ((@padding-large-vertical * @line-height-large) + 1);
595
+ font-size: @font-size-large;
564
596
  }
565
597
  }
566
598
  }
@@ -568,6 +600,7 @@ input[type="checkbox"] {
568
600
  @media (min-width: @screen-sm-min) {
569
601
  .control-label {
570
602
  padding-top: (@padding-small-vertical + 1);
603
+ font-size: @font-size-small;
571
604
  }
572
605
  }
573
606
  }
@@ -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.less";
12
12
  @import "mixins/size.less";
13
13
  @import "mixins/tab-focus.less";
14
+ @import "mixins/reset-text.less";
14
15
  @import "mixins/text-emphasis.less";
15
16
  @import "mixins/text-overflow.less";
16
17
  @import "mixins/vendor-prefixes.less";
@@ -2,7 +2,8 @@
2
2
 
3
3
  .bg-variant(@color) {
4
4
  background-color: @color;
5
- a&:hover {
5
+ a&:hover,
6
+ a&:focus {
6
7
  background-color: darken(@color, 10%);
7
8
  }
8
9
  }
@@ -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,
@@ -19,8 +19,8 @@
19
19
  // Prevent columns from collapsing when empty
20
20
  min-height: 1px;
21
21
  // Inner gutter via padding
22
- padding-left: (@grid-gutter-width / 2);
23
- padding-right: (@grid-gutter-width / 2);
22
+ padding-left: ceil((@grid-gutter-width / 2));
23
+ padding-right: floor((@grid-gutter-width / 2));
24
24
  }
25
25
  }
26
26
  .col(1); // kickstart it
@@ -13,8 +13,8 @@
13
13
 
14
14
  // Creates a wrapper for a series of columns
15
15
  .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
  &:extend(.clearfix all);
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,7 +5,8 @@
5
5
  color: @color;
6
6
  background-color: @background;
7
7
 
8
- a& {
8
+ a&,
9
+ button& {
9
10
  color: @color;
10
11
 
11
12
  .list-group-item-heading {
@@ -1,11 +1,12 @@
1
1
  // Pagination
2
2
 
3
- .pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
3
+ .pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
4
4
  > li {
5
5
  > a,
6
6
  > span {
7
7
  padding: @padding-vertical @padding-horizontal;
8
8
  font-size: @font-size;
9
+ line-height: @line-height;
9
10
  }
10
11
  &:first-child {
11
12
  > a,