bootstrap-sass-backport 3.2.0.2 → 3.3.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (86) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -1
  3. data/.travis.yml +8 -2
  4. data/CHANGELOG.md +14 -0
  5. data/README.md +35 -22
  6. data/Rakefile +3 -4
  7. data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
  8. data/assets/javascripts/bootstrap.js +1232 -1019
  9. data/assets/javascripts/bootstrap/affix.js +43 -23
  10. data/assets/javascripts/bootstrap/alert.js +6 -4
  11. data/assets/javascripts/bootstrap/button.js +16 -10
  12. data/assets/javascripts/bootstrap/carousel.js +27 -10
  13. data/assets/javascripts/bootstrap/collapse.js +69 -28
  14. data/assets/javascripts/bootstrap/dropdown.js +20 -10
  15. data/assets/javascripts/bootstrap/modal.js +67 -23
  16. data/assets/javascripts/bootstrap/popover.js +13 -7
  17. data/assets/javascripts/bootstrap/scrollspy.js +12 -7
  18. data/assets/javascripts/bootstrap/tab.js +41 -16
  19. data/assets/javascripts/bootstrap/tooltip.js +60 -39
  20. data/assets/javascripts/bootstrap/transition.js +1 -1
  21. data/assets/stylesheets/bootstrap/_badges.scss +7 -1
  22. data/assets/stylesheets/bootstrap/_button-groups.scss +18 -15
  23. data/assets/stylesheets/bootstrap/_buttons.scss +8 -5
  24. data/assets/stylesheets/bootstrap/_carousel.scss +25 -1
  25. data/assets/stylesheets/bootstrap/_code.scss +1 -0
  26. data/assets/stylesheets/bootstrap/_component-animations.scss +5 -2
  27. data/assets/stylesheets/bootstrap/_dropdowns.scss +4 -6
  28. data/assets/stylesheets/bootstrap/_forms.scss +55 -43
  29. data/assets/stylesheets/bootstrap/_glyphicons.scss +2 -5
  30. data/assets/stylesheets/bootstrap/_grid.scss +4 -4
  31. data/assets/stylesheets/bootstrap/_jumbotron.scss +6 -5
  32. data/assets/stylesheets/bootstrap/_list-group.scss +1 -8
  33. data/assets/stylesheets/bootstrap/_media.scss +27 -36
  34. data/assets/stylesheets/bootstrap/_modals.scss +4 -6
  35. data/assets/stylesheets/bootstrap/_navbar.scss +36 -33
  36. data/assets/stylesheets/bootstrap/_navs.scss +5 -3
  37. data/assets/stylesheets/bootstrap/_normalize.scss +5 -3
  38. data/assets/stylesheets/bootstrap/_pager.scss +2 -3
  39. data/assets/stylesheets/bootstrap/_pagination.scss +1 -1
  40. data/assets/stylesheets/bootstrap/_panels.scss +22 -4
  41. data/assets/stylesheets/bootstrap/_popovers.scss +6 -4
  42. data/assets/stylesheets/bootstrap/_print.scss +102 -96
  43. data/assets/stylesheets/bootstrap/_progress-bars.scss +2 -20
  44. data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -1
  45. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +4 -1
  46. data/assets/stylesheets/bootstrap/_scaffolding.scss +3 -3
  47. data/assets/stylesheets/bootstrap/_tables.scss +11 -10
  48. data/assets/stylesheets/bootstrap/_theme.scss +27 -13
  49. data/assets/stylesheets/bootstrap/_thumbnails.scss +2 -2
  50. data/assets/stylesheets/bootstrap/_tooltip.scss +12 -4
  51. data/assets/stylesheets/bootstrap/_type.scss +10 -16
  52. data/assets/stylesheets/bootstrap/_utilities.scss +3 -4
  53. data/assets/stylesheets/bootstrap/_variables.scss +31 -21
  54. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +2 -0
  55. data/assets/stylesheets/bootstrap/mixins/_forms.scss +5 -1
  56. data/assets/stylesheets/bootstrap/mixins/_grid.scss +2 -2
  57. data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +1 -1
  58. data/assets/stylesheets/bootstrap/mixins/_image.scss +0 -1
  59. data/assets/stylesheets/bootstrap/mixins/_labels.scss +1 -1
  60. data/assets/stylesheets/bootstrap/mixins/_progress-bar.scss +1 -1
  61. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +6 -3
  62. data/bower.json +1 -1
  63. data/composer.json +1 -1
  64. data/lib/bootstrap-sass-backport.rb +2 -1
  65. data/lib/bootstrap-sass/engine.rb +1 -1
  66. data/lib/bootstrap-sass/version.rb +2 -2
  67. data/package.json +4 -4
  68. data/tasks/converter/js_conversion.rb +2 -3
  69. data/tasks/converter/less_conversion.rb +64 -30
  70. data/tasks/converter/network.rb +12 -6
  71. data/templates/project/_bootstrap-variables.sass +866 -0
  72. data/templates/project/manifest.rb +5 -11
  73. data/test/node_sass_compile_test.sh +8 -0
  74. metadata +6 -27
  75. data/templates/project/_bootstrap-variables.sass.erb +0 -4
  76. data/test/dummy_rails/bin/bundle +0 -3
  77. data/test/dummy_rails/bin/rails +0 -4
  78. data/test/dummy_rails/bin/rake +0 -4
  79. data/test/dummy_rails/db/test.sqlite3 +0 -0
  80. data/test/dummy_rails/lib/assets/.keep +0 -0
  81. data/test/dummy_rails/public/404.html +0 -58
  82. data/test/dummy_rails/public/422.html +0 -58
  83. data/test/dummy_rails/public/500.html +0 -57
  84. data/test/dummy_rails/public/favicon.ico +0 -0
  85. data/test/node_sass_test.rb +0 -16
  86. data/test/support/integration_test.rb +0 -22
@@ -3,24 +3,18 @@ description 'Bootstrap for Sass'
3
3
  # Stylesheet importing bootstrap
4
4
  stylesheet 'styles.sass'
5
5
 
6
- manifest = Pathname.new(File.dirname(__FILE__))
7
- assets = File.expand_path('../../assets', manifest)
8
-
9
- # Provide variables files
10
- bs_stylesheets = "#{assets}/stylesheets/bootstrap"
11
- stylesheet '_bootstrap-variables.sass.erb',
12
- :erb => true,
13
- :to => '_bootstrap-variables.sass',
14
- :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", manifest)
6
+ # Bootstrap variable overrides file
7
+ stylesheet '_bootstrap-variables.sass', :to => '_bootstrap-variables.sass'
15
8
 
16
9
  # Copy JS and fonts
10
+ manifest = Pathname.new(File.dirname(__FILE__))
11
+ assets = File.expand_path('../../assets', manifest)
17
12
  {:javascript => 'javascripts',
18
13
  :font => 'fonts'
19
14
  }.each do |method, dir|
20
15
  root = Pathname.new(assets).join(dir)
21
16
  Dir.glob root.join('**', '*.*') do |path|
22
17
  path = Pathname.new(path)
23
- send method, path.relative_path_from(manifest).to_s,
24
- :to => path.relative_path_from(root).to_s
18
+ send method, path.relative_path_from(manifest).to_s, :to => path.relative_path_from(root).to_s
25
19
  end
26
20
  end
@@ -0,0 +1,8 @@
1
+ #!/bin/sh
2
+
3
+ # Test compilation with node-sass binary
4
+
5
+ mkdir -p tmp/node-sass
6
+ node-sass assets/stylesheets/bootstrap -o tmp/node-sass/bootstrap.css && \
7
+ node-sass assets/stylesheets/bootstrap/theme -o tmp/node-sass/bootstrap-theme.css || \
8
+ (echo "node-sass compilation failed" && exit 1)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass-backport
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0.2
4
+ version: 3.3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas McDonald
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-10-29 00:00:00.000000000 Z
12
+ date: 2014-11-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
@@ -331,7 +331,7 @@ files:
331
331
  - tasks/converter/less_conversion.rb
332
332
  - tasks/converter/logger.rb
333
333
  - tasks/converter/network.rb
334
- - templates/project/_bootstrap-variables.sass.erb
334
+ - templates/project/_bootstrap-variables.sass
335
335
  - templates/project/manifest.rb
336
336
  - templates/project/styles.sass
337
337
  - test/compass_test.rb
@@ -349,9 +349,6 @@ files:
349
349
  - test/dummy_rails/app/helpers/application_helper.rb
350
350
  - test/dummy_rails/app/views/layouts/application.html.erb
351
351
  - test/dummy_rails/app/views/pages/root.html.slim
352
- - test/dummy_rails/bin/bundle
353
- - test/dummy_rails/bin/rails
354
- - test/dummy_rails/bin/rake
355
352
  - test/dummy_rails/config.ru
356
353
  - test/dummy_rails/config/application.rb
357
354
  - test/dummy_rails/config/boot.rb
@@ -369,15 +366,8 @@ files:
369
366
  - test/dummy_rails/config/locales/en.yml
370
367
  - test/dummy_rails/config/locales/es.yml
371
368
  - test/dummy_rails/config/routes.rb
372
- - test/dummy_rails/db/test.sqlite3
373
- - test/dummy_rails/lib/assets/.keep
374
369
  - test/dummy_rails/log/.keep
375
370
  - test/dummy_rails/log/development.log
376
- - test/dummy_rails/log/production.log
377
- - test/dummy_rails/public/404.html
378
- - test/dummy_rails/public/422.html
379
- - test/dummy_rails/public/500.html
380
- - test/dummy_rails/public/favicon.ico
381
371
  - test/dummy_sass_only/Gemfile
382
372
  - test/dummy_sass_only/compile.rb
383
373
  - test/dummy_sass_only/import_all.sass
@@ -386,12 +376,11 @@ files:
386
376
  - test/gemfiles/sass_3_4.gemfile
387
377
  - test/gemfiles/sass_head.gemfile
388
378
  - test/node_mincer_test.rb
389
- - test/node_sass_test.rb
379
+ - test/node_sass_compile_test.sh
390
380
  - test/pages_test.rb
391
381
  - test/sass_test.rb
392
382
  - test/sprockets_rails_test.rb
393
383
  - test/support/dummy_rails_integration.rb
394
- - test/support/integration_test.rb
395
384
  - test/support/reporting.rb
396
385
  - test/test_helper.rb
397
386
  - test/test_helper_rails.rb
@@ -436,9 +425,6 @@ test_files:
436
425
  - test/dummy_rails/app/helpers/application_helper.rb
437
426
  - test/dummy_rails/app/views/layouts/application.html.erb
438
427
  - test/dummy_rails/app/views/pages/root.html.slim
439
- - test/dummy_rails/bin/bundle
440
- - test/dummy_rails/bin/rails
441
- - test/dummy_rails/bin/rake
442
428
  - test/dummy_rails/config.ru
443
429
  - test/dummy_rails/config/application.rb
444
430
  - test/dummy_rails/config/boot.rb
@@ -456,15 +442,8 @@ test_files:
456
442
  - test/dummy_rails/config/locales/en.yml
457
443
  - test/dummy_rails/config/locales/es.yml
458
444
  - test/dummy_rails/config/routes.rb
459
- - test/dummy_rails/db/test.sqlite3
460
- - test/dummy_rails/lib/assets/.keep
461
445
  - test/dummy_rails/log/.keep
462
446
  - test/dummy_rails/log/development.log
463
- - test/dummy_rails/log/production.log
464
- - test/dummy_rails/public/404.html
465
- - test/dummy_rails/public/422.html
466
- - test/dummy_rails/public/500.html
467
- - test/dummy_rails/public/favicon.ico
468
447
  - test/dummy_sass_only/Gemfile
469
448
  - test/dummy_sass_only/compile.rb
470
449
  - test/dummy_sass_only/import_all.sass
@@ -473,12 +452,12 @@ test_files:
473
452
  - test/gemfiles/sass_3_4.gemfile
474
453
  - test/gemfiles/sass_head.gemfile
475
454
  - test/node_mincer_test.rb
476
- - test/node_sass_test.rb
455
+ - test/node_sass_compile_test.sh
477
456
  - test/pages_test.rb
478
457
  - test/sass_test.rb
479
458
  - test/sprockets_rails_test.rb
480
459
  - test/support/dummy_rails_integration.rb
481
- - test/support/integration_test.rb
482
460
  - test/support/reporting.rb
483
461
  - test/test_helper.rb
484
462
  - test/test_helper_rails.rb
463
+ has_rdoc:
@@ -1,4 +0,0 @@
1
- <% require 'bootstrap-sass/version' %>
2
- // Override Bootstrap variables here (defaults from bootstrap-sass v<%= Bootstrap::VERSION %>):
3
-
4
- <%= File.read(@template[:options][:bs_variables_path]).gsub(/^(?=\$)/, '// ').gsub(/ !default;/, '') %>
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
3
- load Gem.bin_path('bundler', 'bundle')
@@ -1,4 +0,0 @@
1
- #!/usr/bin/env ruby
2
- APP_PATH = File.expand_path('../../config/application', __FILE__)
3
- require_relative '../config/boot'
4
- require 'rails/commands'
@@ -1,4 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require_relative '../config/boot'
3
- require 'rake'
4
- Rake.application.run
File without changes
File without changes
@@ -1,58 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>The page you were looking for doesn't exist (404)</title>
5
- <style>
6
- body {
7
- background-color: #EFEFEF;
8
- color: #2E2F30;
9
- text-align: center;
10
- font-family: arial, sans-serif;
11
- }
12
-
13
- div.dialog {
14
- width: 25em;
15
- margin: 4em auto 0 auto;
16
- border: 1px solid #CCC;
17
- border-right-color: #999;
18
- border-left-color: #999;
19
- border-bottom-color: #BBB;
20
- border-top: #B00100 solid 4px;
21
- border-top-left-radius: 9px;
22
- border-top-right-radius: 9px;
23
- background-color: white;
24
- padding: 7px 4em 0 4em;
25
- }
26
-
27
- h1 {
28
- font-size: 100%;
29
- color: #730E15;
30
- line-height: 1.5em;
31
- }
32
-
33
- body > p {
34
- width: 33em;
35
- margin: 0 auto 1em;
36
- padding: 1em 0;
37
- background-color: #F7F7F7;
38
- border: 1px solid #CCC;
39
- border-right-color: #999;
40
- border-bottom-color: #999;
41
- border-bottom-left-radius: 4px;
42
- border-bottom-right-radius: 4px;
43
- border-top-color: #DADADA;
44
- color: #666;
45
- box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
46
- }
47
- </style>
48
- </head>
49
-
50
- <body>
51
- <!-- This file lives in public/404.html -->
52
- <div class="dialog">
53
- <h1>The page you were looking for doesn't exist.</h1>
54
- <p>You may have mistyped the address or the page may have moved.</p>
55
- </div>
56
- <p>If you are the application owner check the logs for more information.</p>
57
- </body>
58
- </html>
@@ -1,58 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>The change you wanted was rejected (422)</title>
5
- <style>
6
- body {
7
- background-color: #EFEFEF;
8
- color: #2E2F30;
9
- text-align: center;
10
- font-family: arial, sans-serif;
11
- }
12
-
13
- div.dialog {
14
- width: 25em;
15
- margin: 4em auto 0 auto;
16
- border: 1px solid #CCC;
17
- border-right-color: #999;
18
- border-left-color: #999;
19
- border-bottom-color: #BBB;
20
- border-top: #B00100 solid 4px;
21
- border-top-left-radius: 9px;
22
- border-top-right-radius: 9px;
23
- background-color: white;
24
- padding: 7px 4em 0 4em;
25
- }
26
-
27
- h1 {
28
- font-size: 100%;
29
- color: #730E15;
30
- line-height: 1.5em;
31
- }
32
-
33
- body > p {
34
- width: 33em;
35
- margin: 0 auto 1em;
36
- padding: 1em 0;
37
- background-color: #F7F7F7;
38
- border: 1px solid #CCC;
39
- border-right-color: #999;
40
- border-bottom-color: #999;
41
- border-bottom-left-radius: 4px;
42
- border-bottom-right-radius: 4px;
43
- border-top-color: #DADADA;
44
- color: #666;
45
- box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
46
- }
47
- </style>
48
- </head>
49
-
50
- <body>
51
- <!-- This file lives in public/422.html -->
52
- <div class="dialog">
53
- <h1>The change you wanted was rejected.</h1>
54
- <p>Maybe you tried to change something you didn't have access to.</p>
55
- </div>
56
- <p>If you are the application owner check the logs for more information.</p>
57
- </body>
58
- </html>
@@ -1,57 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>We're sorry, but something went wrong (500)</title>
5
- <style>
6
- body {
7
- background-color: #EFEFEF;
8
- color: #2E2F30;
9
- text-align: center;
10
- font-family: arial, sans-serif;
11
- }
12
-
13
- div.dialog {
14
- width: 25em;
15
- margin: 4em auto 0 auto;
16
- border: 1px solid #CCC;
17
- border-right-color: #999;
18
- border-left-color: #999;
19
- border-bottom-color: #BBB;
20
- border-top: #B00100 solid 4px;
21
- border-top-left-radius: 9px;
22
- border-top-right-radius: 9px;
23
- background-color: white;
24
- padding: 7px 4em 0 4em;
25
- }
26
-
27
- h1 {
28
- font-size: 100%;
29
- color: #730E15;
30
- line-height: 1.5em;
31
- }
32
-
33
- body > p {
34
- width: 33em;
35
- margin: 0 auto 1em;
36
- padding: 1em 0;
37
- background-color: #F7F7F7;
38
- border: 1px solid #CCC;
39
- border-right-color: #999;
40
- border-bottom-color: #999;
41
- border-bottom-left-radius: 4px;
42
- border-bottom-right-radius: 4px;
43
- border-top-color: #DADADA;
44
- color: #666;
45
- box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
46
- }
47
- </style>
48
- </head>
49
-
50
- <body>
51
- <!-- This file lives in public/500.html -->
52
- <div class="dialog">
53
- <h1>We're sorry, but something went wrong.</h1>
54
- </div>
55
- <p>If you are the application owner check the logs for more information.</p>
56
- </body>
57
- </html>
File without changes
@@ -1,16 +0,0 @@
1
- require 'test_helper'
2
- require 'fileutils'
3
-
4
- class NodeSassTest < Minitest::Test
5
- def test_node_sass_compilation
6
- path = 'assets/stylesheets'
7
- %w(bootstrap bootstrap/_theme).each do |file|
8
- FileUtils.mkdir_p 'tmp/node-sass'
9
- command = "node-sass #{path}/#{file} -o tmp/node-sass/#{File.basename file}.css"
10
- success = silence_stderr_if !ENV['VERBOSE'] do
11
- system command
12
- end
13
- assert success, 'node-sass compilation failed'
14
- end
15
- end
16
- end
@@ -1,22 +0,0 @@
1
- require 'capybara'
2
- module IntegrationTest
3
- include Capybara::DSL
4
-
5
- def setup
6
- super
7
- %x[rm -rf test/dummy_rails/tmp/cache]
8
- end
9
-
10
- def teardown
11
- super
12
- Capybara.reset_sessions!
13
- Capybara.use_default_driver
14
- end
15
-
16
- def screenshot!
17
- screenshot_dir = File.expand_path('../../tmp/', File.dirname(__FILE__))
18
- page.driver.render(File.join(screenshot_dir, "#{name}.png"), :full => true)
19
- source = page.evaluate_script("document.getElementsByTagName('html')[0].outerHTML") rescue nil
20
- File.open(File.join(screenshot_dir, "#{name}.html"), 'w') { |f| f.write(source) } if source
21
- end
22
- end