diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 887527fd..c6aab1cf 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -111,7 +111,7 @@ credits = [ 'https://raw.githubusercontent.com/jashkenas/backbone/master/LICENSE' ], [ 'Bootstrap', - '2011-2016 Twitter, Inc.', + '2011-2017 Twitter, Inc.
2011-2017 The Bootstrap Authors', 'CC BY', 'https://creativecommons.org/licenses/by/3.0/' ], [ diff --git a/lib/docs/filters/bootstrap/clean_html_v4.rb b/lib/docs/filters/bootstrap/clean_html_v4.rb index 7e1dc86f..12db365b 100644 --- a/lib/docs/filters/bootstrap/clean_html_v4.rb +++ b/lib/docs/filters/bootstrap/clean_html_v4.rb @@ -12,7 +12,7 @@ module Docs node.parent.remove end - css('.bd-example-row', '.table-responsive').each do |node| + css('.bd-example-row', '.bd-example-border-utils').each do |node| node.before(node.children).remove end diff --git a/lib/docs/filters/bootstrap/entries_v4.rb b/lib/docs/filters/bootstrap/entries_v4.rb index 7ffc7e69..e84b2371 100644 --- a/lib/docs/filters/bootstrap/entries_v4.rb +++ b/lib/docs/filters/bootstrap/entries_v4.rb @@ -30,7 +30,7 @@ module Docs entries << [name, id] end - css("#options + p + div tbody td:first-child").each do |node| + css("#options + p + table tbody td:first-child").each do |node| name = node.content.strip id = node.parent['id'] = "#{name.parameterize}-option" name.prepend "#{self.name}: " @@ -40,7 +40,9 @@ module Docs css("#methods + table tbody td:first-child, #methods ~ h4 code").each do |node| next unless name = node.content[/\('(\w+)'\)/, 1] - id = node.parent['id'] = "#{name.parameterize}-method" + unless id = node.parent['id'] + id = node.parent['id'] = "#{name.parameterize}-method" + end name.prepend "#{self.name}: " name << ' (method)' entries << [name, id] diff --git a/lib/docs/scrapers/bootstrap.rb b/lib/docs/scrapers/bootstrap.rb index 67270cf1..f9b31070 100644 --- a/lib/docs/scrapers/bootstrap.rb +++ b/lib/docs/scrapers/bootstrap.rb @@ -9,13 +9,14 @@ module Docs options[:trailing_slash] = false options[:attribution] = <<-HTML - © 2011–2016 Twitter, Inc.
+ © 2011–2017 Twitter, Inc.
+ © 2011–2017 The Bootstrap Authors
Code licensed under the MIT License.
Documentation licensed under the Creative Commons Attribution License v3.0. HTML version '4' do - self.release = 'alpha.5' + self.release = 'alpha.6' self.base_url = 'https://v4-alpha.getbootstrap.com/' self.root_path = 'getting-started/introduction'