bootstrap-generators 3.0.0.1 → 3.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +8 -8
  3. data/Rakefile +3 -7
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +57 -40
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +57 -40
  7. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +1 -1
  8. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +1 -1
  9. data/readme-template.md.erb +1 -1
  10. data/vendor/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  11. data/vendor/assets/fonts/glyphicons-halflings-regular.svg +200 -199
  12. data/vendor/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  13. data/vendor/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  14. data/vendor/assets/javascripts/bootstrap.js +5 -5
  15. data/vendor/assets/javascripts/bootstrap/affix.js +4 -4
  16. data/vendor/assets/javascripts/bootstrap/alert.js +3 -3
  17. data/vendor/assets/javascripts/bootstrap/button.js +3 -3
  18. data/vendor/assets/javascripts/bootstrap/carousel.js +4 -4
  19. data/vendor/assets/javascripts/bootstrap/collapse.js +4 -4
  20. data/vendor/assets/javascripts/bootstrap/dropdown.js +4 -4
  21. data/vendor/assets/javascripts/bootstrap/modal.js +4 -4
  22. data/vendor/assets/javascripts/bootstrap/popover.js +4 -4
  23. data/vendor/assets/javascripts/bootstrap/scrollspy.js +4 -4
  24. data/vendor/assets/javascripts/bootstrap/tab.js +5 -5
  25. data/vendor/assets/javascripts/bootstrap/tooltip.js +4 -4
  26. data/vendor/assets/javascripts/bootstrap/transition.js +3 -3
  27. data/vendor/assets/stylesheets/bootstrap.css +1039 -746
  28. data/vendor/twitter/bootstrap/less/alerts.less +1 -1
  29. data/vendor/twitter/bootstrap/less/bootstrap.less +0 -10
  30. data/vendor/twitter/bootstrap/less/breadcrumbs.less +2 -2
  31. data/vendor/twitter/bootstrap/less/button-groups.less +6 -1
  32. data/vendor/twitter/bootstrap/less/buttons.less +2 -4
  33. data/vendor/twitter/bootstrap/less/carousel.less +32 -10
  34. data/vendor/twitter/bootstrap/less/code.less +5 -8
  35. data/vendor/twitter/bootstrap/less/dropdowns.less +1 -2
  36. data/vendor/twitter/bootstrap/less/forms.less +21 -10
  37. data/vendor/twitter/bootstrap/less/glyphicons.less +20 -15
  38. data/vendor/twitter/bootstrap/less/grid.less +32 -285
  39. data/vendor/twitter/bootstrap/less/input-groups.less +9 -0
  40. data/vendor/twitter/bootstrap/less/jumbotron.less +2 -2
  41. data/vendor/twitter/bootstrap/less/list-group.less +12 -12
  42. data/vendor/twitter/bootstrap/less/mixins.less +164 -29
  43. data/vendor/twitter/bootstrap/less/modals.less +2 -11
  44. data/vendor/twitter/bootstrap/less/navbar.less +10 -7
  45. data/vendor/twitter/bootstrap/less/navs.less +53 -20
  46. data/vendor/twitter/bootstrap/less/normalize.less +16 -6
  47. data/vendor/twitter/bootstrap/less/pagination.less +2 -0
  48. data/vendor/twitter/bootstrap/less/panels.less +31 -7
  49. data/vendor/twitter/bootstrap/less/print.less +6 -1
  50. data/vendor/twitter/bootstrap/less/progress-bars.less +4 -7
  51. data/vendor/twitter/bootstrap/less/responsive-utilities.less +57 -68
  52. data/vendor/twitter/bootstrap/less/scaffolding.less +1 -12
  53. data/vendor/twitter/bootstrap/less/tables.less +40 -40
  54. data/vendor/twitter/bootstrap/less/theme.less +32 -17
  55. data/vendor/twitter/bootstrap/less/thumbnails.less +14 -15
  56. data/vendor/twitter/bootstrap/less/tooltip.less +8 -8
  57. data/vendor/twitter/bootstrap/less/type.less +71 -30
  58. data/vendor/twitter/bootstrap/less/utilities.less +15 -1
  59. data/vendor/twitter/bootstrap/less/variables.less +56 -39
  60. data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
  61. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +2 -2
  62. data/vendor/twitter/bootstrap/sass/_button-groups.scss +6 -1
  63. data/vendor/twitter/bootstrap/sass/_buttons.scss +2 -4
  64. data/vendor/twitter/bootstrap/sass/_carousel.scss +32 -10
  65. data/vendor/twitter/bootstrap/sass/_close.scss +2 -0
  66. data/vendor/twitter/bootstrap/sass/_code.scss +5 -8
  67. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +1 -2
  68. data/vendor/twitter/bootstrap/sass/_forms.scss +23 -10
  69. data/vendor/twitter/bootstrap/sass/_glyphicons.scss +20 -15
  70. data/vendor/twitter/bootstrap/sass/_grid.scss +32 -285
  71. data/vendor/twitter/bootstrap/sass/_input-groups.scss +9 -0
  72. data/vendor/twitter/bootstrap/sass/_jumbotron.scss +2 -2
  73. data/vendor/twitter/bootstrap/sass/_list-group.scss +16 -16
  74. data/vendor/twitter/bootstrap/sass/_mixins.scss +167 -34
  75. data/vendor/twitter/bootstrap/sass/_modals.scss +2 -15
  76. data/vendor/twitter/bootstrap/sass/_navbar.scss +10 -7
  77. data/vendor/twitter/bootstrap/sass/_navs.scss +53 -20
  78. data/vendor/twitter/bootstrap/sass/_normalize.scss +16 -6
  79. data/vendor/twitter/bootstrap/sass/_pagination.scss +2 -0
  80. data/vendor/twitter/bootstrap/sass/_panels.scss +31 -7
  81. data/vendor/twitter/bootstrap/sass/_print.scss +6 -1
  82. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +4 -7
  83. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +37 -48
  84. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -12
  85. data/vendor/twitter/bootstrap/sass/_tables.scss +52 -44
  86. data/vendor/twitter/bootstrap/sass/_theme.scss +26 -11
  87. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +13 -12
  88. data/vendor/twitter/bootstrap/sass/_tooltip.scss +8 -8
  89. data/vendor/twitter/bootstrap/sass/_type.scss +71 -30
  90. data/vendor/twitter/bootstrap/sass/_utilities.scss +15 -1
  91. data/vendor/twitter/bootstrap/sass/_variables.scss +56 -39
  92. data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -10
  93. metadata +2 -5
  94. data/vendor/assets/javascripts/bootstrap-ie.js +0 -2
  95. data/vendor/assets/javascripts/bootstrap-ie/html5shiv.js +0 -8
  96. data/vendor/assets/javascripts/bootstrap-ie/respond.min.js +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 45c1a65a154ab3da4dddb5bf0841c67a6993d41a
4
- data.tar.gz: 878afc9777833c4e07f02a2b606691892a09813a
3
+ metadata.gz: 9f0a9c683b0222d59583de9b2bf0c1b528c0ac81
4
+ data.tar.gz: a42b6b4c345238149683507d14be1b4828d459ed
5
5
  SHA512:
6
- metadata.gz: b46fca4dc193722548740e3900583e2a2fbd6cd6f8464e2708c7c2302471b1679e181e81d10f0ac251527e4bc9f2f35ed1c1147e8f7ddae3de8be786c49d78b6
7
- data.tar.gz: 8f5a57e9287ba0ff1c0344ced35434d8a1a6886f563795d486df66d28bc853214ffd2bb56ac92508690c62a7d5f905eb003b07cb38d6c370c52f6c4ee537ceeb
6
+ metadata.gz: 68fb28350440f15a2643aaa1b29f76843838f1290bbf3fd781bd29f32ab82d45dba86e821068200b886ebe6e2d82c6266b5efb3910d6229e1bcc9626f67280a1
7
+ data.tar.gz: 5aec65525e7f10e42afdbd46fd35265fed42134aab7f5bed0b17d5f9664699ea4c18be347554c3e6ad10a1204693d6b779c6d61cac803dffb356e564d228739c
data/README.md CHANGED
@@ -2,17 +2,17 @@
2
2
 
3
3
  [![Build Status](https://travis-ci.org/decioferreira/bootstrap-generators.png?branch=master)](https://travis-ci.org/decioferreira/bootstrap-generators)
4
4
 
5
- Bootstrap-generators provides [Twitter Bootstrap](http://twitter.github.com/bootstrap/) generators for Rails 4 (supported Rails >= 3.1). Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
5
+ Bootstrap-generators provides [Twitter Bootstrap](http://getbootstrap.com/) generators for Rails 4 (supported Rails >= 3.1). Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
6
6
 
7
7
  ## Current Twitter Bootstrap version
8
8
 
9
- The current version of Twitter Bootstrap is 3.0.0.
9
+ The current version of Twitter Bootstrap is 3.0.2.
10
10
 
11
11
  ## Installing Gem
12
12
 
13
13
  In your Gemfile, add this line:
14
14
 
15
- gem 'bootstrap-generators', '~> 3.0'
15
+ gem 'bootstrap-generators', '~> 3.0.2'
16
16
 
17
17
  Or you can install from latest build:
18
18
 
@@ -120,18 +120,18 @@ Select all jQuery plugins (`app/assets/javascripts/bootstrap.js`)
120
120
 
121
121
  Or quickly add only the necessary javascript (Transitions: required for any animation; Popovers: requires Tooltips)
122
122
 
123
- //= require bootstrap/affix
124
123
  //= require bootstrap/scrollspy
125
- //= require bootstrap/collapse
126
- //= require bootstrap/alert
127
124
  //= require bootstrap/dropdown
125
+ //= require bootstrap/tab
128
126
  //= require bootstrap/button
127
+ //= require bootstrap/collapse
129
128
  //= require bootstrap/modal
130
129
  //= require bootstrap/carousel
130
+ //= require bootstrap/alert
131
+ //= require bootstrap/transition
131
132
  //= require bootstrap/tooltip
132
133
  //= require bootstrap/popover
133
- //= require bootstrap/transition
134
- //= require bootstrap/tab
134
+ //= require bootstrap/affix
135
135
 
136
136
 
137
137
  ## Customizing Templates
data/Rakefile CHANGED
@@ -12,8 +12,8 @@ task :default => :test
12
12
  namespace :bootstrap do
13
13
  desc "Update to a new version of Twitter Bootstrap"
14
14
  task :update do
15
- bootstrap_version = "3.0.0"
16
- striped_bootstrap_generators_version = "3.0"
15
+ bootstrap_version = "3.0.2"
16
+ striped_bootstrap_generators_version = "3.0.2"
17
17
 
18
18
  twitter_latest_dist_zip_url = "https://github.com/twbs/bootstrap/archive/v#{bootstrap_version}.zip"
19
19
  twitter_sass_lastest_dist_zip_url = "https://github.com/jlong/sass-bootstrap/archive/v#{bootstrap_version}.zip"
@@ -59,7 +59,7 @@ namespace :bootstrap do
59
59
  # Make sure that tooltip.js is before popover.js (Popover requires tooltip.js)
60
60
  tooltip_position = require_files.index('tooltip')
61
61
  popover_position = require_files.index('popover')
62
- require_files.insert(popover_position, require_files.delete_at(tooltip_position))
62
+ require_files.insert(tooltip_position, require_files.delete_at(popover_position)) if tooltip_position > popover_position
63
63
 
64
64
  File.open(bootstrap_main_javascript, 'w') do |file|
65
65
  require_files.each do |require_file|
@@ -98,10 +98,6 @@ namespace :bootstrap do
98
98
  File.open(filepath, 'w') { |file| file.puts file_content }
99
99
  end
100
100
 
101
- # IE
102
- FileUtils.cp "#{twitter_bootstrap_dir}/assets/js/html5shiv.js", "vendor/assets/javascripts/bootstrap-ie/html5shiv.js"
103
- FileUtils.cp "#{twitter_bootstrap_dir}/assets/js/respond.min.js", "vendor/assets/javascripts/bootstrap-ie/respond.min.js"
104
-
105
101
  # Generate README.md
106
102
  require 'erb'
107
103
 
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Generators
3
- VERSION = "3.0.0.1"
3
+ VERSION = "3.0.2"
4
4
  end
5
5
  end
@@ -48,17 +48,26 @@
48
48
  @font-size-large: ceil(@font-size-base * 1.25); // ~18px
49
49
  @font-size-small: ceil(@font-size-base * 0.85); // ~12px
50
50
 
51
+ @font-size-h1: floor(@font-size-base * 2.6); // ~36px
52
+ @font-size-h2: floor(@font-size-base * 2.15); // ~30px
53
+ @font-size-h3: ceil(@font-size-base * 1.7); // ~24px
54
+ @font-size-h4: ceil(@font-size-base * 1.25); // ~18px
55
+ @font-size-h5: @font-size-base;
56
+ @font-size-h6: ceil(@font-size-base * 0.85); // ~12px
57
+
51
58
  @line-height-base: 1.428571429; // 20/14
52
59
  @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
53
60
 
54
61
  @headings-font-family: @font-family-base;
55
62
  @headings-font-weight: 500;
56
63
  @headings-line-height: 1.1;
64
+ @headings-color: inherit;
65
+
57
66
 
58
67
  // Iconography
59
68
  // -------------------------
60
69
 
61
- @icon-font-path: "";
70
+ @icon-font-path: "/assets/";
62
71
  @icon-font-name: "glyphicons-halflings-regular";
63
72
 
64
73
 
@@ -82,6 +91,7 @@
82
91
  @border-radius-large: 6px;
83
92
  @border-radius-small: 3px;
84
93
 
94
+ @component-active-color: #fff;
85
95
  @component-active-bg: @brand-primary;
86
96
 
87
97
  @caret-width-base: 4px;
@@ -165,12 +175,12 @@
165
175
  @dropdown-fallback-border: #ccc;
166
176
  @dropdown-divider-bg: #e5e5e5;
167
177
 
168
- @dropdown-link-active-color: #fff;
169
- @dropdown-link-active-bg: @component-active-bg;
170
-
171
178
  @dropdown-link-color: @gray-dark;
172
- @dropdown-link-hover-color: #fff;
173
- @dropdown-link-hover-bg: @dropdown-link-active-bg;
179
+ @dropdown-link-hover-color: darken(@gray-dark, 5%);
180
+ @dropdown-link-hover-bg: #f5f5f5;
181
+
182
+ @dropdown-link-active-color: @component-active-color;
183
+ @dropdown-link-active-bg: @component-active-bg;
174
184
 
175
185
  @dropdown-link-disabled-color: @gray-light;
176
186
 
@@ -200,25 +210,33 @@
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;
204
- @screen-phone: @screen-xs;
215
+ @screen-xs-min: @screen-xs;
216
+ @screen-phone: @screen-xs-min;
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;
208
- @screen-tablet: @screen-sm;
221
+ @screen-sm-min: @screen-sm;
222
+ @screen-tablet: @screen-sm-min;
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;
212
- @screen-desktop: @screen-md;
227
+ @screen-md-min: @screen-md;
228
+ @screen-desktop: @screen-md-min;
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;
216
- @screen-lg-desktop: @screen-lg;
233
+ @screen-lg-min: @screen-lg;
234
+ @screen-lg-desktop: @screen-lg-min;
217
235
 
218
236
  // So media queries don't overlap when required, provide a maximum
219
- @screen-xs-max: (@screen-sm - 1);
220
- @screen-sm-max: (@screen-md - 1);
221
- @screen-md-max: (@screen-lg - 1);
237
+ @screen-xs-max: (@screen-sm-min - 1);
238
+ @screen-sm-max: (@screen-md-min - 1);
239
+ @screen-md-max: (@screen-lg-min - 1);
222
240
 
223
241
 
224
242
  // Grid system
@@ -229,7 +247,7 @@
229
247
  // Padding, to be divided by two and applied to the left and right of all columns
230
248
  @grid-gutter-width: 30px;
231
249
  // Point at which the navbar stops collapsing
232
- @grid-float-breakpoint: @screen-tablet;
250
+ @grid-float-breakpoint: @screen-sm-min;
233
251
 
234
252
 
235
253
  // Navbar
@@ -238,13 +256,14 @@
238
256
  // Basics of a navbar
239
257
  @navbar-height: 50px;
240
258
  @navbar-margin-bottom: @line-height-computed;
241
- @navbar-default-color: #777;
242
- @navbar-default-bg: #f8f8f8;
243
- @navbar-default-border: darken(@navbar-default-bg, 6.5%);
244
259
  @navbar-border-radius: @border-radius-base;
245
260
  @navbar-padding-horizontal: floor(@grid-gutter-width / 2);
246
261
  @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
247
262
 
263
+ @navbar-default-color: #777;
264
+ @navbar-default-bg: #f8f8f8;
265
+ @navbar-default-border: darken(@navbar-default-bg, 6.5%);
266
+
248
267
  // Navbar links
249
268
  @navbar-default-link-color: #777;
250
269
  @navbar-default-link-hover-color: #333;
@@ -256,7 +275,7 @@
256
275
 
257
276
  // Navbar brand label
258
277
  @navbar-default-brand-color: @navbar-default-link-color;
259
- @navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%);
278
+ @navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
260
279
  @navbar-default-brand-hover-bg: transparent;
261
280
 
262
281
  // Navbar toggle
@@ -286,13 +305,6 @@
286
305
  @navbar-inverse-brand-hover-color: #fff;
287
306
  @navbar-inverse-brand-hover-bg: transparent;
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%);
292
- @navbar-inverse-search-bg-focus: #fff;
293
- @navbar-inverse-search-border: @navbar-inverse-bg;
294
- @navbar-inverse-search-placeholder-color: #ccc;
295
-
296
308
  // Inverted navbar toggle
297
309
  @navbar-inverse-toggle-hover-bg: #333;
298
310
  @navbar-inverse-toggle-icon-bar-bg: #fff;
@@ -324,8 +336,9 @@
324
336
  @nav-tabs-justified-active-link-border-color: @body-bg;
325
337
 
326
338
  // Pills
339
+ @nav-pills-border-radius: @border-radius-base;
327
340
  @nav-pills-active-link-hover-bg: @component-active-bg;
328
- @nav-pills-active-link-hover-color: #fff;
341
+ @nav-pills-active-link-hover-color: @component-active-color;
329
342
 
330
343
 
331
344
  // Pagination
@@ -355,21 +368,13 @@
355
368
  @jumbotron-padding: 30px;
356
369
  @jumbotron-color: inherit;
357
370
  @jumbotron-bg: @gray-lighter;
358
-
359
371
  @jumbotron-heading-color: inherit;
372
+ @jumbotron-font-size: ceil(@font-size-base * 1.5);
360
373
 
361
374
 
362
375
  // Form states and alerts
363
376
  // -------------------------
364
377
 
365
- @state-warning-text: #c09853;
366
- @state-warning-bg: #fcf8e3;
367
- @state-warning-border: darken(spin(@state-warning-bg, -10), 3%);
368
-
369
- @state-danger-text: #b94a48;
370
- @state-danger-bg: #f2dede;
371
- @state-danger-border: darken(spin(@state-danger-bg, -10), 3%);
372
-
373
378
  @state-success-text: #468847;
374
379
  @state-success-bg: #dff0d8;
375
380
  @state-success-border: darken(spin(@state-success-bg, -10), 5%);
@@ -378,6 +383,14 @@
378
383
  @state-info-bg: #d9edf7;
379
384
  @state-info-border: darken(spin(@state-info-bg, -10), 7%);
380
385
 
386
+ @state-warning-text: #c09853;
387
+ @state-warning-bg: #fcf8e3;
388
+ @state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
389
+
390
+ @state-danger-text: #b94a48;
391
+ @state-danger-bg: #f2dede;
392
+ @state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
393
+
381
394
 
382
395
  // Tooltips
383
396
  // -------------------------
@@ -478,7 +491,7 @@
478
491
  @list-group-border-radius: @border-radius-base;
479
492
 
480
493
  @list-group-hover-bg: #f5f5f5;
481
- @list-group-active-color: #fff;
494
+ @list-group-active-color: @component-active-color;
482
495
  @list-group-active-bg: @component-active-bg;
483
496
  @list-group-active-border: @list-group-active-bg;
484
497
 
@@ -553,6 +566,7 @@
553
566
  @breadcrumb-bg: #f5f5f5;
554
567
  @breadcrumb-color: #ccc;
555
568
  @breadcrumb-active-color: @gray-light;
569
+ @breadcrumb-separator: "/";
556
570
 
557
571
 
558
572
  // Carousel
@@ -573,8 +587,8 @@
573
587
 
574
588
  // Close
575
589
  // ------------------------
576
- @close-color: #000;
577
590
  @close-font-weight: bold;
591
+ @close-color: #000;
578
592
  @close-text-shadow: 0 1px 0 #fff;
579
593
 
580
594
 
@@ -611,10 +625,13 @@
611
625
  // --------------------------------------------------
612
626
 
613
627
  // Small screen / tablet
614
- @container-tablet: ((720px + @grid-gutter-width));
628
+ @container-tablet: ((720px + @grid-gutter-width));
629
+ @container-sm: @container-tablet;
615
630
 
616
631
  // Medium screen / desktop
617
- @container-desktop: ((940px + @grid-gutter-width));
632
+ @container-desktop: ((940px + @grid-gutter-width));
633
+ @container-md: @container-desktop;
618
634
 
619
635
  // Large screen / wide desktop
620
- @container-lg-desktop: ((1140px + @grid-gutter-width));
636
+ @container-large-desktop: ((1140px + @grid-gutter-width));
637
+ @container-lg: @container-large-desktop;
@@ -48,17 +48,26 @@ $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
  // -------------------------
60
69
 
61
- $icon-font-path: "" !default;
70
+ $icon-font-path: "/assets/" !default;
62
71
  $icon-font-name: "glyphicons-halflings-regular" !default;
63
72
 
64
73
 
@@ -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;