bootstrap-generators 2.0.1 → 2.0.4

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 (127) hide show
  1. data/README.md +258 -33
  2. data/Rakefile +0 -59
  3. data/lib/bootstrap/generators/engine.rb +6 -1
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/install_generator.rb +10 -2
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +120 -15
  7. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +206 -0
  8. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css +2 -0
  9. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.less +5 -4
  10. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +3 -2
  11. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css +2 -0
  12. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.less +5 -4
  13. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +3 -2
  14. data/lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb +3 -0
  15. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
  16. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +2 -2
  17. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb +1 -1
  18. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml +1 -1
  19. data/test/fixtures/application.js +3 -0
  20. data/test/lib/generators/bootstrap/install_generator_test.rb +4 -3
  21. data/test/test_helper.rb +8 -1
  22. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  23. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  24. data/vendor/assets/javascripts/bootstrap-alert.js +28 -32
  25. data/vendor/assets/javascripts/bootstrap-button.js +29 -33
  26. data/vendor/assets/javascripts/bootstrap-carousel.js +33 -21
  27. data/vendor/assets/javascripts/bootstrap-collapse.js +47 -26
  28. data/vendor/assets/javascripts/bootstrap-dropdown.js +18 -10
  29. data/vendor/assets/javascripts/bootstrap-modal.js +25 -17
  30. data/vendor/assets/javascripts/bootstrap-popover.js +13 -10
  31. data/vendor/assets/javascripts/bootstrap-scrollspy.js +44 -18
  32. data/vendor/assets/javascripts/bootstrap-tab.js +12 -7
  33. data/vendor/assets/javascripts/bootstrap-tooltip.js +40 -35
  34. data/vendor/assets/javascripts/bootstrap-transition.js +30 -20
  35. data/vendor/assets/javascripts/bootstrap-typeahead.js +29 -15
  36. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/accordion.less +5 -0
  37. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/alerts.less +2 -14
  38. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/bootstrap.less +2 -2
  39. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/breadcrumbs.less +2 -0
  40. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/button-groups.less +76 -33
  41. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/buttons.less +32 -24
  42. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/carousel.less +0 -0
  43. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/close.less +12 -1
  44. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/code.less +6 -6
  45. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/component-animations.less +7 -5
  46. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/dropdowns.less +58 -45
  47. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/forms.less +205 -144
  48. data/vendor/twitter/bootstrap/less/grid.less +5 -0
  49. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/hero-unit.less +3 -1
  50. data/vendor/twitter/bootstrap/less/labels-badges.less +55 -0
  51. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/layouts.less +1 -1
  52. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/mixins.less +235 -179
  53. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/modals.less +13 -6
  54. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/navbar.less +131 -72
  55. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/navs.less +53 -43
  56. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/pager.less +6 -0
  57. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/pagination.less +1 -0
  58. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/popovers.less +0 -0
  59. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/progress-bars.less +27 -5
  60. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/reset.less +8 -3
  61. data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +26 -0
  62. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +149 -0
  63. data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +17 -0
  64. data/vendor/twitter/bootstrap/less/responsive-navbar.less +153 -0
  65. data/vendor/twitter/bootstrap/less/responsive-utilities.less +41 -0
  66. data/vendor/twitter/bootstrap/less/responsive.less +48 -0
  67. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/scaffolding.less +4 -4
  68. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/sprites.less +42 -9
  69. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/tables.less +46 -20
  70. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/thumbnails.less +14 -2
  71. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/tooltip.less +0 -0
  72. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/type.less +27 -13
  73. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/utilities.less +0 -0
  74. data/vendor/twitter/bootstrap/less/variables.less +206 -0
  75. data/vendor/{assets/stylesheets → twitter/bootstrap}/less/wells.less +10 -0
  76. data/vendor/{assets/stylesheets/scss/accordion.scss → twitter/bootstrap/sass/_accordion.scss} +5 -0
  77. data/vendor/{assets/stylesheets/scss/alerts.scss → twitter/bootstrap/sass/_alerts.scss} +3 -15
  78. data/vendor/{assets/stylesheets/scss/breadcrumbs.scss → twitter/bootstrap/sass/_breadcrumbs.scss} +2 -0
  79. data/vendor/{assets/stylesheets/scss/button-groups.scss → twitter/bootstrap/sass/_button-groups.scss} +76 -33
  80. data/vendor/{assets/stylesheets/scss/buttons.scss → twitter/bootstrap/sass/_buttons.scss} +33 -25
  81. data/vendor/{assets/stylesheets/scss/carousel.scss → twitter/bootstrap/sass/_carousel.scss} +1 -1
  82. data/vendor/{assets/stylesheets/scss/close.scss → twitter/bootstrap/sass/_close.scss} +12 -1
  83. data/vendor/{assets/stylesheets/scss/code.scss → twitter/bootstrap/sass/_code.scss} +7 -7
  84. data/vendor/{assets/stylesheets/scss/component-animations.scss → twitter/bootstrap/sass/_component-animations.scss} +9 -7
  85. data/vendor/{assets/stylesheets/scss/dropdowns.scss → twitter/bootstrap/sass/_dropdowns.scss} +58 -45
  86. data/vendor/{assets/stylesheets/scss/forms.scss → twitter/bootstrap/sass/_forms.scss} +205 -145
  87. data/vendor/twitter/bootstrap/sass/_grid.scss +5 -0
  88. data/vendor/{assets/stylesheets/scss/hero-unit.scss → twitter/bootstrap/sass/_hero-unit.scss} +3 -1
  89. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +52 -0
  90. data/vendor/{assets/stylesheets/scss/layouts.scss → twitter/bootstrap/sass/_layouts.scss} +2 -2
  91. data/vendor/{assets/stylesheets/scss/mixins.scss → twitter/bootstrap/sass/_mixins.scss} +246 -182
  92. data/vendor/{assets/stylesheets/scss/modals.scss → twitter/bootstrap/sass/_modals.scss} +14 -7
  93. data/vendor/{assets/stylesheets/scss/navbar.scss → twitter/bootstrap/sass/_navbar.scss} +132 -73
  94. data/vendor/{assets/stylesheets/scss/navs.scss → twitter/bootstrap/sass/_navs.scss} +53 -43
  95. data/vendor/{assets/stylesheets/scss/pager.scss → twitter/bootstrap/sass/_pager.scss} +6 -0
  96. data/vendor/{assets/stylesheets/scss/pagination.scss → twitter/bootstrap/sass/_pagination.scss} +1 -0
  97. data/vendor/{assets/stylesheets/scss/popovers.scss → twitter/bootstrap/sass/_popovers.scss} +0 -0
  98. data/vendor/{assets/stylesheets/scss/progress-bars.scss → twitter/bootstrap/sass/_progress-bars.scss} +27 -5
  99. data/vendor/{assets/stylesheets/scss/reset.scss → twitter/bootstrap/sass/_reset.scss} +8 -3
  100. data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +26 -0
  101. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +149 -0
  102. data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +17 -0
  103. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +153 -0
  104. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +41 -0
  105. data/vendor/{assets/stylesheets/scss/scaffolding.scss → twitter/bootstrap/sass/_scaffolding.scss} +4 -4
  106. data/vendor/{assets/stylesheets/scss/sprites.scss → twitter/bootstrap/sass/_sprites.scss} +40 -7
  107. data/vendor/{assets/stylesheets/scss/tables.scss → twitter/bootstrap/sass/_tables.scss} +37 -32
  108. data/vendor/{assets/stylesheets/scss/thumbnails.scss → twitter/bootstrap/sass/_thumbnails.scss} +14 -2
  109. data/vendor/{assets/stylesheets/scss/tooltip.scss → twitter/bootstrap/sass/_tooltip.scss} +1 -1
  110. data/vendor/{assets/stylesheets/scss/type.scss → twitter/bootstrap/sass/_type.scss} +27 -13
  111. data/vendor/{assets/stylesheets/scss/utilities.scss → twitter/bootstrap/sass/_utilities.scss} +0 -0
  112. data/vendor/twitter/bootstrap/sass/_variables.scss +204 -0
  113. data/vendor/{assets/stylesheets/scss/wells.scss → twitter/bootstrap/sass/_wells.scss} +10 -0
  114. data/vendor/{assets/stylesheets/scss → twitter/bootstrap/sass}/bootstrap.scss +3 -3
  115. data/vendor/twitter/bootstrap/sass/responsive.scss +48 -0
  116. metadata +93 -84
  117. data/lib/generators/bootstrap/install/templates/assets/javascripts/bootstrap-generators.js +0 -1
  118. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.less +0 -98
  119. data/vendor/assets/stylesheets/bootstrap.css +0 -3363
  120. data/vendor/assets/stylesheets/less/grid.less +0 -8
  121. data/vendor/assets/stylesheets/less/labels.less +0 -32
  122. data/vendor/assets/stylesheets/less/responsive.less +0 -327
  123. data/vendor/assets/stylesheets/less/variables.less +0 -107
  124. data/vendor/assets/stylesheets/scss/grid.scss +0 -8
  125. data/vendor/assets/stylesheets/scss/labels.scss +0 -32
  126. data/vendor/assets/stylesheets/scss/responsive.scss +0 -327
  127. data/vendor/assets/stylesheets/scss/variables.scss +0 -107
data/README.md CHANGED
@@ -12,9 +12,9 @@ Or you can install from latest build:
12
12
 
13
13
  gem 'bootstrap-generators', '~> 2.0', :git => 'git://github.com/decioferreira/bootstrap-generators.git'
14
14
 
15
- By default Bootstrap Generators requires [SimpleForm 2.0.0.rc](https://github.com/plataformatec/simple_form). Add the dependency on your Gemfile:
15
+ By default Bootstrap Generators requires [SimpleForm 2.0](https://github.com/plataformatec/simple_form). Add the dependency on your Gemfile:
16
16
 
17
- gem 'simple_form', '2.0.0.rc'
17
+ gem 'simple_form', '~> 2.0'
18
18
 
19
19
  If you don't want to use SimpleForm, just pass the `--form_builder=form_builder` option:
20
20
 
@@ -77,9 +77,9 @@ To select one of these layouts just pass the option `--layout=LAYOUT` to the ins
77
77
 
78
78
  * SimpleForm
79
79
 
80
- By default Bootstrap Generators requires SimpleForm 2.0.0.rc. Add the dependency on your Gemfile:
80
+ By default Bootstrap Generators requires SimpleForm 2.0. Add the dependency on your Gemfile:
81
81
 
82
- gem 'simple_form', '2.0.0.rc'
82
+ gem 'simple_form', '~> 2.0'
83
83
 
84
84
  And then run:
85
85
 
@@ -142,10 +142,11 @@ Now you can [customize](http://decioferreira.github.com/bootstrap-generators/) t
142
142
 
143
143
  ### Customize and extend Bootstrap
144
144
 
145
- If you select LESS or SCSS as your stylesheet engine, you will get an `app/assets/stylesheets/bootstrap-variables.css.[less|scss]` file with all of the [default variables](http://twitter.github.com/bootstrap/less.html#variables) of Bootstrap. This way you can [customize](http://decioferreira.github.com/bootstrap-generators/) the look and feel of Bootstrap without having to download any extra file:
145
+ If you select LESS or SCSS as your stylesheet engine, you will get an `app/assets/stylesheets/bootstrap-variables.[less|css.scss]` file with all of the [default variables](http://twitter.github.com/bootstrap/less.html#variables) of Bootstrap. This way you can [customize](http://decioferreira.github.com/bootstrap-generators/) the look and feel of Bootstrap without having to download any extra file:
146
146
 
147
147
  LESS version:
148
148
 
149
+ // Variables.less
149
150
  // Variables to customize the look and feel of Bootstrap
150
151
  // -----------------------------------------------------
151
152
 
@@ -154,11 +155,9 @@ LESS version:
154
155
  // GLOBAL VALUES
155
156
  // --------------------------------------------------
156
157
 
157
- // Links
158
- @linkColor: #08c;
159
- @linkColorHover: darken(@linkColor, 15%);
160
158
 
161
159
  // Grays
160
+ // -------------------------
162
161
  @black: #000;
163
162
  @grayDarker: #222;
164
163
  @grayDark: #333;
@@ -167,7 +166,9 @@ LESS version:
167
166
  @grayLighter: #eee;
168
167
  @white: #fff;
169
168
 
169
+
170
170
  // Accent colors
171
+ // -------------------------
171
172
  @blue: #049cdb;
172
173
  @blueDark: #0064cd;
173
174
  @green: #46a546;
@@ -177,14 +178,85 @@ LESS version:
177
178
  @pink: #c3325f;
178
179
  @purple: #7a43b6;
179
180
 
181
+
182
+ // Scaffolding
183
+ // -------------------------
184
+ @bodyBackground: @white;
185
+ @textColor: @grayDark;
186
+
187
+
188
+ // Links
189
+ // -------------------------
190
+ @linkColor: #08c;
191
+ @linkColorHover: darken(@linkColor, 15%);
192
+
193
+
180
194
  // Typography
195
+ // -------------------------
196
+ @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
197
+ @serifFontFamily: Georgia, "Times New Roman", Times, serif;
198
+ @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
199
+
181
200
  @baseFontSize: 13px;
182
- @baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
201
+ @baseFontFamily: @sansFontFamily;
183
202
  @baseLineHeight: 18px;
184
- @textColor: @grayDark;
203
+ @altFontFamily: @serifFontFamily;
204
+
205
+ @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
206
+ @headingsFontWeight: bold; // instead of browser default, bold
207
+ @headingsColor: inherit; // empty to use BS default, @textColor
208
+
209
+
210
+ // Tables
211
+ // -------------------------
212
+ @tableBackground: transparent; // overall background-color
213
+ @tableBackgroundAccent: #f9f9f9; // for striping
214
+ @tableBackgroundHover: #f5f5f5; // for hover
215
+ @tableBorder: #ddd; // table and cell border
216
+
185
217
 
186
218
  // Buttons
187
- @primaryButtonBackground: @linkColor;
219
+ // -------------------------
220
+ @btnBackground: @white;
221
+ @btnBackgroundHighlight: darken(@white, 10%);
222
+ @btnBorder: #ccc;
223
+
224
+ @btnPrimaryBackground: @linkColor;
225
+ @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
226
+
227
+ @btnInfoBackground: #5bc0de;
228
+ @btnInfoBackgroundHighlight: #2f96b4;
229
+
230
+ @btnSuccessBackground: #62c462;
231
+ @btnSuccessBackgroundHighlight: #51a351;
232
+
233
+ @btnWarningBackground: lighten(@orange, 15%);
234
+ @btnWarningBackgroundHighlight: @orange;
235
+
236
+ @btnDangerBackground: #ee5f5b;
237
+ @btnDangerBackgroundHighlight: #bd362f;
238
+
239
+ @btnInverseBackground: @gray;
240
+ @btnInverseBackgroundHighlight: @grayDarker;
241
+
242
+
243
+ // Forms
244
+ // -------------------------
245
+ @inputBackground: @white;
246
+ @inputBorder: #ccc;
247
+ @inputBorderRadius: 3px;
248
+ @inputDisabledBackground: @grayLighter;
249
+ @formActionsBackground: #f5f5f5;
250
+
251
+ // Dropdowns
252
+ // -------------------------
253
+ @dropdownBackground: @white;
254
+ @dropdownBorder: rgba(0,0,0,.2);
255
+ @dropdownLinkColor: @grayDark;
256
+ @dropdownLinkColorHover: @white;
257
+ @dropdownLinkBackgroundHover: @linkColor;
258
+ @dropdownDividerTop: #e5e5e5;
259
+ @dropdownDividerBottom: @white;
188
260
 
189
261
 
190
262
 
@@ -192,19 +264,35 @@ LESS version:
192
264
  // --------------------------------------------------
193
265
 
194
266
  // Z-index master list
267
+ // -------------------------
195
268
  // Used for a bird's eye view of components dependent on the z-axis
196
269
  // Try to avoid customizing these :)
197
- @zindexDropdown: 1000;
198
- @zindexPopover: 1010;
199
- @zindexTooltip: 1020;
200
- @zindexFixedNavbar: 1030;
201
- @zindexModalBackdrop: 1040;
202
- @zindexModal: 1050;
270
+ @zindexDropdown: 1000;
271
+ @zindexPopover: 1010;
272
+ @zindexTooltip: 1020;
273
+ @zindexFixedNavbar: 1030;
274
+ @zindexModalBackdrop: 1040;
275
+ @zindexModal: 1050;
276
+
277
+
278
+ // Sprite icons path
279
+ // -------------------------
280
+ @iconSpritePath: "glyphicons-halflings.png";
281
+ @iconWhiteSpritePath: "glyphicons-halflings-white.png";
282
+
203
283
 
204
284
  // Input placeholder text color
205
- @placeholderText: @grayLight;
285
+ // -------------------------
286
+ @placeholderText: @grayLight;
287
+
288
+
289
+ // Hr border color
290
+ // -------------------------
291
+ @hrBorder: @grayLighter;
292
+
206
293
 
207
294
  // Navbar
295
+ // -------------------------
208
296
  @navbarHeight: 40px;
209
297
  @navbarBackground: @grayDarker;
210
298
  @navbarBackgroundHighlight: @grayDark;
@@ -212,8 +300,26 @@ LESS version:
212
300
  @navbarText: @grayLight;
213
301
  @navbarLinkColor: @grayLight;
214
302
  @navbarLinkColorHover: @white;
303
+ @navbarLinkColorActive: @navbarLinkColorHover;
304
+ @navbarLinkBackgroundHover: transparent;
305
+ @navbarLinkBackgroundActive: @navbarBackground;
306
+
307
+ @navbarSearchBackground: lighten(@navbarBackground, 25%);
308
+ @navbarSearchBackgroundFocus: @white;
309
+ @navbarSearchBorder: darken(@navbarSearchBackground, 30%);
310
+ @navbarSearchPlaceholderColor: #ccc;
311
+ @navbarBrandColor: @navbarLinkColor;
312
+
313
+
314
+ // Hero unit
315
+ // -------------------------
316
+ @heroUnitBackground: @grayLighter;
317
+ @heroUnitHeadingColor: inherit;
318
+ @heroUnitLeadColor: inherit;
319
+
215
320
 
216
321
  // Form states and alerts
322
+ // -------------------------
217
323
  @warningText: #c09853;
218
324
  @warningBackground: #fcf8e3;
219
325
  @warningBorder: darken(spin(@warningBackground, -10), 3%);
@@ -236,18 +342,20 @@ LESS version:
236
342
  // --------------------------------------------------
237
343
 
238
344
  // Default 940px grid
345
+ // -------------------------
239
346
  @gridColumns: 12;
240
347
  @gridColumnWidth: 60px;
241
348
  @gridGutterWidth: 20px;
242
349
  @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
243
350
 
244
351
  // Fluid grid
352
+ // -------------------------
245
353
  @fluidGridColumnWidth: 6.382978723%;
246
354
  @fluidGridGutterWidth: 2.127659574%;
247
355
 
248
356
  SCSS version:
249
357
 
250
- // Variables.less
358
+ // Variables
251
359
  // Variables to customize the look and feel of Bootstrap
252
360
  // -----------------------------------------------------
253
361
 
@@ -256,11 +364,9 @@ SCSS version:
256
364
  // GLOBAL VALUES
257
365
  // --------------------------------------------------
258
366
 
259
- // Links
260
- $linkColor: #08c !default;
261
- $linkColorHover: darken($linkColor, 15%) !default;
262
367
 
263
368
  // Grays
369
+ // -------------------------
264
370
  $black: #000 !default;
265
371
  $grayDarker: #222 !default;
266
372
  $grayDark: #333 !default;
@@ -269,7 +375,9 @@ SCSS version:
269
375
  $grayLighter: #eee !default;
270
376
  $white: #fff !default;
271
377
 
378
+
272
379
  // Accent colors
380
+ // -------------------------
273
381
  $blue: #049cdb !default;
274
382
  $blueDark: #0064cd !default;
275
383
  $green: #46a546 !default;
@@ -279,14 +387,83 @@ SCSS version:
279
387
  $pink: #c3325f !default;
280
388
  $purple: #7a43b6 !default;
281
389
 
390
+
391
+ // Scaffolding
392
+ // -------------------------
393
+ $bodyBackground: $white !default;
394
+ $textColor: $grayDark !default;
395
+
396
+
397
+ // Links
398
+ // -------------------------
399
+ $linkColor: #08c !default;
400
+ $linkColorHover: darken($linkColor, 15%) !default;
401
+
402
+
282
403
  // Typography
404
+ // -------------------------
405
+ $sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
406
+ $serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
407
+ $monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace !default;
408
+
283
409
  $baseFontSize: 13px !default;
284
- $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
410
+ $baseFontFamily: $sansFontFamily !default;
285
411
  $baseLineHeight: 18px !default;
286
- $textColor: $grayDark !default;
412
+ $altFontFamily: $serifFontFamily !default;
413
+
414
+ $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontFamily
415
+ $headingsFontWeight: bold !default; // instead of browser default, bold
416
+ $headingsColor: inherit !default; // empty to use BS default, $textColor
417
+
418
+
419
+ // Tables
420
+ // -------------------------
421
+ $tableBackground: transparent !default; // overall background-color
422
+ $tableBackgroundAccent: #f9f9f9 !default; // for striping
423
+ $tableBackgroundHover: #f5f5f5 !default; // for hover
424
+ $tableBorder: #ddd !default; // table and cell border
425
+
287
426
 
288
427
  // Buttons
289
- $primaryButtonBackground: $linkColor !default;
428
+ // -------------------------
429
+ $btnBackground: $white !default;
430
+ $btnBackgroundHighlight: darken($white, 10%) !default;
431
+ $btnBorder: #ccc !default;
432
+
433
+ $btnPrimaryBackground: $linkColor !default;
434
+ $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 15%) !default;
435
+
436
+ $btnInfoBackground: #5bc0de !default;
437
+ $btnInfoBackgroundHighlight: #2f96b4 !default;
438
+
439
+ $btnSuccessBackground: #62c462 !default;
440
+ $btnSuccessBackgroundHighlight: #51a351 !default;
441
+
442
+ $btnWarningBackground: lighten($orange, 15%) !default;
443
+ $btnWarningBackgroundHighlight: $orange !default;
444
+
445
+ $btnDangerBackground: #ee5f5b !default;
446
+ $btnDangerBackgroundHighlight: #bd362f !default;
447
+
448
+ $btnInverseBackground: $gray !default;
449
+ $btnInverseBackgroundHighlight: $grayDarker !default;
450
+
451
+
452
+ // Forms
453
+ // -------------------------
454
+ $inputBackground: $white !default;
455
+ $inputBorder: #ccc !default;
456
+ $inputBorderRadius: 3px !default;
457
+ $inputDisabledBackground: $grayLighter !default;
458
+ $formActionsBackground: #f5f5f5 !default;
459
+
460
+ // Dropdowns
461
+ // -------------------------
462
+ $dropdownBackground: $white !default;
463
+ $dropdownBorder: rgba(0,0,0,.2) !default;
464
+ $dropdownLinkColor: $grayDark !default;
465
+ $dropdownLinkColorHover: $white !default;
466
+ $dropdownLinkBackgroundHover: $linkColor !default;
290
467
 
291
468
 
292
469
 
@@ -294,19 +471,35 @@ SCSS version:
294
471
  // --------------------------------------------------
295
472
 
296
473
  // Z-index master list
474
+ // -------------------------
297
475
  // Used for a bird's eye view of components dependent on the z-axis
298
476
  // Try to avoid customizing these :)
299
- $zindexDropdown: 1000;
300
- $zindexPopover: 1010;
301
- $zindexTooltip: 1020;
302
- $zindexFixedNavbar: 1030;
303
- $zindexModalBackdrop: 1040;
304
- $zindexModal: 1050;
477
+ $zindexDropdown: 1000 !default;
478
+ $zindexPopover: 1010 !default;
479
+ $zindexTooltip: 1020 !default;
480
+ $zindexFixedNavbar: 1030 !default;
481
+ $zindexModalBackdrop: 1040 !default;
482
+ $zindexModal: 1050 !default;
483
+
484
+
485
+ // Sprite icons path
486
+ // -------------------------
487
+ $iconSpritePath: "glyphicons-halflings.png" !default;
488
+ $iconWhiteSpritePath: "glyphicons-halflings-white.png" !default;
489
+
305
490
 
306
491
  // Input placeholder text color
307
- $placeholderText: $grayLight !default;
492
+ // -------------------------
493
+ $placeholderText: $grayLight !default;
494
+
495
+
496
+ // Hr border color
497
+ // -------------------------
498
+ $hrBorder: $grayLighter !default;
499
+
308
500
 
309
501
  // Navbar
502
+ // -------------------------
310
503
  $navbarHeight: 40px !default;
311
504
  $navbarBackground: $grayDarker !default;
312
505
  $navbarBackgroundHighlight: $grayDark !default;
@@ -314,8 +507,26 @@ SCSS version:
314
507
  $navbarText: $grayLight !default;
315
508
  $navbarLinkColor: $grayLight !default;
316
509
  $navbarLinkColorHover: $white !default;
510
+ $navbarLinkColorActive: $navbarLinkColorHover !default;
511
+ $navbarLinkBackgroundHover: transparent !default;
512
+ $navbarLinkBackgroundActive: $navbarBackground !default;
513
+
514
+ $navbarSearchBackground: lighten($navbarBackground, 25%) !default;
515
+ $navbarSearchBackgroundFocus: $white !default;
516
+ $navbarSearchBorder: darken($navbarSearchBackground, 30%) !default;
517
+ $navbarSearchPlaceholderColor: #ccc !default;
518
+ $navbarBrandColor: $navbarLinkColor !default;
519
+
520
+
521
+ // Hero unit
522
+ // -------------------------
523
+ $heroUnitBackground: $grayLighter !default;
524
+ $heroUnitHeadingColor: inherit !default;
525
+ $heroUnitLeadColor: inherit !default;
526
+
317
527
 
318
528
  // Form states and alerts
529
+ // -------------------------
319
530
  $warningText: #c09853 !default;
320
531
  $warningBackground: #fcf8e3 !default;
321
532
  $warningBorder: darken(adjust-hue($warningBackground, -10), 3%) !default;
@@ -338,12 +549,14 @@ SCSS version:
338
549
  // --------------------------------------------------
339
550
 
340
551
  // Default 940px grid
552
+ // -------------------------
341
553
  $gridColumns: 12 !default;
342
554
  $gridColumnWidth: 60px !default;
343
555
  $gridGutterWidth: 20px !default;
344
- $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
556
+ $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
345
557
 
346
558
  // Fluid grid
559
+ // -------------------------
347
560
  $fluidGridColumnWidth: 6.382978723% !default;
348
561
  $fluidGridGutterWidth: 2.127659574% !default;
349
562
 
@@ -368,4 +581,16 @@ Or quickly add only the necessary javascript (Transitions: required for any anim
368
581
  //= require bootstrap-carousel
369
582
  //= require bootstrap-typeahead
370
583
 
584
+ ## Customizing Templates
585
+
586
+ In Rails 3.0 and above, generators don’t just look in the source root for templates, they also search for templates in other paths. And one of them is lib/templates.
587
+
588
+ Since Bootstrap Generators installs its templates under lib/templates, you can go and customize them.
589
+
590
+ ## Credits
591
+
592
+ * [Twitter Bootstrap](http://twitter.github.com/bootstrap)
593
+ * [Twitter Bootstrap - Sass Conversion](https://github.com/jlong/sass-twitter-bootstrap)
594
+ * [SimpleForm](https://github.com/plataformatec/simple_form)
595
+
371
596
  [customize]: #customize
data/Rakefile CHANGED
@@ -8,62 +8,3 @@ Rake::TestTask.new do |t|
8
8
  end
9
9
 
10
10
  task :default => :test
11
-
12
- desc "Converts LESS stylesheets to SCSS"
13
- task :less_to_scss do
14
- Dir.glob('vendor/assets/stylesheets/less/*.less') do |less_file|
15
- tree = []; level = 0
16
- input_file = File.new(less_file, "r")
17
-
18
- scss_file = File.basename(less_file, ".less")
19
- output_file = File.new("vendor/assets/stylesheets/scss/#{scss_file}.scss", "w")
20
-
21
- while(line = input_file.gets)
22
- # IDs
23
- if line.match(/^\s*#(\w+) {/)
24
- tree.push(line.match(/^\s*#(\w+) {/)[1])
25
- end
26
-
27
- # Less extensions
28
- line.gsub!(/\.less/, '')
29
-
30
- # Level
31
- if line.match(/{/)
32
- level += 1
33
- end
34
-
35
- if line.match(/}/)
36
- level -= 1
37
- tree = tree.first(level)
38
- end
39
-
40
- # Variables
41
- line.gsub!(/@(\w+)/) do |s|
42
- ['@media', '@import', '@keyframes'].include?(s) ? s : s.gsub(/@(\w+)/, '$\1')
43
- end
44
-
45
- # Includes
46
- line.gsub!(/(#(\w+) > )*\.(\S+\(.*\)\s*;)/) do |s|
47
- s.gsub(/ > (#|\.)/, '-').gsub(/(#|\.)(.*;)/, '@include \2')
48
- end
49
-
50
- line.gsub!(/(#(\w+) > )+\.(\S+(\(.*\))?\s*;)/) do |s|
51
- s.gsub(/ > (#|\.)/, '-').gsub(/(#|\.)(.*;)/, '@include \2')
52
- end
53
-
54
- # Mixins
55
- line.gsub!(/\s*\.(\S+\(.*\)\s*{)/) do |s|
56
- "@mixin #{[tree, s.match(/\.(\S+\(.*\)\s*{)/)[1]].flatten.join('-')}"
57
- end
58
-
59
- # Functions
60
- line.gsub!(/spin\(/, 'adjust-hue(') # spin to adjust-hue
61
- line.gsub!(/[:\( ]e\(([^\)]*)\)/, ' #{\1}')
62
-
63
- output_file.puts line
64
- end
65
-
66
- input_file.close
67
- output_file.close
68
- end
69
- end