twitter-bootswatch-rails 3.0.3.0 → 3.1.0.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 +34 -23
  3. data/app/assets/javascripts/twitter/bootstrap/alert.js +5 -15
  4. data/app/assets/javascripts/twitter/bootstrap/button.js +21 -29
  5. data/app/assets/javascripts/twitter/bootstrap/carousel.js +16 -28
  6. data/app/assets/javascripts/twitter/bootstrap/collapse.js +7 -16
  7. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +19 -26
  8. data/app/assets/javascripts/twitter/bootstrap/modal.js +25 -28
  9. data/app/assets/javascripts/twitter/bootstrap/popover.js +14 -21
  10. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +16 -21
  11. data/app/assets/javascripts/twitter/bootstrap/tab.js +7 -17
  12. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +52 -39
  13. data/app/assets/javascripts/twitter/bootstrap/transition.js +11 -19
  14. data/lib/generators/bootswatch/install/templates/loader.js.tt +1 -1
  15. data/lib/generators/bootswatch/install/templates/mixins.less.tt +130 -49
  16. data/lib/generators/bootswatch/install/templates/variables.less.tt +346 -161
  17. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  18. data/vendor/toolkit/twitter/bootstrap/badges.less +4 -0
  19. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +4 -1
  20. data/vendor/toolkit/twitter/bootstrap/button-groups.less +10 -11
  21. data/vendor/toolkit/twitter/bootstrap/buttons.less +8 -8
  22. data/vendor/toolkit/twitter/bootstrap/code.less +10 -0
  23. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +28 -2
  24. data/vendor/toolkit/twitter/bootstrap/forms.less +82 -38
  25. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +1 -5
  26. data/vendor/toolkit/twitter/bootstrap/grid.less +26 -5
  27. data/vendor/toolkit/twitter/bootstrap/input-groups.less +39 -18
  28. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +3 -5
  29. data/vendor/toolkit/twitter/bootstrap/list-group.less +25 -3
  30. data/vendor/toolkit/twitter/bootstrap/mixins.less +130 -49
  31. data/vendor/toolkit/twitter/bootstrap/modals.less +16 -7
  32. data/vendor/toolkit/twitter/bootstrap/navbar.less +24 -20
  33. data/vendor/toolkit/twitter/bootstrap/navs.less +2 -2
  34. data/vendor/toolkit/twitter/bootstrap/normalize.less +139 -122
  35. data/vendor/toolkit/twitter/bootstrap/pager.less +5 -5
  36. data/vendor/toolkit/twitter/bootstrap/pagination.less +6 -3
  37. data/vendor/toolkit/twitter/bootstrap/panels.less +64 -16
  38. data/vendor/toolkit/twitter/bootstrap/print.less +0 -4
  39. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +13 -129
  40. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +17 -2
  41. data/vendor/toolkit/twitter/bootstrap/tables.less +3 -1
  42. data/vendor/toolkit/twitter/bootstrap/theme.less +1 -1
  43. data/vendor/toolkit/twitter/bootstrap/tooltip.less +1 -1
  44. data/vendor/toolkit/twitter/bootstrap/type.less +78 -63
  45. data/vendor/toolkit/twitter/bootstrap/variables.less +346 -161
  46. data/vendor/toolkit/twitter/bootstrap/wells.less +1 -1
  47. metadata +2 -3
  48. data/lib/generators/bootswatch/import/import_generator.rb +0 -49
@@ -22,7 +22,12 @@
22
22
  right: 0;
23
23
  bottom: 0;
24
24
  left: 0;
25
- z-index: @zindex-modal-background;
25
+ z-index: @zindex-modal;
26
+ -webkit-overflow-scrolling: touch;
27
+
28
+ // Prevent Chrome on Windows from adding a focus outline. For details, see
29
+ // https://github.com/twbs/bootstrap/pull/10951.
30
+ outline: 0;
26
31
 
27
32
  // When fading in the modal, animate it to slide down
28
33
  &.fade .modal-dialog {
@@ -37,7 +42,6 @@
37
42
  position: relative;
38
43
  width: auto;
39
44
  margin: 10px;
40
- z-index: (@zindex-modal-background + 10);
41
45
  }
42
46
 
43
47
  // Actual modal
@@ -60,11 +64,11 @@
60
64
  right: 0;
61
65
  bottom: 0;
62
66
  left: 0;
63
- z-index: (@zindex-modal-background - 10);
67
+ z-index: @zindex-modal-background;
64
68
  background-color: @modal-backdrop-bg;
65
69
  // Fade for backdrop
66
70
  &.fade { .opacity(0); }
67
- &.in { .opacity(.5); }
71
+ &.in { .opacity(@modal-backdrop-opacity); }
68
72
  }
69
73
 
70
74
  // Modal header
@@ -98,7 +102,7 @@
98
102
  padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;
99
103
  text-align: right; // right align buttons
100
104
  border-top: 1px solid @modal-footer-border-color;
101
- .clearfix(); // clear it in case folks use .pull-* classes on buttons
105
+ &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons
102
106
 
103
107
  // Properly space out buttons
104
108
  .btn + .btn {
@@ -116,14 +120,19 @@
116
120
  }
117
121
 
118
122
  // Scale up the modal
119
- @media screen and (min-width: @screen-sm-min) {
123
+ @media (min-width: @screen-sm-min) {
120
124
 
125
+ // Automatically set modal's width for larger viewports
121
126
  .modal-dialog {
122
- width: 600px;
127
+ width: @modal-md;
123
128
  margin: 30px auto;
124
129
  }
125
130
  .modal-content {
126
131
  .box-shadow(0 5px 15px rgba(0,0,0,.5));
127
132
  }
128
133
 
134
+ // Modal sizes
135
+ .modal-sm { width: @modal-sm; }
136
+ .modal-lg { width: @modal-lg; }
137
+
129
138
  }
@@ -15,7 +15,7 @@
15
15
  border: 1px solid transparent;
16
16
 
17
17
  // Prevent floats from breaking the navbar
18
- .clearfix();
18
+ &:extend(.clearfix all);
19
19
 
20
20
  @media (min-width: @grid-float-breakpoint) {
21
21
  border-radius: @navbar-border-radius;
@@ -29,7 +29,7 @@
29
29
  // styling of responsive aspects.
30
30
 
31
31
  .navbar-header {
32
- .clearfix();
32
+ &:extend(.clearfix all);
33
33
 
34
34
  @media (min-width: @grid-float-breakpoint) {
35
35
  float: left;
@@ -48,13 +48,13 @@
48
48
  // content for the user's viewport.
49
49
 
50
50
  .navbar-collapse {
51
- max-height: 340px;
51
+ max-height: @navbar-collapse-max-height;
52
52
  overflow-x: visible;
53
53
  padding-right: @navbar-padding-horizontal;
54
54
  padding-left: @navbar-padding-horizontal;
55
55
  border-top: 1px solid transparent;
56
56
  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
57
- .clearfix();
57
+ &:extend(.clearfix all);
58
58
  -webkit-overflow-scrolling: touch;
59
59
 
60
60
  &.in {
@@ -93,14 +93,17 @@
93
93
  //
94
94
  // When a container is present, change the behavior of the header and collapse.
95
95
 
96
- .container > .navbar-header,
97
- .container > .navbar-collapse {
98
- margin-right: -@navbar-padding-horizontal;
99
- margin-left: -@navbar-padding-horizontal;
96
+ .container,
97
+ .container-fluid {
98
+ > .navbar-header,
99
+ > .navbar-collapse {
100
+ margin-right: -@navbar-padding-horizontal;
101
+ margin-left: -@navbar-padding-horizontal;
100
102
 
101
- @media (min-width: @grid-float-breakpoint) {
102
- margin-right: 0;
103
- margin-left: 0;
103
+ @media (min-width: @grid-float-breakpoint) {
104
+ margin-right: 0;
105
+ margin-left: 0;
106
+ }
104
107
  }
105
108
  }
106
109
 
@@ -152,6 +155,7 @@
152
155
  padding: @navbar-padding-vertical @navbar-padding-horizontal;
153
156
  font-size: @font-size-large;
154
157
  line-height: @line-height-computed;
158
+ height: @line-height-computed;
155
159
 
156
160
  &:hover,
157
161
  &:focus {
@@ -159,7 +163,8 @@
159
163
  }
160
164
 
161
165
  @media (min-width: @grid-float-breakpoint) {
162
- .navbar > .container & {
166
+ .navbar > .container &,
167
+ .navbar > .container-fluid & {
163
168
  margin-left: -@navbar-padding-horizontal;
164
169
  }
165
170
  }
@@ -182,6 +187,12 @@
182
187
  border: 1px solid transparent;
183
188
  border-radius: @border-radius-base;
184
189
 
190
+ // We remove the `outline` here, but later compensate by attaching `:hover`
191
+ // styles to `:focus`.
192
+ &:focus {
193
+ outline: none;
194
+ }
195
+
185
196
  // Bars
186
197
  .icon-bar {
187
198
  display: block;
@@ -201,7 +212,7 @@
201
212
 
202
213
  // Navbar nav links
203
214
  //
204
- // Builds on top of the `.nav` components with it's own modifier class to make
215
+ // Builds on top of the `.nav` components with its own modifier class to make
205
216
  // the nav the full height of the horizontal nav (above 768px).
206
217
 
207
218
  .navbar-nav {
@@ -325,13 +336,6 @@
325
336
  .border-bottom-radius(0);
326
337
  }
327
338
 
328
- // Right aligned menus need alt position
329
- .navbar-nav.pull-right > li > .dropdown-menu,
330
- .navbar-nav > li > .dropdown-menu.pull-right {
331
- left: auto;
332
- right: 0;
333
- }
334
-
335
339
 
336
340
  // Buttons in navbars
337
341
  //
@@ -10,7 +10,7 @@
10
10
  margin-bottom: 0;
11
11
  padding-left: 0; // Override default ul/ol
12
12
  list-style: none;
13
- .clearfix();
13
+ &:extend(.clearfix all);
14
14
 
15
15
  > li {
16
16
  position: relative;
@@ -91,7 +91,7 @@
91
91
  }
92
92
  }
93
93
 
94
- // Active state, and it's :hover to override normal :hover
94
+ // Active state, and its :hover to override normal :hover
95
95
  &.active > a {
96
96
  &,
97
97
  &:hover,
@@ -1,6 +1,25 @@
1
- /*! normalize.css v2.1.3 | MIT License | git.io/normalize */
1
+ /*! normalize.css v3.0.0 | MIT License | git.io/normalize */
2
+
3
+ //
4
+ // 1. Set default font family to sans-serif.
5
+ // 2. Prevent iOS text size adjust after orientation change, without disabling
6
+ // user zoom.
7
+ //
8
+
9
+ html {
10
+ font-family: sans-serif; // 1
11
+ -ms-text-size-adjust: 100%; // 2
12
+ -webkit-text-size-adjust: 100%; // 2
13
+ }
14
+
15
+ //
16
+ // Remove default margin.
17
+ //
18
+
19
+ body {
20
+ margin: 0;
21
+ }
2
22
 
3
- // ==========================================================================
4
23
  // HTML5 display definitions
5
24
  // ==========================================================================
6
25
 
@@ -24,13 +43,16 @@ summary {
24
43
  }
25
44
 
26
45
  //
27
- // Correct `inline-block` display not defined in IE 8/9.
46
+ // 1. Correct `inline-block` display not defined in IE 8/9.
47
+ // 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
28
48
  //
29
49
 
30
50
  audio,
31
51
  canvas,
52
+ progress,
32
53
  video {
33
- display: inline-block;
54
+ display: inline-block; // 1
55
+ vertical-align: baseline; // 2
34
56
  }
35
57
 
36
58
  //
@@ -53,31 +75,6 @@ template {
53
75
  display: none;
54
76
  }
55
77
 
56
- // ==========================================================================
57
- // Base
58
- // ==========================================================================
59
-
60
- //
61
- // 1. Set default font family to sans-serif.
62
- // 2. Prevent iOS text size adjust after orientation change, without disabling
63
- // user zoom.
64
- //
65
-
66
- html {
67
- font-family: sans-serif; // 1
68
- -ms-text-size-adjust: 100%; // 2
69
- -webkit-text-size-adjust: 100%; // 2
70
- }
71
-
72
- //
73
- // Remove default margin.
74
- //
75
-
76
- body {
77
- margin: 0;
78
- }
79
-
80
- // ==========================================================================
81
78
  // Links
82
79
  // ==========================================================================
83
80
 
@@ -89,14 +86,6 @@ a {
89
86
  background: transparent;
90
87
  }
91
88
 
92
- //
93
- // Address `outline` inconsistency between Chrome and other browsers.
94
- //
95
-
96
- a:focus {
97
- outline: thin dotted;
98
- }
99
-
100
89
  //
101
90
  // Improve readability when focused and also mouse hovered in all browsers.
102
91
  //
@@ -106,19 +95,8 @@ a:hover {
106
95
  outline: 0;
107
96
  }
108
97
 
98
+ // Text-level semantics
109
99
  // ==========================================================================
110
- // Typography
111
- // ==========================================================================
112
-
113
- //
114
- // Address variable `h1` font-size and margin within `section` and `article`
115
- // contexts in Firefox 4+, Safari 5, and Chrome.
116
- //
117
-
118
- h1 {
119
- font-size: 2em;
120
- margin: 0.67em 0;
121
- }
122
100
 
123
101
  //
124
102
  // Address styling not present in IE 8/9, Safari 5, and Chrome.
@@ -146,13 +124,13 @@ dfn {
146
124
  }
147
125
 
148
126
  //
149
- // Address differences between Firefox and other browsers.
127
+ // Address variable `h1` font-size and margin within `section` and `article`
128
+ // contexts in Firefox 4+, Safari 5, and Chrome.
150
129
  //
151
130
 
152
- hr {
153
- -moz-box-sizing: content-box;
154
- box-sizing: content-box;
155
- height: 0;
131
+ h1 {
132
+ font-size: 2em;
133
+ margin: 0.67em 0;
156
134
  }
157
135
 
158
136
  //
@@ -164,34 +142,6 @@ mark {
164
142
  color: #000;
165
143
  }
166
144
 
167
- //
168
- // Correct font family set oddly in Safari 5 and Chrome.
169
- //
170
-
171
- code,
172
- kbd,
173
- pre,
174
- samp {
175
- font-family: monospace, serif;
176
- font-size: 1em;
177
- }
178
-
179
- //
180
- // Improve readability of pre-formatted text in all browsers.
181
- //
182
-
183
- pre {
184
- white-space: pre-wrap;
185
- }
186
-
187
- //
188
- // Set consistent quote types.
189
- //
190
-
191
- q {
192
- quotes: "\201C" "\201D" "\2018" "\2019";
193
- }
194
-
195
145
  //
196
146
  // Address inconsistent and variable font size in all browsers.
197
147
  //
@@ -220,7 +170,6 @@ sub {
220
170
  bottom: -0.25em;
221
171
  }
222
172
 
223
- // ==========================================================================
224
173
  // Embedded content
225
174
  // ==========================================================================
226
175
 
@@ -240,8 +189,7 @@ svg:not(:root) {
240
189
  overflow: hidden;
241
190
  }
242
191
 
243
- // ==========================================================================
244
- // Figures
192
+ // Grouping content
245
193
  // ==========================================================================
246
194
 
247
195
  //
@@ -249,63 +197,77 @@ svg:not(:root) {
249
197
  //
250
198
 
251
199
  figure {
252
- margin: 0;
200
+ margin: 1em 40px;
253
201
  }
254
202
 
255
- // ==========================================================================
256
- // Forms
257
- // ==========================================================================
203
+ //
204
+ // Address differences between Firefox and other browsers.
205
+ //
206
+
207
+ hr {
208
+ -moz-box-sizing: content-box;
209
+ box-sizing: content-box;
210
+ height: 0;
211
+ }
258
212
 
259
213
  //
260
- // Define consistent border, margin, and padding.
214
+ // Contain overflow in all browsers.
261
215
  //
262
216
 
263
- fieldset {
264
- border: 1px solid #c0c0c0;
265
- margin: 0 2px;
266
- padding: 0.35em 0.625em 0.75em;
217
+ pre {
218
+ overflow: auto;
267
219
  }
268
220
 
269
221
  //
270
- // 1. Correct `color` not being inherited in IE 8/9.
271
- // 2. Remove padding so people aren't caught out if they zero out fieldsets.
222
+ // Address odd `em`-unit font size rendering in all browsers.
272
223
  //
273
224
 
274
- legend {
275
- border: 0; // 1
276
- padding: 0; // 2
225
+ code,
226
+ kbd,
227
+ pre,
228
+ samp {
229
+ font-family: monospace, monospace;
230
+ font-size: 1em;
277
231
  }
278
232
 
233
+ // Forms
234
+ // ==========================================================================
235
+
236
+ //
237
+ // Known limitation: by default, Chrome and Safari on OS X allow very limited
238
+ // styling of `select`, unless a `border` property is set.
239
+ //
240
+
279
241
  //
280
- // 1. Correct font family not being inherited in all browsers.
281
- // 2. Correct font size not being inherited in all browsers.
242
+ // 1. Correct color not being inherited.
243
+ // Known issue: affects color of disabled elements.
244
+ // 2. Correct font properties not being inherited.
282
245
  // 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
283
246
  //
284
247
 
285
248
  button,
286
249
  input,
250
+ optgroup,
287
251
  select,
288
252
  textarea {
289
- font-family: inherit; // 1
290
- font-size: 100%; // 2
253
+ color: inherit; // 1
254
+ font: inherit; // 2
291
255
  margin: 0; // 3
292
256
  }
293
257
 
294
258
  //
295
- // Address Firefox 4+ setting `line-height` on `input` using `!important` in
296
- // the UA stylesheet.
259
+ // Address `overflow` set to `hidden` in IE 8/9/10.
297
260
  //
298
261
 
299
- button,
300
- input {
301
- line-height: normal;
262
+ button {
263
+ overflow: visible;
302
264
  }
303
265
 
304
266
  //
305
267
  // Address inconsistent `text-transform` inheritance for `button` and `select`.
306
268
  // All other form control elements do not inherit `text-transform` values.
307
- // Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
308
- // Correct `select` style inheritance in Firefox 4+ and Opera.
269
+ // Correct `button` style inheritance in Firefox, IE 8+, and Opera
270
+ // Correct `select` style inheritance in Firefox.
309
271
  //
310
272
 
311
273
  button,
@@ -338,6 +300,28 @@ html input[disabled] {
338
300
  cursor: default;
339
301
  }
340
302
 
303
+ //
304
+ // Remove inner padding and border in Firefox 4+.
305
+ //
306
+
307
+ button::-moz-focus-inner,
308
+ input::-moz-focus-inner {
309
+ border: 0;
310
+ padding: 0;
311
+ }
312
+
313
+ //
314
+ // Address Firefox 4+ setting `line-height` on `input` using `!important` in
315
+ // the UA stylesheet.
316
+ //
317
+
318
+ input {
319
+ line-height: normal;
320
+ }
321
+
322
+ //
323
+ // It's recommended that you don't attempt to style these elements.
324
+ // Firefox's implementation doesn't respect box-sizing, padding, or width.
341
325
  //
342
326
  // 1. Address box sizing set to `content-box` in IE 8/9/10.
343
327
  // 2. Remove excess padding in IE 8/9/10.
@@ -349,6 +333,17 @@ input[type="radio"] {
349
333
  padding: 0; // 2
350
334
  }
351
335
 
336
+ //
337
+ // Fix the cursor style for Chrome's increment/decrement buttons. For certain
338
+ // `font-size` values of the `input`, it causes the cursor style of the
339
+ // decrement button to change from `default` to `text`.
340
+ //
341
+
342
+ input[type="number"]::-webkit-inner-spin-button,
343
+ input[type="number"]::-webkit-outer-spin-button {
344
+ height: auto;
345
+ }
346
+
352
347
  //
353
348
  // 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
354
349
  // 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
@@ -363,8 +358,9 @@ input[type="search"] {
363
358
  }
364
359
 
365
360
  //
366
- // Remove inner padding and search cancel button in Safari 5 and Chrome
367
- // on OS X.
361
+ // Remove inner padding and search cancel button in Safari and Chrome on OS X.
362
+ // Safari (but not Chrome) clips the cancel button when the search input has
363
+ // padding (and `textfield` appearance).
368
364
  //
369
365
 
370
366
  input[type="search"]::-webkit-search-cancel-button,
@@ -373,26 +369,42 @@ input[type="search"]::-webkit-search-decoration {
373
369
  }
374
370
 
375
371
  //
376
- // Remove inner padding and border in Firefox 4+.
372
+ // Define consistent border, margin, and padding.
377
373
  //
378
374
 
379
- button::-moz-focus-inner,
380
- input::-moz-focus-inner {
381
- border: 0;
382
- padding: 0;
375
+ fieldset {
376
+ border: 1px solid #c0c0c0;
377
+ margin: 0 2px;
378
+ padding: 0.35em 0.625em 0.75em;
383
379
  }
384
380
 
385
381
  //
386
- // 1. Remove default vertical scrollbar in IE 8/9.
387
- // 2. Improve readability and alignment in all browsers.
382
+ // 1. Correct `color` not being inherited in IE 8/9.
383
+ // 2. Remove padding so people aren't caught out if they zero out fieldsets.
384
+ //
385
+
386
+ legend {
387
+ border: 0; // 1
388
+ padding: 0; // 2
389
+ }
390
+
391
+ //
392
+ // Remove default vertical scrollbar in IE 8/9.
388
393
  //
389
394
 
390
395
  textarea {
391
- overflow: auto; // 1
392
- vertical-align: top; // 2
396
+ overflow: auto;
397
+ }
398
+
399
+ //
400
+ // Don't inherit the `font-weight` (applied by a rule above).
401
+ // NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
402
+ //
403
+
404
+ optgroup {
405
+ font-weight: bold;
393
406
  }
394
407
 
395
- // ==========================================================================
396
408
  // Tables
397
409
  // ==========================================================================
398
410
 
@@ -404,3 +416,8 @@ table {
404
416
  border-collapse: collapse;
405
417
  border-spacing: 0;
406
418
  }
419
+
420
+ td,
421
+ th {
422
+ padding: 0;
423
+ }