bootstrap-sass 3.0.0.0 → 3.0.1.0.rc

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bootstrap-sass/version.rb +2 -2
  3. data/tasks/converter.rb +16 -773
  4. data/tasks/converter/char_string_scanner.rb +38 -0
  5. data/tasks/converter/fonts_conversion.rb +12 -0
  6. data/tasks/converter/js_conversion.rb +22 -0
  7. data/tasks/converter/less_conversion.rb +612 -0
  8. data/tasks/converter/logger.rb +64 -0
  9. data/tasks/converter/network.rb +110 -0
  10. data/test/compilation_test.rb +5 -1
  11. data/test/dummy/app/views/pages/root.html.slim +10 -2
  12. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  13. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +200 -199
  14. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  15. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  16. data/vendor/assets/javascripts/bootstrap/affix.js +2 -2
  17. data/vendor/assets/javascripts/bootstrap/alert.js +1 -1
  18. data/vendor/assets/javascripts/bootstrap/button.js +1 -1
  19. data/vendor/assets/javascripts/bootstrap/carousel.js +2 -2
  20. data/vendor/assets/javascripts/bootstrap/collapse.js +2 -2
  21. data/vendor/assets/javascripts/bootstrap/dropdown.js +2 -2
  22. data/vendor/assets/javascripts/bootstrap/modal.js +2 -2
  23. data/vendor/assets/javascripts/bootstrap/popover.js +2 -2
  24. data/vendor/assets/javascripts/bootstrap/scrollspy.js +2 -2
  25. data/vendor/assets/javascripts/bootstrap/tab.js +3 -3
  26. data/vendor/assets/javascripts/bootstrap/tooltip.js +2 -2
  27. data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
  28. data/vendor/assets/stylesheets/bootstrap/_alerts.scss +1 -1
  29. data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +2 -2
  30. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +6 -1
  31. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +2 -4
  32. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +32 -10
  33. data/vendor/assets/stylesheets/bootstrap/_code.scss +5 -8
  34. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +1 -2
  35. data/vendor/assets/stylesheets/bootstrap/_forms.scss +16 -3
  36. data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +16 -11
  37. data/vendor/assets/stylesheets/bootstrap/_grid.scss +32 -285
  38. data/vendor/assets/stylesheets/bootstrap/_input-groups.scss +9 -0
  39. data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +2 -2
  40. data/vendor/assets/stylesheets/bootstrap/_list-group.scss +15 -17
  41. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +160 -29
  42. data/vendor/assets/stylesheets/bootstrap/_modals.scss +2 -16
  43. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +10 -7
  44. data/vendor/assets/stylesheets/bootstrap/_navs.scss +53 -20
  45. data/vendor/assets/stylesheets/bootstrap/_normalize.scss +16 -6
  46. data/vendor/assets/stylesheets/bootstrap/_pagination.scss +2 -0
  47. data/vendor/assets/stylesheets/bootstrap/_panels.scss +31 -7
  48. data/vendor/assets/stylesheets/bootstrap/_print.scss +6 -1
  49. data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +4 -7
  50. data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +57 -68
  51. data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +1 -12
  52. data/vendor/assets/stylesheets/bootstrap/_tables.scss +40 -40
  53. data/vendor/assets/stylesheets/bootstrap/_theme.scss +26 -11
  54. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +6 -6
  55. data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +8 -8
  56. data/vendor/assets/stylesheets/bootstrap/_type.scss +71 -30
  57. data/vendor/assets/stylesheets/bootstrap/_utilities.scss +15 -1
  58. data/vendor/assets/stylesheets/bootstrap/_variables.scss +56 -39
  59. data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +0 -10
  60. metadata +9 -3
@@ -9,6 +9,9 @@
9
9
  .clearfix {
10
10
  @include clearfix();
11
11
  }
12
+ .center-block {
13
+ @include center-block();
14
+ }
12
15
  .pull-right {
13
16
  float: right !important;
14
17
  }
@@ -20,6 +23,7 @@
20
23
  // Toggling content
21
24
  // -------------------------
22
25
 
26
+ // Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
23
27
  .hide {
24
28
  display: none !important;
25
29
  }
@@ -30,7 +34,17 @@
30
34
  visibility: hidden;
31
35
  }
32
36
  .text-hide {
33
- @include hide-text();
37
+ @include text-hide();
38
+ }
39
+
40
+
41
+ // Hide from screenreaders and browsers
42
+ //
43
+ // Credit: HTML5 Boilerplate
44
+
45
+ .hidden {
46
+ display: none !important;
47
+ visibility: hidden !important;
34
48
  }
35
49
 
36
50
 
@@ -48,12 +48,21 @@ $font-size-base: 14px !default;
48
48
  $font-size-large: ceil($font-size-base * 1.25) !default; // ~18px
49
49
  $font-size-small: ceil($font-size-base * 0.85) !default; // ~12px
50
50
 
51
+ $font-size-h1: floor($font-size-base * 2.6) !default; // ~36px
52
+ $font-size-h2: floor($font-size-base * 2.15) !default; // ~30px
53
+ $font-size-h3: ceil($font-size-base * 1.7) !default; // ~24px
54
+ $font-size-h4: ceil($font-size-base * 1.25) !default; // ~18px
55
+ $font-size-h5: $font-size-base !default;
56
+ $font-size-h6: ceil($font-size-base * 0.85) !default; // ~12px
57
+
51
58
  $line-height-base: 1.428571429 !default; // 20/14
52
59
  $line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
53
60
 
54
61
  $headings-font-family: $font-family-base !default;
55
62
  $headings-font-weight: 500 !default;
56
63
  $headings-line-height: 1.1 !default;
64
+ $headings-color: inherit !default;
65
+
57
66
 
58
67
  // Iconography
59
68
  // -------------------------
@@ -82,6 +91,7 @@ $border-radius-base: 4px !default;
82
91
  $border-radius-large: 6px !default;
83
92
  $border-radius-small: 3px !default;
84
93
 
94
+ $component-active-color: #fff !default;
85
95
  $component-active-bg: $brand-primary !default;
86
96
 
87
97
  $caret-width-base: 4px !default;
@@ -165,12 +175,12 @@ $dropdown-border: rgba(0,0,0,.15) !default;
165
175
  $dropdown-fallback-border: #ccc !default;
166
176
  $dropdown-divider-bg: #e5e5e5 !default;
167
177
 
168
- $dropdown-link-active-color: #fff !default;
169
- $dropdown-link-active-bg: $component-active-bg !default;
170
-
171
178
  $dropdown-link-color: $gray-dark !default;
172
- $dropdown-link-hover-color: #fff !default;
173
- $dropdown-link-hover-bg: $dropdown-link-active-bg !default;
179
+ $dropdown-link-hover-color: darken($gray-dark, 5%) !default;
180
+ $dropdown-link-hover-bg: #f5f5f5 !default;
181
+
182
+ $dropdown-link-active-color: $component-active-color !default;
183
+ $dropdown-link-active-bg: $component-active-bg !default;
174
184
 
175
185
  $dropdown-link-disabled-color: $gray-light !default;
176
186
 
@@ -200,25 +210,33 @@ $zindex-modal: 1050 !default;
200
210
  // --------------------------------------------------
201
211
 
202
212
  // Extra small screen / phone
213
+ // Note: Deprecated $screen-xs and $screen-phone as of v3.0.1
203
214
  $screen-xs: 480px !default;
204
- $screen-phone: $screen-xs !default;
215
+ $screen-xs-min: $screen-xs !default;
216
+ $screen-phone: $screen-xs-min !default;
205
217
 
206
218
  // Small screen / tablet
219
+ // Note: Deprecated $screen-sm and $screen-tablet as of v3.0.1
207
220
  $screen-sm: 768px !default;
208
- $screen-tablet: $screen-sm !default;
221
+ $screen-sm-min: $screen-sm !default;
222
+ $screen-tablet: $screen-sm-min !default;
209
223
 
210
224
  // Medium screen / desktop
225
+ // Note: Deprecated $screen-md and $screen-desktop as of v3.0.1
211
226
  $screen-md: 992px !default;
212
- $screen-desktop: $screen-md !default;
227
+ $screen-md-min: $screen-md !default;
228
+ $screen-desktop: $screen-md-min !default;
213
229
 
214
230
  // Large screen / wide desktop
231
+ // Note: Deprecated $screen-lg and $screen-lg-desktop as of v3.0.1
215
232
  $screen-lg: 1200px !default;
216
- $screen-lg-desktop: $screen-lg !default;
233
+ $screen-lg-min: $screen-lg !default;
234
+ $screen-lg-desktop: $screen-lg-min !default;
217
235
 
218
236
  // So media queries don't overlap when required, provide a maximum
219
- $screen-xs-max: ($screen-sm - 1) !default;
220
- $screen-sm-max: ($screen-md - 1) !default;
221
- $screen-md-max: ($screen-lg - 1) !default;
237
+ $screen-xs-max: ($screen-sm-min - 1) !default;
238
+ $screen-sm-max: ($screen-md-min - 1) !default;
239
+ $screen-md-max: ($screen-lg-min - 1) !default;
222
240
 
223
241
 
224
242
  // Grid system
@@ -229,7 +247,7 @@ $grid-columns: 12 !default;
229
247
  // Padding, to be divided by two and applied to the left and right of all columns
230
248
  $grid-gutter-width: 30px !default;
231
249
  // Point at which the navbar stops collapsing
232
- $grid-float-breakpoint: $screen-tablet !default;
250
+ $grid-float-breakpoint: $screen-sm-min !default;
233
251
 
234
252
 
235
253
  // Navbar
@@ -238,13 +256,14 @@ $grid-float-breakpoint: $screen-tablet !default;
238
256
  // Basics of a navbar
239
257
  $navbar-height: 50px !default;
240
258
  $navbar-margin-bottom: $line-height-computed !default;
241
- $navbar-default-color: #777 !default;
242
- $navbar-default-bg: #f8f8f8 !default;
243
- $navbar-default-border: darken($navbar-default-bg, 6.5%) !default;
244
259
  $navbar-border-radius: $border-radius-base !default;
245
260
  $navbar-padding-horizontal: floor($grid-gutter-width / 2) !default;
246
261
  $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
247
262
 
263
+ $navbar-default-color: #777 !default;
264
+ $navbar-default-bg: #f8f8f8 !default;
265
+ $navbar-default-border: darken($navbar-default-bg, 6.5%) !default;
266
+
248
267
  // Navbar links
249
268
  $navbar-default-link-color: #777 !default;
250
269
  $navbar-default-link-hover-color: #333 !default;
@@ -256,7 +275,7 @@ $navbar-default-link-disabled-bg: transparent !default;
256
275
 
257
276
  // Navbar brand label
258
277
  $navbar-default-brand-color: $navbar-default-link-color !default;
259
- $navbar-default-brand-hover-color: darken($navbar-default-link-color, 10%) !default;
278
+ $navbar-default-brand-hover-color: darken($navbar-default-brand-color, 10%) !default;
260
279
  $navbar-default-brand-hover-bg: transparent !default;
261
280
 
262
281
  // Navbar toggle
@@ -286,13 +305,6 @@ $navbar-inverse-brand-color: $navbar-inverse-link-color !default;
286
305
  $navbar-inverse-brand-hover-color: #fff !default;
287
306
  $navbar-inverse-brand-hover-bg: transparent !default;
288
307
 
289
- // Inverted navbar search
290
- // Normal navbar needs no special styles or vars
291
- $navbar-inverse-search-bg: lighten($navbar-inverse-bg, 25%) !default;
292
- $navbar-inverse-search-bg-focus: #fff !default;
293
- $navbar-inverse-search-border: $navbar-inverse-bg !default;
294
- $navbar-inverse-search-placeholder-color: #ccc !default;
295
-
296
308
  // Inverted navbar toggle
297
309
  $navbar-inverse-toggle-hover-bg: #333 !default;
298
310
  $navbar-inverse-toggle-icon-bar-bg: #fff !default;
@@ -324,8 +336,9 @@ $nav-tabs-justified-link-border-color: #ddd !default;
324
336
  $nav-tabs-justified-active-link-border-color: $body-bg !default;
325
337
 
326
338
  // Pills
339
+ $nav-pills-border-radius: $border-radius-base !default;
327
340
  $nav-pills-active-link-hover-bg: $component-active-bg !default;
328
- $nav-pills-active-link-hover-color: #fff !default;
341
+ $nav-pills-active-link-hover-color: $component-active-color !default;
329
342
 
330
343
 
331
344
  // Pagination
@@ -355,21 +368,13 @@ $pager-disabled-color: $gray-light !default;
355
368
  $jumbotron-padding: 30px !default;
356
369
  $jumbotron-color: inherit !default;
357
370
  $jumbotron-bg: $gray-lighter !default;
358
-
359
371
  $jumbotron-heading-color: inherit !default;
372
+ $jumbotron-font-size: ceil($font-size-base * 1.5) !default;
360
373
 
361
374
 
362
375
  // Form states and alerts
363
376
  // -------------------------
364
377
 
365
- $state-warning-text: #c09853 !default;
366
- $state-warning-bg: #fcf8e3 !default;
367
- $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 3%) !default;
368
-
369
- $state-danger-text: #b94a48 !default;
370
- $state-danger-bg: #f2dede !default;
371
- $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 3%) !default;
372
-
373
378
  $state-success-text: #468847 !default;
374
379
  $state-success-bg: #dff0d8 !default;
375
380
  $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
@@ -378,6 +383,14 @@ $state-info-text: #3a87ad !default;
378
383
  $state-info-bg: #d9edf7 !default;
379
384
  $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
380
385
 
386
+ $state-warning-text: #c09853 !default;
387
+ $state-warning-bg: #fcf8e3 !default;
388
+ $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
389
+
390
+ $state-danger-text: #b94a48 !default;
391
+ $state-danger-bg: #f2dede !default;
392
+ $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
393
+
381
394
 
382
395
  // Tooltips
383
396
  // -------------------------
@@ -478,7 +491,7 @@ $list-group-border: #ddd !default;
478
491
  $list-group-border-radius: $border-radius-base !default;
479
492
 
480
493
  $list-group-hover-bg: #f5f5f5 !default;
481
- $list-group-active-color: #fff !default;
494
+ $list-group-active-color: $component-active-color !default;
482
495
  $list-group-active-bg: $component-active-bg !default;
483
496
  $list-group-active-border: $list-group-active-bg !default;
484
497
 
@@ -553,6 +566,7 @@ $badge-border-radius: 10px !default;
553
566
  $breadcrumb-bg: #f5f5f5 !default;
554
567
  $breadcrumb-color: #ccc !default;
555
568
  $breadcrumb-active-color: $gray-light !default;
569
+ $breadcrumb-separator: "/" !default;
556
570
 
557
571
 
558
572
  // Carousel
@@ -573,8 +587,8 @@ $carousel-caption-color: #fff !default;
573
587
 
574
588
  // Close
575
589
  // ------------------------
576
- $close-color: #000 !default;
577
590
  $close-font-weight: bold !default;
591
+ $close-color: #000 !default;
578
592
  $close-text-shadow: 0 1px 0 #fff !default;
579
593
 
580
594
 
@@ -611,10 +625,13 @@ $component-offset-horizontal: 180px !default;
611
625
  // --------------------------------------------------
612
626
 
613
627
  // Small screen / tablet
614
- $container-tablet: ((720px + $grid-gutter-width)) !default;
628
+ $container-tablet: ((720px + $grid-gutter-width)) !default;
629
+ $container-sm: $container-tablet !default;
615
630
 
616
631
  // Medium screen / desktop
617
- $container-desktop: ((940px + $grid-gutter-width)) !default;
632
+ $container-desktop: ((940px + $grid-gutter-width)) !default;
633
+ $container-md: $container-desktop !default;
618
634
 
619
635
  // Large screen / wide desktop
620
- $container-lg-desktop: ((1140px + $grid-gutter-width)) !default;
636
+ $container-large-desktop: ((1140px + $grid-gutter-width)) !default;
637
+ $container-lg: $container-large-desktop !default;
@@ -1,13 +1,3 @@
1
- /*!
2
- * Bootstrap v3.0.0
3
- *
4
- * Copyright 2013 Twitter, Inc
5
- * Licensed under the Apache License v2.0
6
- * http://www.apache.org/licenses/LICENSE-2.0
7
- *
8
- * Designed and built with all the love in the world by @mdo and @fat.
9
- */
10
-
11
1
  // Core variables and mixins
12
2
  @import "bootstrap/variables";
13
3
  @import "bootstrap/mixins";
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.0
4
+ version: 3.0.1.0.rc
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas McDonald
@@ -157,6 +157,12 @@ files:
157
157
  - lib/bootstrap-sass/sass_functions.rb
158
158
  - lib/bootstrap-sass/version.rb
159
159
  - tasks/converter.rb
160
+ - tasks/converter/char_string_scanner.rb
161
+ - tasks/converter/fonts_conversion.rb
162
+ - tasks/converter/js_conversion.rb
163
+ - tasks/converter/less_conversion.rb
164
+ - tasks/converter/logger.rb
165
+ - tasks/converter/network.rb
160
166
  - templates/project/_variables.scss.erb
161
167
  - templates/project/manifest.rb
162
168
  - templates/project/styles.scss
@@ -278,9 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
278
284
  version: '0'
279
285
  required_rubygems_version: !ruby/object:Gem::Requirement
280
286
  requirements:
281
- - - '>='
287
+ - - '>'
282
288
  - !ruby/object:Gem::Version
283
- version: '0'
289
+ version: 1.3.1
284
290
  requirements: []
285
291
  rubyforge_project:
286
292
  rubygems_version: 2.0.6