twitter-bootswatch-rails 3.0.2.0 → 3.0.3.0

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 (39) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/twitter/bootstrap/affix.js +1 -1
  3. data/app/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  4. data/app/assets/javascripts/twitter/bootstrap/button.js +11 -5
  5. data/app/assets/javascripts/twitter/bootstrap/carousel.js +5 -5
  6. data/app/assets/javascripts/twitter/bootstrap/collapse.js +1 -1
  7. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +5 -5
  8. data/app/assets/javascripts/twitter/bootstrap/modal.js +1 -1
  9. data/app/assets/javascripts/twitter/bootstrap/popover.js +1 -1
  10. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  11. data/app/assets/javascripts/twitter/bootstrap/tab.js +1 -1
  12. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +1 -1
  13. data/app/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  14. data/lib/generators/bootswatch/import/import_generator.rb +1 -1
  15. data/lib/generators/bootswatch/install/templates/mixins.less.tt +37 -50
  16. data/lib/generators/bootswatch/install/templates/variables.less.tt +15 -10
  17. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  18. data/vendor/toolkit/twitter/bootstrap/badges.less +6 -6
  19. data/vendor/toolkit/twitter/bootstrap/button-groups.less +7 -33
  20. data/vendor/toolkit/twitter/bootstrap/buttons.less +2 -5
  21. data/vendor/toolkit/twitter/bootstrap/carousel.less +1 -0
  22. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +3 -8
  23. data/vendor/toolkit/twitter/bootstrap/forms.less +11 -0
  24. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +5 -5
  25. data/vendor/toolkit/twitter/bootstrap/grid.less +12 -26
  26. data/vendor/toolkit/twitter/bootstrap/input-groups.less +1 -1
  27. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +8 -2
  28. data/vendor/toolkit/twitter/bootstrap/labels.less +6 -0
  29. data/vendor/toolkit/twitter/bootstrap/mixins.less +37 -50
  30. data/vendor/toolkit/twitter/bootstrap/modals.less +2 -5
  31. data/vendor/toolkit/twitter/bootstrap/navbar.less +41 -53
  32. data/vendor/toolkit/twitter/bootstrap/navs.less +0 -20
  33. data/vendor/toolkit/twitter/bootstrap/panels.less +11 -1
  34. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +0 -12
  35. data/vendor/toolkit/twitter/bootstrap/tables.less +17 -22
  36. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +9 -3
  37. data/vendor/toolkit/twitter/bootstrap/type.less +54 -52
  38. data/vendor/toolkit/twitter/bootstrap/variables.less +15 -10
  39. metadata +3 -3
@@ -35,10 +35,8 @@
35
35
  // Shell div to position the modal with bottom padding
36
36
  .modal-dialog {
37
37
  position: relative;
38
- margin-left: auto;
39
- margin-right: auto;
40
38
  width: auto;
41
- padding: 10px;
39
+ margin: 10px;
42
40
  z-index: (@zindex-modal-background + 10);
43
41
  }
44
42
 
@@ -122,8 +120,7 @@
122
120
 
123
121
  .modal-dialog {
124
122
  width: 600px;
125
- padding-top: 30px;
126
- padding-bottom: 30px;
123
+ margin: 30px auto;
127
124
  }
128
125
  .modal-content {
129
126
  .box-shadow(0 5px 15px rgba(0,0,0,.5));
@@ -74,18 +74,16 @@
74
74
  }
75
75
 
76
76
  &.in {
77
- overflow-y: auto;
77
+ overflow-y: visible;
78
78
  }
79
79
 
80
- // Account for first and last children spacing
81
- .navbar-nav.navbar-left:first-child {
82
- margin-left: -@navbar-padding-horizontal;
83
- }
84
- .navbar-nav.navbar-right:last-child {
85
- margin-right: -@navbar-padding-horizontal;
86
- }
87
- .navbar-text:last-child {
88
- margin-right: 0;
80
+ // Undo the collapse side padding for navbars with containers to ensure
81
+ // alignment of right-aligned contents.
82
+ .navbar-fixed-top &,
83
+ .navbar-static-top &,
84
+ .navbar-fixed-bottom & {
85
+ padding-left: 0;
86
+ padding-right: 0;
89
87
  }
90
88
  }
91
89
  }
@@ -180,6 +178,7 @@
180
178
  padding: 9px 10px;
181
179
  .navbar-vertical-align(34px);
182
180
  background-color: transparent;
181
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
183
182
  border: 1px solid transparent;
184
183
  border-radius: @border-radius-base;
185
184
 
@@ -214,7 +213,7 @@
214
213
  line-height: @line-height-computed;
215
214
  }
216
215
 
217
- @media (max-width: @screen-xs-max) {
216
+ @media (max-width: @grid-float-breakpoint-max) {
218
217
  // Dropdowns get custom display when collapsed
219
218
  .open .dropdown-menu {
220
219
  position: static;
@@ -246,12 +245,15 @@
246
245
  > li {
247
246
  float: left;
248
247
  > a {
249
- padding-top: ((@navbar-height - @line-height-computed) / 2);
250
- padding-bottom: ((@navbar-height - @line-height-computed) / 2);
248
+ padding-top: @navbar-padding-vertical;
249
+ padding-bottom: @navbar-padding-vertical;
251
250
  }
252
251
  }
253
- }
254
252
 
253
+ &.navbar-right:last-child {
254
+ margin-right: -@navbar-padding-horizontal;
255
+ }
256
+ }
255
257
  }
256
258
 
257
259
 
@@ -285,7 +287,7 @@
285
287
  .form-inline();
286
288
 
287
289
  .form-group {
288
- @media (max-width: @screen-xs-max) {
290
+ @media (max-width: @grid-float-breakpoint-max) {
289
291
  margin-bottom: 5px;
290
292
  }
291
293
  }
@@ -302,6 +304,11 @@
302
304
  padding-top: 0;
303
305
  padding-bottom: 0;
304
306
  .box-shadow(none);
307
+
308
+ // Outdent the form if last child to line up with content down the page
309
+ &.navbar-right:last-child {
310
+ margin-right: -@navbar-padding-horizontal;
311
+ }
305
312
  }
306
313
  }
307
314
 
@@ -332,6 +339,13 @@
332
339
 
333
340
  .navbar-btn {
334
341
  .navbar-vertical-align(@input-height-base);
342
+
343
+ &.btn-sm {
344
+ .navbar-vertical-align(@input-height-small);
345
+ }
346
+ &.btn-xs {
347
+ .navbar-vertical-align(22);
348
+ }
335
349
  }
336
350
 
337
351
 
@@ -340,12 +354,17 @@
340
354
  // Add a class to make any element properly align itself vertically within the navbars.
341
355
 
342
356
  .navbar-text {
343
- float: left;
344
357
  .navbar-vertical-align(@line-height-computed);
345
358
 
346
359
  @media (min-width: @grid-float-breakpoint) {
360
+ float: left;
347
361
  margin-left: @navbar-padding-horizontal;
348
362
  margin-right: @navbar-padding-horizontal;
363
+
364
+ // Outdent the form if last child to line up with content down the page
365
+ &.navbar-right:last-child {
366
+ margin-right: 0;
367
+ }
349
368
  }
350
369
  }
351
370
 
@@ -414,15 +433,8 @@
414
433
  border-color: @navbar-default-border;
415
434
  }
416
435
 
417
- // Dropdown menu items and carets
436
+ // Dropdown menu items
418
437
  .navbar-nav {
419
- // Caret should match text color on hover
420
- > .dropdown > a:hover .caret,
421
- > .dropdown > a:focus .caret {
422
- border-top-color: @navbar-default-link-hover-color;
423
- border-bottom-color: @navbar-default-link-hover-color;
424
- }
425
-
426
438
  // Remove background color from open dropdown
427
439
  > .open > a {
428
440
  &,
@@ -430,19 +442,10 @@
430
442
  &:focus {
431
443
  background-color: @navbar-default-link-active-bg;
432
444
  color: @navbar-default-link-active-color;
433
- .caret {
434
- border-top-color: @navbar-default-link-active-color;
435
- border-bottom-color: @navbar-default-link-active-color;
436
- }
437
445
  }
438
446
  }
439
- > .dropdown > a .caret {
440
- border-top-color: @navbar-default-link-color;
441
- border-bottom-color: @navbar-default-link-color;
442
- }
443
-
444
447
 
445
- @media (max-width: @screen-xs-max) {
448
+ @media (max-width: @grid-float-breakpoint-max) {
446
449
  // Dropdowns get custom display when collapsed
447
450
  .open .dropdown-menu {
448
451
  > li > a {
@@ -561,31 +564,16 @@
561
564
  color: @navbar-inverse-link-active-color;
562
565
  }
563
566
  }
564
- > .dropdown > a:hover .caret {
565
- border-top-color: @navbar-inverse-link-hover-color;
566
- border-bottom-color: @navbar-inverse-link-hover-color;
567
- }
568
- > .dropdown > a .caret {
569
- border-top-color: @navbar-inverse-link-color;
570
- border-bottom-color: @navbar-inverse-link-color;
571
- }
572
- > .open > a {
573
- &,
574
- &:hover,
575
- &:focus {
576
- .caret {
577
- border-top-color: @navbar-inverse-link-active-color;
578
- border-bottom-color: @navbar-inverse-link-active-color;
579
- }
580
- }
581
- }
582
567
 
583
- @media (max-width: @screen-xs-max) {
568
+ @media (max-width: @grid-float-breakpoint-max) {
584
569
  // Dropdowns get custom display
585
570
  .open .dropdown-menu {
586
571
  > .dropdown-header {
587
572
  border-color: @navbar-inverse-border;
588
573
  }
574
+ .divider {
575
+ background-color: @navbar-inverse-border;
576
+ }
589
577
  > li > a {
590
578
  color: @navbar-inverse-link-color;
591
579
  &:hover,
@@ -48,11 +48,6 @@
48
48
  &:focus {
49
49
  background-color: @nav-link-hover-bg;
50
50
  border-color: @link-color;
51
-
52
- .caret {
53
- border-top-color: @link-hover-color;
54
- border-bottom-color: @link-hover-color;
55
- }
56
51
  }
57
52
  }
58
53
 
@@ -138,11 +133,6 @@
138
133
  &:focus {
139
134
  color: @nav-pills-active-link-hover-color;
140
135
  background-color: @nav-pills-active-link-hover-bg;
141
-
142
- .caret {
143
- border-top-color: @nav-pills-active-link-hover-color;
144
- border-bottom-color: @nav-pills-active-link-hover-color;
145
- }
146
136
  }
147
137
  }
148
138
  }
@@ -243,16 +233,6 @@
243
233
  // Dropdowns
244
234
  // -------------------------
245
235
 
246
- // Make dropdown carets use link color in navs
247
- .nav .caret {
248
- border-top-color: @link-color;
249
- border-bottom-color: @link-color;
250
- }
251
- .nav a:hover .caret {
252
- border-top-color: @link-hover-color;
253
- border-bottom-color: @link-hover-color;
254
- }
255
-
256
236
  // Specific dropdowns
257
237
  .nav-tabs .dropdown-menu {
258
238
  // make dropdown border overlap tab border
@@ -57,13 +57,17 @@
57
57
 
58
58
  .panel {
59
59
  > .table,
60
- > .table-responsive {
60
+ > .table-responsive > .table {
61
61
  margin-bottom: 0;
62
62
  }
63
63
  > .panel-body + .table,
64
64
  > .panel-body + .table-responsive {
65
65
  border-top: 1px solid @table-border-color;
66
66
  }
67
+ > .table > tbody:first-child th,
68
+ > .table > tbody:first-child td {
69
+ border-top: 0;
70
+ }
67
71
  > .table-bordered,
68
72
  > .table-responsive > .table-bordered {
69
73
  border: 0;
@@ -87,6 +91,10 @@
87
91
  }
88
92
  }
89
93
  }
94
+ > .table-responsive {
95
+ border: 0;
96
+ margin-bottom: 0;
97
+ }
90
98
  }
91
99
 
92
100
 
@@ -106,6 +114,8 @@
106
114
  margin-top: 0;
107
115
  margin-bottom: 0;
108
116
  font-size: ceil((@font-size-base * 1.125));
117
+ color: inherit;
118
+
109
119
  > a {
110
120
  color: inherit;
111
121
  }
@@ -12,18 +12,6 @@
12
12
  to { background-position: 0 0; }
13
13
  }
14
14
 
15
- // Firefox
16
- @-moz-keyframes progress-bar-stripes {
17
- from { background-position: 40px 0; }
18
- to { background-position: 0 0; }
19
- }
20
-
21
- // Opera
22
- @-o-keyframes progress-bar-stripes {
23
- from { background-position: 0 0; }
24
- to { background-position: 40px 0; }
25
- }
26
-
27
15
  // Spec and IE10+
28
16
  @keyframes progress-bar-stripes {
29
17
  from { background-position: 40px 0; }
@@ -104,10 +104,12 @@ th {
104
104
  //
105
105
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
106
106
 
107
- .table-striped > tbody > tr:nth-child(odd) {
108
- > td,
109
- > th {
110
- background-color: @table-bg-accent;
107
+ .table-striped {
108
+ > tbody > tr:nth-child(odd) {
109
+ > td,
110
+ > th {
111
+ background-color: @table-bg-accent;
112
+ }
111
113
  }
112
114
  }
113
115
 
@@ -116,10 +118,12 @@ th {
116
118
  //
117
119
  // Placed here since it has to come after the potential zebra striping
118
120
 
119
- .table-hover > tbody > tr:hover {
120
- > td,
121
- > th {
122
- background-color: @table-bg-hover;
121
+ .table-hover {
122
+ > tbody > tr:hover {
123
+ > td,
124
+ > th {
125
+ background-color: @table-bg-hover;
126
+ }
123
127
  }
124
128
  }
125
129
 
@@ -129,6 +133,7 @@ th {
129
133
  // Reset default table behavior
130
134
 
131
135
  table col[class*="col-"] {
136
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
132
137
  float: none;
133
138
  display: table-column;
134
139
  }
@@ -148,21 +153,11 @@ table {
148
153
  // Exact selectors below required to override `.table-striped` and prevent
149
154
  // inheritance to nested tables.
150
155
 
151
- .table > thead > tr,
152
- .table > tbody > tr,
153
- .table > tfoot > tr {
154
- > td.active,
155
- > th.active,
156
- &.active > td,
157
- &.active > th {
158
- background-color: @table-bg-active;
159
- }
160
- }
161
-
162
156
  // Generate the contextual variants
163
- .table-row-variant(success; @state-success-bg; @state-success-border);
164
- .table-row-variant(danger; @state-danger-bg; @state-danger-border);
165
- .table-row-variant(warning; @state-warning-bg; @state-warning-border);
157
+ .table-row-variant(active; @table-bg-active);
158
+ .table-row-variant(success; @state-success-bg);
159
+ .table-row-variant(danger; @state-danger-bg);
160
+ .table-row-variant(warning; @state-warning-bg);
166
161
 
167
162
 
168
163
  // Responsive tables
@@ -5,11 +5,17 @@
5
5
 
6
6
  // Mixin and adjust the regular image class
7
7
  .thumbnail {
8
- .img-thumbnail();
9
- display: block; // Override the inline-block from `.img-thumbnail`
8
+ display: block;
9
+ padding: @thumbnail-padding;
10
10
  margin-bottom: @line-height-computed;
11
+ line-height: @line-height-base;
12
+ background-color: @thumbnail-bg;
13
+ border: 1px solid @thumbnail-border;
14
+ border-radius: @thumbnail-border-radius;
15
+ .transition(all .2s ease-in-out);
11
16
 
12
- > img {
17
+ > img,
18
+ a > img {
13
19
  .img-responsive();
14
20
  margin-left: auto;
15
21
  margin-right: auto;
@@ -3,12 +3,62 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // Headings
7
+ // -------------------------
8
+
9
+ h1, h2, h3, h4, h5, h6,
10
+ .h1, .h2, .h3, .h4, .h5, .h6 {
11
+ font-family: @headings-font-family;
12
+ font-weight: @headings-font-weight;
13
+ line-height: @headings-line-height;
14
+ color: @headings-color;
15
+
16
+ small,
17
+ .small {
18
+ font-weight: normal;
19
+ line-height: 1;
20
+ color: @headings-small-color;
21
+ }
22
+ }
23
+
24
+ h1,
25
+ h2,
26
+ h3 {
27
+ margin-top: @line-height-computed;
28
+ margin-bottom: (@line-height-computed / 2);
29
+
30
+ small,
31
+ .small {
32
+ font-size: 65%;
33
+ }
34
+ }
35
+ h4,
36
+ h5,
37
+ h6 {
38
+ margin-top: (@line-height-computed / 2);
39
+ margin-bottom: (@line-height-computed / 2);
40
+
41
+ small,
42
+ .small {
43
+ font-size: 75%;
44
+ }
45
+ }
46
+
47
+ h1, .h1 { font-size: @font-size-h1; }
48
+ h2, .h2 { font-size: @font-size-h2; }
49
+ h3, .h3 { font-size: @font-size-h3; }
50
+ h4, .h4 { font-size: @font-size-h4; }
51
+ h5, .h5 { font-size: @font-size-h5; }
52
+ h6, .h6 { font-size: @font-size-h6; }
53
+
54
+
6
55
  // Body text
7
56
  // -------------------------
8
57
 
9
58
  p {
10
59
  margin: 0 0 (@line-height-computed / 2);
11
60
  }
61
+
12
62
  .lead {
13
63
  margin-bottom: @line-height-computed;
14
64
  font-size: floor(@font-size-base * 1.15);
@@ -72,55 +122,6 @@ cite { font-style: normal; }
72
122
  .text-center { text-align: center; }
73
123
 
74
124
 
75
- // Headings
76
- // -------------------------
77
-
78
- h1, h2, h3, h4, h5, h6,
79
- .h1, .h2, .h3, .h4, .h5, .h6 {
80
- font-family: @headings-font-family;
81
- font-weight: @headings-font-weight;
82
- line-height: @headings-line-height;
83
- color: @headings-color;
84
-
85
- small,
86
- .small {
87
- font-weight: normal;
88
- line-height: 1;
89
- color: @headings-small-color;
90
- }
91
- }
92
-
93
- h1,
94
- h2,
95
- h3 {
96
- margin-top: @line-height-computed;
97
- margin-bottom: (@line-height-computed / 2);
98
-
99
- small,
100
- .small {
101
- font-size: 65%;
102
- }
103
- }
104
- h4,
105
- h5,
106
- h6 {
107
- margin-top: (@line-height-computed / 2);
108
- margin-bottom: (@line-height-computed / 2);
109
-
110
- small,
111
- .small {
112
- font-size: 75%;
113
- }
114
- }
115
-
116
- h1, .h1 { font-size: @font-size-h1; }
117
- h2, .h2 { font-size: @font-size-h2; }
118
- h3, .h3 { font-size: @font-size-h3; }
119
- h4, .h4 { font-size: @font-size-h4; }
120
- h5, .h5 { font-size: @font-size-h5; }
121
- h6, .h6 { font-size: @font-size-h6; }
122
-
123
-
124
125
  // Page header
125
126
  // -------------------------
126
127
 
@@ -131,7 +132,6 @@ h6, .h6 { font-size: @font-size-h6; }
131
132
  }
132
133
 
133
134
 
134
-
135
135
  // Lists
136
136
  // --------------------------------------------------
137
137
 
@@ -171,6 +171,7 @@ ol {
171
171
 
172
172
  // Description Lists
173
173
  dl {
174
+ margin-top: 0; // Remove browser default
174
175
  margin-bottom: @line-height-computed;
175
176
  }
176
177
  dt,
@@ -215,7 +216,7 @@ abbr[data-original-title] {
215
216
  cursor: help;
216
217
  border-bottom: 1px dotted @abbr-border-color;
217
218
  }
218
- abbr.initialism {
219
+ .initialism {
219
220
  font-size: 90%;
220
221
  text-transform: uppercase;
221
222
  }
@@ -233,7 +234,8 @@ blockquote {
233
234
  p:last-child {
234
235
  margin-bottom: 0;
235
236
  }
236
- small {
237
+ small,
238
+ .small {
237
239
  display: block;
238
240
  line-height: @line-height-base;
239
241
  color: @blockquote-small-color;