Skip to content

Commit 3a6fcdf

Browse files
committed
Update Bootstrap documentation (alpha.6, 3.3.7)
1 parent 1981b50 commit 3a6fcdf

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

assets/javascripts/templates/pages/about_tmpl.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ credits = [
111111
'https://raw.githubusercontent.com/jashkenas/backbone/master/LICENSE'
112112
], [
113113
'Bootstrap',
114-
'2011-2016 Twitter, Inc.',
114+
'2011-2017 Twitter, Inc.<br>2011-2017 The Bootstrap Authors',
115115
'CC BY',
116116
'https://creativecommons.org/licenses/by/3.0/'
117117
], [

lib/docs/filters/bootstrap/clean_html_v4.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def call
1212
node.parent.remove
1313
end
1414

15-
css('.bd-example-row', '.table-responsive').each do |node|
15+
css('.bd-example-row', '.bd-example-border-utils').each do |node|
1616
node.before(node.children).remove
1717
end
1818

lib/docs/filters/bootstrap/entries_v4.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def additional_entries
3030
entries << [name, id]
3131
end
3232

33-
css("#options + p + div tbody td:first-child").each do |node|
33+
css("#options + p + table tbody td:first-child").each do |node|
3434
name = node.content.strip
3535
id = node.parent['id'] = "#{name.parameterize}-option"
3636
name.prepend "#{self.name}: "
@@ -40,7 +40,9 @@ def additional_entries
4040

4141
css("#methods + table tbody td:first-child, #methods ~ h4 code").each do |node|
4242
next unless name = node.content[/\('(\w+)'\)/, 1]
43-
id = node.parent['id'] = "#{name.parameterize}-method"
43+
unless id = node.parent['id']
44+
id = node.parent['id'] = "#{name.parameterize}-method"
45+
end
4446
name.prepend "#{self.name}: "
4547
name << ' (method)'
4648
entries << [name, id]

lib/docs/scrapers/bootstrap.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ class Bootstrap < UrlScraper
99
options[:trailing_slash] = false
1010

1111
options[:attribution] = <<-HTML
12-
&copy; 2011&ndash;2016 Twitter, Inc.<br>
12+
&copy; 2011&ndash;2017 Twitter, Inc.<br>
13+
&copy; 2011&ndash;2017 The Bootstrap Authors<br>
1314
Code licensed under the MIT License.<br>
1415
Documentation licensed under the Creative Commons Attribution License v3.0.
1516
HTML
1617

1718
version '4' do
18-
self.release = 'alpha.5'
19+
self.release = 'alpha.6'
1920
self.base_url = 'https://v4-alpha.getbootstrap.com/'
2021
self.root_path = 'getting-started/introduction'
2122

0 commit comments

Comments
 (0)