bootstrap-sass 3.3.3 → 3.3.4.1

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.

Potentially problematic release.


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

Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/Gemfile +1 -1
  4. data/README.md +36 -14
  5. data/Rakefile +12 -1
  6. data/assets/javascripts/bootstrap-sprockets.js +2 -2
  7. data/assets/javascripts/bootstrap.js +108 -97
  8. data/assets/javascripts/bootstrap.min.js +3 -3
  9. data/assets/javascripts/bootstrap/affix.js +5 -5
  10. data/assets/javascripts/bootstrap/alert.js +2 -2
  11. data/assets/javascripts/bootstrap/button.js +2 -2
  12. data/assets/javascripts/bootstrap/carousel.js +6 -6
  13. data/assets/javascripts/bootstrap/collapse.js +7 -7
  14. data/assets/javascripts/bootstrap/dropdown.js +3 -3
  15. data/assets/javascripts/bootstrap/modal.js +41 -26
  16. data/assets/javascripts/bootstrap/popover.js +3 -8
  17. data/assets/javascripts/bootstrap/scrollspy.js +17 -20
  18. data/assets/javascripts/bootstrap/tab.js +3 -3
  19. data/assets/javascripts/bootstrap/tooltip.js +17 -13
  20. data/assets/javascripts/bootstrap/transition.js +1 -1
  21. data/assets/stylesheets/bootstrap/_alerts.scss +2 -2
  22. data/assets/stylesheets/bootstrap/_badges.scss +6 -5
  23. data/assets/stylesheets/bootstrap/_component-animations.scss +1 -2
  24. data/assets/stylesheets/bootstrap/_dropdowns.scss +1 -1
  25. data/assets/stylesheets/bootstrap/_forms.scss +10 -2
  26. data/assets/stylesheets/bootstrap/_glyphicons.scss +4 -0
  27. data/assets/stylesheets/bootstrap/_jumbotron.scss +1 -1
  28. data/assets/stylesheets/bootstrap/_modals.scss +3 -1
  29. data/assets/stylesheets/bootstrap/_navbar.scss +0 -1
  30. data/assets/stylesheets/bootstrap/_navs.scss +0 -2
  31. data/assets/stylesheets/bootstrap/_responsive-embed.scss +8 -8
  32. data/assets/stylesheets/bootstrap/_scaffolding.scss +12 -0
  33. data/assets/stylesheets/bootstrap/_tooltip.scss +0 -1
  34. data/assets/stylesheets/bootstrap/_type.scss +1 -1
  35. data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
  36. data/assets/stylesheets/bootstrap/_variables.scss +5 -1
  37. data/bower.json +1 -1
  38. data/lib/bootstrap-sass/version.rb +2 -2
  39. data/package.json +3 -3
  40. data/tasks/converter/js_conversion.rb +1 -1
  41. data/tasks/converter/less_conversion.rb +11 -12
  42. data/tasks/converter/network.rb +10 -5
  43. data/templates/project/_bootstrap-variables.sass +6 -2
  44. data/test/dummy_rails/app/assets/stylesheets/{application.css.sass → application.sass} +0 -0
  45. data/test/dummy_rails/app/views/pages/root.html.slim +43 -0
  46. data/test/dummy_rails/config/environments/development.rb +0 -3
  47. data/test/dummy_rails/config/environments/production.rb +7 -1
  48. data/test/dummy_rails/config/environments/test.rb +7 -1
  49. metadata +6 -7
@@ -3,8 +3,12 @@ class Converter
3
3
  module Network
4
4
  protected
5
5
 
6
- def get_paths_by_type(dir, file_re, tree = get_tree(get_tree_sha(dir)))
7
- tree['tree'].select { |f| f['type'] == 'blob' && f['path'] =~ file_re }.map { |f| f['path'] }
6
+ def get_paths_by_type(dir, file_re, recursive = true)
7
+ get_file_paths(dir, recursive).select { |path| path =~ file_re }
8
+ end
9
+
10
+ def get_file_paths(dir, recursive = true)
11
+ get_tree(get_tree_sha(dir), recursive)['tree'].select { |f| f['type'] == 'blob' }.map { |f| f['path'] }
8
12
  end
9
13
 
10
14
  def read_files(path, files)
@@ -44,7 +48,8 @@ class Converter
44
48
 
45
49
 
46
50
  def get_file(url)
47
- cache_path = "./#@cache_path#{URI(url).path}"
51
+ uri = URI(url)
52
+ cache_path = "./#@cache_path#{uri.path}#{uri.query.tr('?&=', '-') if uri.query}"
48
53
  FileUtils.mkdir_p File.dirname(cache_path)
49
54
  if File.exists?(cache_path)
50
55
  log_http_get_file url, true
@@ -81,8 +86,8 @@ class Converter
81
86
  @trees ||= get_tree(@branch_sha)
82
87
  end
83
88
 
84
- def get_tree(sha)
85
- get_json("https://api.github.com/repos/#@repo/git/trees/#{sha}")
89
+ def get_tree(sha, recursive = true)
90
+ get_json("https://api.github.com/repos/#@repo/git/trees/#{sha}#{'?recursive=1' if recursive}")
86
91
  end
87
92
 
88
93
  def get_json(url)
@@ -1,4 +1,4 @@
1
- // Override Bootstrap variables here (defaults from bootstrap-sass v3.3.3):
1
+ // Override Bootstrap variables here (defaults from bootstrap-sass v3.3.4):
2
2
 
3
3
  //
4
4
  // Variables
@@ -213,6 +213,9 @@
213
213
  //** Small `.form-control` height
214
214
  // $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
215
215
 
216
+ //** `.form-group` margin
217
+ // $form-group-margin-bottom: 15px
218
+
216
219
  // $legend-color: $gray-dark
217
220
  // $legend-border-color: #e5e5e5
218
221
 
@@ -272,7 +275,8 @@
272
275
  // $zindex-popover: 1060
273
276
  // $zindex-tooltip: 1070
274
277
  // $zindex-navbar-fixed: 1030
275
- // $zindex-modal: 1040
278
+ // $zindex-modal-background: 1040
279
+ // $zindex-modal: 1050
276
280
 
277
281
 
278
282
  //== Media queries breakpoints
@@ -1,3 +1,46 @@
1
+ .navbar.navbar-inverse: .container-fluid
2
+ .navbar-header
3
+ button.navbar-toggle.collapsed type="button" data-toggle="collapse" data-target="#c1"
4
+ span.sr-only Toggle navigation
5
+ span.icon-bar
6
+ span.icon-bar
7
+ span.icon-bar
8
+ a.navbar-brand href="#" Bootstrap for Sass Test Rails App
9
+ .collapse.navbar-collapse#c1
10
+ ul.nav.navbar-nav
11
+ li.active: a href="#"
12
+ ' Home
13
+ span.sr-only (current)
14
+ li: a href="#" Link
15
+ li.dropdown
16
+ a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
17
+ ' Dropdown
18
+ span.caret
19
+ ul.dropdown-menu role="menu"
20
+ li: a href="#" Action
21
+ li: a href="#" Another action
22
+ li: a href="#" Something else here
23
+ li.divider
24
+ li: a href="#" Separated link
25
+ li.divider
26
+ li: a href="#" One more separated link
27
+ form.navbar-form.navbar-left role="search"
28
+ .input-group
29
+ input.form-control type="search" placeholder="Search..."
30
+ .input-group-btn: button.btn.btn-primary type="submit" Go
31
+ ul.nav.navbar-nav.navbar-right
32
+ li: a href="#" Link
33
+ li.dropdown
34
+ a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
35
+ ' Dropdown
36
+ span.caret
37
+ ul.dropdown-menu role="menu"
38
+ li: a href="#" Action
39
+ li: a href="#" Another action
40
+ li: a href="#" Something else here
41
+ li.divider
42
+ li: a href="#" Separated link
43
+
1
44
  .container
2
45
  .panel.panel-primary
3
46
  .panel-heading: h1 Dummy App
@@ -16,9 +16,6 @@ Dummy::Application.configure do
16
16
  # Print deprecation notices to the Rails logger.
17
17
  config.active_support.deprecation = :log
18
18
 
19
- # Raise an error on page load if there are pending migrations
20
- config.active_record.migration_error = :page_load
21
-
22
19
  # Debug mode disables concatenation and preprocessing of assets.
23
20
  # This option may cause significant delays in view rendering with a large
24
21
  # number of complex assets.
@@ -20,7 +20,13 @@ Dummy::Application.configure do
20
20
  # config.action_dispatch.rack_cache = true
21
21
 
22
22
  # Disable Rails's static asset server (Apache or nginx will already do this).
23
- config.serve_static_assets = false
23
+ if config.respond_to?(:serve_static_files)
24
+ # rails >= 4.2
25
+ config.serve_static_files = true
26
+ elsif config.respond_to?(:serve_static_assets)
27
+ # rails < 4.2
28
+ config.serve_static_assets = true
29
+ end
24
30
 
25
31
  # Compress JavaScripts and CSS.
26
32
  config.assets.js_compressor = :uglifier
@@ -13,7 +13,13 @@ Dummy::Application.configure do
13
13
  config.eager_load = false
14
14
 
15
15
  # Configure static asset server for tests with Cache-Control for performance.
16
- config.serve_static_assets = true
16
+ if config.respond_to?(:serve_static_files)
17
+ # rails >= 4.2
18
+ config.serve_static_files = true
19
+ elsif config.respond_to?(:serve_static_assets)
20
+ # rails < 4.2
21
+ config.serve_static_assets = true
22
+ end
17
23
  config.static_cache_control = "public, max-age=3600"
18
24
 
19
25
  # Show full error reports and disable caching.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.3
4
+ version: 3.3.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas McDonald
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-20 00:00:00.000000000 Z
11
+ date: 2015-03-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
@@ -342,7 +342,7 @@ files:
342
342
  - test/dummy_rails/Rakefile
343
343
  - test/dummy_rails/app/assets/images/.keep
344
344
  - test/dummy_rails/app/assets/javascripts/application.js
345
- - test/dummy_rails/app/assets/stylesheets/application.css.sass
345
+ - test/dummy_rails/app/assets/stylesheets/application.sass
346
346
  - test/dummy_rails/app/controllers/application_controller.rb
347
347
  - test/dummy_rails/app/controllers/pages_controller.rb
348
348
  - test/dummy_rails/app/helpers/application_helper.rb
@@ -366,7 +366,6 @@ files:
366
366
  - test/dummy_rails/config/locales/es.yml
367
367
  - test/dummy_rails/config/routes.rb
368
368
  - test/dummy_rails/log/.keep
369
- - test/dummy_rails/log/development.log
370
369
  - test/dummy_sass_only/Gemfile
371
370
  - test/dummy_sass_only/compile.rb
372
371
  - test/dummy_sass_only/import_all.sass
@@ -403,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
403
402
  version: '0'
404
403
  requirements: []
405
404
  rubyforge_project:
406
- rubygems_version: 2.4.1
405
+ rubygems_version: 2.4.6
407
406
  signing_key:
408
407
  specification_version: 4
409
408
  summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass
@@ -417,7 +416,7 @@ test_files:
417
416
  - test/dummy_rails/Rakefile
418
417
  - test/dummy_rails/app/assets/images/.keep
419
418
  - test/dummy_rails/app/assets/javascripts/application.js
420
- - test/dummy_rails/app/assets/stylesheets/application.css.sass
419
+ - test/dummy_rails/app/assets/stylesheets/application.sass
421
420
  - test/dummy_rails/app/controllers/application_controller.rb
422
421
  - test/dummy_rails/app/controllers/pages_controller.rb
423
422
  - test/dummy_rails/app/helpers/application_helper.rb
@@ -441,7 +440,6 @@ test_files:
441
440
  - test/dummy_rails/config/locales/es.yml
442
441
  - test/dummy_rails/config/routes.rb
443
442
  - test/dummy_rails/log/.keep
444
- - test/dummy_rails/log/development.log
445
443
  - test/dummy_sass_only/Gemfile
446
444
  - test/dummy_sass_only/compile.rb
447
445
  - test/dummy_sass_only/import_all.sass
@@ -458,3 +456,4 @@ test_files:
458
456
  - test/support/reporting.rb
459
457
  - test/test_helper.rb
460
458
  - test/test_helper_rails.rb
459
+ has_rdoc: