twitter-bootswatch-rails 3.2.0.0 → 3.3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot +0 -0
  3. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg +272 -213
  4. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  5. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff +0 -0
  6. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  7. data/app/assets/javascripts/twitter/bootstrap/affix.js +44 -24
  8. data/app/assets/javascripts/twitter/bootstrap/alert.js +7 -5
  9. data/app/assets/javascripts/twitter/bootstrap/button.js +17 -11
  10. data/app/assets/javascripts/twitter/bootstrap/carousel.js +31 -17
  11. data/app/assets/javascripts/twitter/bootstrap/collapse.js +70 -29
  12. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +21 -11
  13. data/app/assets/javascripts/twitter/bootstrap/modal.js +68 -24
  14. data/app/assets/javascripts/twitter/bootstrap/popover.js +4 -4
  15. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +13 -8
  16. data/app/assets/javascripts/twitter/bootstrap/tab.js +42 -17
  17. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +54 -39
  18. data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
  19. data/lib/generators/bootswatch/import/import_generator.rb +0 -4
  20. data/lib/generators/bootswatch/install/templates/variables.less.tt +33 -22
  21. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  22. data/vendor/toolkit/twitter/bootstrap/alerts.less +5 -0
  23. data/vendor/toolkit/twitter/bootstrap/badges.less +11 -1
  24. data/vendor/toolkit/twitter/bootstrap/button-groups.less +18 -15
  25. data/vendor/toolkit/twitter/bootstrap/buttons.less +8 -5
  26. data/vendor/toolkit/twitter/bootstrap/carousel.less +26 -0
  27. data/vendor/toolkit/twitter/bootstrap/close.less +1 -0
  28. data/vendor/toolkit/twitter/bootstrap/code.less +1 -0
  29. data/vendor/toolkit/twitter/bootstrap/component-animations.less +5 -2
  30. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +5 -6
  31. data/vendor/toolkit/twitter/bootstrap/forms.less +70 -44
  32. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +69 -1
  33. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +7 -5
  34. data/vendor/toolkit/twitter/bootstrap/list-group.less +1 -8
  35. data/vendor/toolkit/twitter/bootstrap/media.less +35 -30
  36. data/vendor/toolkit/twitter/bootstrap/mixins/buttons.less +2 -0
  37. data/vendor/toolkit/twitter/bootstrap/mixins/forms.less +5 -1
  38. data/vendor/toolkit/twitter/bootstrap/mixins/grid-framework.less +2 -2
  39. data/vendor/toolkit/twitter/bootstrap/mixins/image.less +0 -1
  40. data/vendor/toolkit/twitter/bootstrap/mixins/labels.less +1 -1
  41. data/vendor/toolkit/twitter/bootstrap/mixins/vendor-prefixes.less +6 -3
  42. data/vendor/toolkit/twitter/bootstrap/modals.less +3 -5
  43. data/vendor/toolkit/twitter/bootstrap/navbar.less +31 -25
  44. data/vendor/toolkit/twitter/bootstrap/navs.less +3 -1
  45. data/vendor/toolkit/twitter/bootstrap/normalize.less +5 -3
  46. data/vendor/toolkit/twitter/bootstrap/pager.less +1 -2
  47. data/vendor/toolkit/twitter/bootstrap/pagination.less +1 -1
  48. data/vendor/toolkit/twitter/bootstrap/panels.less +26 -4
  49. data/vendor/toolkit/twitter/bootstrap/popovers.less +6 -4
  50. data/vendor/toolkit/twitter/bootstrap/print.less +102 -96
  51. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +1 -19
  52. data/vendor/toolkit/twitter/bootstrap/responsive-embed.less +2 -1
  53. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +1 -1
  54. data/vendor/toolkit/twitter/bootstrap/tables.less +14 -13
  55. data/vendor/toolkit/twitter/bootstrap/theme.less +26 -11
  56. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +1 -1
  57. data/vendor/toolkit/twitter/bootstrap/tooltip.less +12 -4
  58. data/vendor/toolkit/twitter/bootstrap/type.less +0 -11
  59. data/vendor/toolkit/twitter/bootstrap/utilities.less +0 -1
  60. data/vendor/toolkit/twitter/bootstrap/variables.less +33 -22
  61. metadata +33 -14
@@ -4,7 +4,7 @@
4
4
 
5
5
 
6
6
  .jumbotron {
7
- padding: @jumbotron-padding;
7
+ padding: @jumbotron-padding (@jumbotron-padding / 2);
8
8
  margin-bottom: @jumbotron-padding;
9
9
  color: @jumbotron-color;
10
10
  background-color: @jumbotron-bg;
@@ -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;
@@ -23,7 +24,8 @@
23
24
  border-top-color: darken(@jumbotron-bg, 10%);
24
25
  }
25
26
 
26
- .container & {
27
+ .container &,
28
+ .container-fluid & {
27
29
  border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
28
30
  }
29
31
 
@@ -32,10 +34,10 @@
32
34
  }
33
35
 
34
36
  @media screen and (min-width: @screen-sm-min) {
35
- padding-top: (@jumbotron-padding * 1.6);
36
- padding-bottom: (@jumbotron-padding * 1.6);
37
+ padding: (@jumbotron-padding * 1.6) 0;
37
38
 
38
- .container & {
39
+ .container &,
40
+ .container-fluid & {
39
41
  padding-left: (@jumbotron-padding * 2);
40
42
  padding-right: (@jumbotron-padding * 2);
41
43
  }
@@ -35,14 +35,6 @@
35
35
  margin-bottom: 0;
36
36
  .border-bottom-radius(@list-group-border-radius);
37
37
  }
38
-
39
- // Align badges within list items
40
- > .badge {
41
- float: right;
42
- }
43
- > .badge + .badge {
44
- margin-right: 5px;
45
- }
46
38
  }
47
39
 
48
40
 
@@ -74,6 +66,7 @@ a.list-group-item {
74
66
  &.disabled:focus {
75
67
  background-color: @list-group-disabled-bg;
76
68
  color: @list-group-disabled-color;
69
+ cursor: @cursor-disabled;
77
70
 
78
71
  // Force color to inherit for custom content
79
72
  .list-group-item-heading {
@@ -1,54 +1,59 @@
1
- // Media objects
2
- // Source: http://stubbornella.org/content/?p=497
3
- // --------------------------------------------------
4
-
1
+ .media {
2
+ // Proper spacing between instances of .media
3
+ margin-top: 15px;
5
4
 
6
- // Common styles
7
- // -------------------------
5
+ &:first-child {
6
+ margin-top: 0;
7
+ }
8
+ }
8
9
 
9
- // Clear the floats
10
10
  .media,
11
11
  .media-body {
12
- overflow: hidden;
13
12
  zoom: 1;
13
+ overflow: hidden;
14
14
  }
15
15
 
16
- // Proper spacing between instances of .media
17
- .media,
18
- .media .media {
19
- margin-top: 15px;
20
- }
21
- .media:first-child {
22
- margin-top: 0;
16
+ .media-body {
17
+ width: 10000px;
23
18
  }
24
19
 
25
- // For images and videos, set to block
26
20
  .media-object {
27
21
  display: block;
28
22
  }
29
23
 
30
- // Reset margins on headings for tighter default spacing
31
- .media-heading {
32
- margin: 0 0 5px;
24
+ .media-right,
25
+ .media > .pull-right {
26
+ padding-left: 10px;
33
27
  }
34
28
 
29
+ .media-left,
30
+ .media > .pull-left {
31
+ padding-right: 10px;
32
+ }
35
33
 
36
- // Media image alignment
37
- // -------------------------
34
+ .media-left,
35
+ .media-right,
36
+ .media-body {
37
+ display: table-cell;
38
+ vertical-align: top;
39
+ }
38
40
 
39
- .media {
40
- > .pull-left {
41
- margin-right: 10px;
42
- }
43
- > .pull-right {
44
- margin-left: 10px;
45
- }
41
+ .media-middle {
42
+ vertical-align: middle;
46
43
  }
47
44
 
45
+ .media-bottom {
46
+ vertical-align: bottom;
47
+ }
48
48
 
49
- // Media list variation
50
- // -------------------------
49
+ // Reset margins on headings for tighter default spacing
50
+ .media-heading {
51
+ margin-top: 0;
52
+ margin-bottom: 5px;
53
+ }
51
54
 
55
+ // Media list variation
56
+ //
52
57
  // Undo default ul/ol styles
53
58
  .media-list {
54
59
  padding-left: 0;
@@ -10,6 +10,7 @@
10
10
 
11
11
  &:hover,
12
12
  &:focus,
13
+ &.focus,
13
14
  &:active,
14
15
  &.active,
15
16
  .open > .dropdown-toggle& {
@@ -28,6 +29,7 @@
28
29
  &,
29
30
  &:hover,
30
31
  &:focus,
32
+ &.focus,
31
33
  &:active,
32
34
  &.active {
33
35
  background-color: @background;
@@ -10,7 +10,11 @@
10
10
  .radio,
11
11
  .checkbox,
12
12
  .radio-inline,
13
- .checkbox-inline {
13
+ .checkbox-inline,
14
+ &.radio label,
15
+ &.checkbox label,
16
+ &.radio-inline label,
17
+ &.checkbox-inline label {
14
18
  color: @text-color;
15
19
  }
16
20
  // Set the border and box shadow on specific inputs to match
@@ -5,7 +5,7 @@
5
5
 
6
6
  .make-grid-columns() {
7
7
  // Common styles for all sizes of grid columns, widths 1-12
8
- .col(@index) when (@index = 1) { // initial
8
+ .col(@index) { // initial
9
9
  @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
10
10
  .col((@index + 1), @item);
11
11
  }
@@ -27,7 +27,7 @@
27
27
  }
28
28
 
29
29
  .float-grid-columns(@class) {
30
- .col(@index) when (@index = 1) { // initial
30
+ .col(@index) { // initial
31
31
  @item: ~".col-@{class}-@{index}";
32
32
  .col((@index + 1), @item);
33
33
  }
@@ -8,7 +8,6 @@
8
8
  // Keep images from scaling beyond the width of their parents.
9
9
  .img-responsive(@display: block) {
10
10
  display: @display;
11
- width: 100% \9; // Force IE10 and below to size SVG images correctly
12
11
  max-width: 100%; // Part 1: Set a maximum relative to the parent
13
12
  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
14
13
  }
@@ -2,7 +2,7 @@
2
2
 
3
3
  .label-variant(@color) {
4
4
  background-color: @color;
5
-
5
+
6
6
  &[href] {
7
7
  &:hover,
8
8
  &:focus {
@@ -99,9 +99,12 @@
99
99
 
100
100
  // Placeholder text
101
101
  .placeholder(@color: @input-color-placeholder) {
102
- &::-moz-placeholder { color: @color; // Firefox
103
- opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
104
- &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
102
+ // Firefox
103
+ &::-moz-placeholder {
104
+ color: @color;
105
+ opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
106
+ }
107
+ &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
105
108
  &::-webkit-input-placeholder { color: @color; } // Safari and Chrome
106
109
  }
107
110
 
@@ -30,10 +30,10 @@
30
30
 
31
31
  // When fading in the modal, animate it to slide down
32
32
  &.fade .modal-dialog {
33
- .translate3d(0, -25%, 0);
33
+ .translate(0, -25%);
34
34
  .transition-transform(~"0.3s ease-out");
35
35
  }
36
- &.in .modal-dialog { .translate3d(0, 0, 0) }
36
+ &.in .modal-dialog { .translate(0, 0) }
37
37
  }
38
38
  .modal-open .modal {
39
39
  overflow-x: hidden;
@@ -62,12 +62,10 @@
62
62
 
63
63
  // Modal background
64
64
  .modal-backdrop {
65
- position: fixed;
65
+ position: absolute;
66
66
  top: 0;
67
67
  right: 0;
68
- bottom: 0;
69
68
  left: 0;
70
- z-index: @zindex-modal-background;
71
69
  background-color: @modal-backdrop-bg;
72
70
  // Fade for backdrop
73
71
  &.fade { .opacity(0); }
@@ -67,6 +67,7 @@
67
67
 
68
68
  &.collapse {
69
69
  display: block !important;
70
+ visibility: visible !important;
70
71
  height: auto !important;
71
72
  padding-bottom: 0; // Override default setting
72
73
  overflow: visible !important;
@@ -92,7 +93,7 @@
92
93
  .navbar-collapse {
93
94
  max-height: @navbar-collapse-max-height;
94
95
 
95
- @media (max-width: @screen-xs-min) and (orientation: landscape) {
96
+ @media (max-device-width: @screen-xs-min) and (orientation: landscape) {
96
97
  max-height: 200px;
97
98
  }
98
99
  }
@@ -141,7 +142,6 @@
141
142
  right: 0;
142
143
  left: 0;
143
144
  z-index: @zindex-navbar-fixed;
144
- .translate3d(0, 0, 0);
145
145
 
146
146
  // Undo the rounded corners
147
147
  @media (min-width: @grid-float-breakpoint) {
@@ -173,6 +173,10 @@
173
173
  text-decoration: none;
174
174
  }
175
175
 
176
+ > img {
177
+ display: block;
178
+ }
179
+
176
180
  @media (min-width: @grid-float-breakpoint) {
177
181
  .navbar > .container &,
178
182
  .navbar > .container-fluid & {
@@ -271,26 +275,10 @@
271
275
  padding-bottom: @navbar-padding-vertical;
272
276
  }
273
277
  }
274
-
275
- &.navbar-right:last-child {
276
- margin-right: -@navbar-padding-horizontal;
277
- }
278
278
  }
279
279
  }
280
280
 
281
281
 
282
- // Component alignment
283
- //
284
- // Repurpose the pull utilities as their own navbar utilities to avoid specificity
285
- // issues with parents and chaining. Only do this when the navbar is uncollapsed
286
- // though so that navbar contents properly stack and align in mobile.
287
-
288
- @media (min-width: @grid-float-breakpoint) {
289
- .navbar-left { .pull-left(); }
290
- .navbar-right { .pull-right(); }
291
- }
292
-
293
-
294
282
  // Navbar form
295
283
  //
296
284
  // Extension of the `.form-inline` with some extra flavor for optimum display in
@@ -311,6 +299,10 @@
311
299
  .form-group {
312
300
  @media (max-width: @grid-float-breakpoint-max) {
313
301
  margin-bottom: 5px;
302
+
303
+ &:last-child {
304
+ margin-bottom: 0;
305
+ }
314
306
  }
315
307
  }
316
308
 
@@ -326,11 +318,6 @@
326
318
  padding-top: 0;
327
319
  padding-bottom: 0;
328
320
  .box-shadow(none);
329
-
330
- // Outdent the form if last child to line up with content down the page
331
- &.navbar-right:last-child {
332
- margin-right: -@navbar-padding-horizontal;
333
- }
334
321
  }
335
322
  }
336
323
 
@@ -344,6 +331,8 @@
344
331
  }
345
332
  // Menu position and menu caret support for dropups via extra dropup class
346
333
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
334
+ margin-bottom: 0;
335
+ .border-top-radius(@navbar-border-radius);
347
336
  .border-bottom-radius(0);
348
337
  }
349
338
 
@@ -375,14 +364,31 @@
375
364
  float: left;
376
365
  margin-left: @navbar-padding-horizontal;
377
366
  margin-right: @navbar-padding-horizontal;
367
+ }
368
+ }
369
+
378
370
 
379
- // Outdent the form if last child to line up with content down the page
380
- &.navbar-right:last-child {
371
+ // Component alignment
372
+ //
373
+ // Repurpose the pull utilities as their own navbar utilities to avoid specificity
374
+ // issues with parents and chaining. Only do this when the navbar is uncollapsed
375
+ // though so that navbar contents properly stack and align in mobile.
376
+ //
377
+ // Declared after the navbar components to ensure more specificity on the margins.
378
+
379
+ @media (min-width: @grid-float-breakpoint) {
380
+ .navbar-left { .pull-left(); }
381
+ .navbar-right {
382
+ .pull-right();
383
+ margin-right: -@navbar-padding-horizontal;
384
+
385
+ ~ .navbar-right {
381
386
  margin-right: 0;
382
387
  }
383
388
  }
384
389
  }
385
390
 
391
+
386
392
  // Alternate navbars
387
393
  // --------------------------------------------------
388
394
 
@@ -36,7 +36,7 @@
36
36
  color: @nav-disabled-link-hover-color;
37
37
  text-decoration: none;
38
38
  background-color: transparent;
39
- cursor: not-allowed;
39
+ cursor: @cursor-disabled;
40
40
  }
41
41
  }
42
42
  }
@@ -223,9 +223,11 @@
223
223
  .tab-content {
224
224
  > .tab-pane {
225
225
  display: none;
226
+ visibility: hidden;
226
227
  }
227
228
  > .active {
228
229
  display: block;
230
+ visibility: visible;
229
231
  }
230
232
  }
231
233
 
@@ -1,4 +1,4 @@
1
- /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
1
+ /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
2
2
 
3
3
  //
4
4
  // 1. Set default font family to sans-serif.
@@ -25,7 +25,8 @@ body {
25
25
 
26
26
  //
27
27
  // Correct `block` display not defined for any HTML5 element in IE 8/9.
28
- // Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
28
+ // Correct `block` display not defined for `details` or `summary` in IE 10/11
29
+ // and Firefox.
29
30
  // Correct `block` display not defined for `main` in IE 11.
30
31
  //
31
32
 
@@ -38,6 +39,7 @@ footer,
38
39
  header,
39
40
  hgroup,
40
41
  main,
42
+ menu,
41
43
  nav,
42
44
  section,
43
45
  summary {
@@ -85,7 +87,7 @@ template {
85
87
  //
86
88
 
87
89
  a {
88
- background: transparent;
90
+ background-color: transparent;
89
91
  }
90
92
 
91
93
  //
@@ -48,8 +48,7 @@
48
48
  > span {
49
49
  color: @pager-disabled-color;
50
50
  background-color: @pager-bg;
51
- cursor: not-allowed;
51
+ cursor: @cursor-disabled;
52
52
  }
53
53
  }
54
-
55
54
  }