Skip to content

Commit

Permalink
Update bootstrap/nanoc (#1903)
Browse files Browse the repository at this point in the history
Update to the latest nanoc and bootstrap 3.x
* Bump jquery to 3.6.0.
* Remove trailing newline in .ruby-version.

[0]: https://docs.netlify.com/configure-builds/manage-dependencies/#ruby

Signed-off-by: Ben Kochie <[email protected]>
  • Loading branch information
SuperQ authored Mar 13, 2021
1 parent 50da45d commit 21126f7
Show file tree
Hide file tree
Showing 30 changed files with 2,219 additions and 1,281 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
static/bootstrap-3.3.1/* linguist-vendored
static/bootstrap-3.4.1/* linguist-vendored
static/font-awesome-4.7.0/* linguist-vendored
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
2.7.1
75 changes: 36 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ GEM
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
adsf (1.4.3)
adsf (1.4.5)
rack (>= 1.0.0, < 3.0.0)
builder (3.2.4)
coderay (1.1.3)
colored (1.2)
concurrent-ruby (1.1.7)
cri (2.15.10)
concurrent-ruby (1.1.8)
cri (2.15.11)
ddmemoize (1.0.0)
ddmetrics (~> 1.0)
ref (~> 2.0)
ddmetrics (1.0.1)
ddplugin (1.0.2)
ddplugin (1.0.3)
diff-lcs (1.4.4)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
equatable (0.6.1)
eventmachine (1.2.7)
ffi (1.13.1)
ffi (1.15.0)
formatador (0.2.5)
guard (2.16.2)
formatador (>= 0.2.4)
Expand All @@ -46,35 +45,35 @@ GEM
hamster (3.0.0)
concurrent-ruby (~> 1.0)
http_parser.rb (0.6.0)
json_schema (0.20.9)
json_schema (0.21.0)
kramdown (2.3.0)
rexml
listen (3.2.1)
listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.2.8)
method_source (1.0.0)
mini_portile2 (2.5.0)
multi_json (1.15.0)
nanoc (4.11.19)
nanoc (4.12.0)
addressable (~> 2.5)
colored (~> 1.2)
nanoc-checking (~> 1.0)
nanoc-cli (= 4.11.19)
nanoc-core (= 4.11.19)
nanoc-cli (= 4.12.0)
nanoc-core (= 4.12.0)
nanoc-deploying (~> 1.0)
parallel (~> 1.12)
tty-command (~> 0.8)
tty-which (~> 0.4)
nanoc-checking (1.0.0)
nanoc-checking (1.0.1)
nanoc-cli (~> 4.11, >= 4.11.15)
nanoc-core (~> 4.11, >= 4.11.15)
nanoc-cli (4.11.19)
nanoc-cli (4.12.0)
cri (~> 2.15)
diff-lcs (~> 1.3)
nanoc-core (= 4.11.19)
nanoc-core (= 4.12.0)
zeitwerk (~> 2.1)
nanoc-core (4.11.19)
nanoc-core (4.12.0)
concurrent-ruby (~> 1.1)
ddmemoize (~> 1.0)
ddmetrics (~> 1.0)
Expand All @@ -85,27 +84,25 @@ GEM
tomlrb (~> 1.2)
tty-platform (~> 0.2)
zeitwerk (~> 2.1)
nanoc-deploying (1.0.0)
nanoc-deploying (1.0.1)
nanoc-checking (~> 1.0)
nanoc-cli (~> 4.11, >= 4.11.15)
nanoc-core (~> 4.11, >= 4.11.15)
nenv (0.3.0)
nokogiri (1.11.0)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
parallel (1.19.2)
pastel (0.7.4)
equatable (~> 0.6)
parallel (1.20.1)
pastel (0.8.0)
tty-color (~> 0.5)
pry (0.13.1)
pry (0.14.0)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
pygments.rb (1.2.1)
multi_json (>= 1.0.0)
pygments.rb (2.1.0)
racc (1.5.2)
rack (2.2.3)
rb-fchange (0.0.6)
Expand All @@ -116,30 +113,30 @@ GEM
redcarpet (3.5.1)
ref (2.0.0)
rexml (3.2.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
semverse (3.0.0)
shellany (0.0.1)
slow_enumerator_tools (1.1.0)
thor (1.0.1)
thor (1.1.0)
tomlrb (1.3.0)
tty-color (0.5.2)
tty-command (0.9.0)
pastel (~> 0.7.0)
tty-color (0.6.0)
tty-command (0.10.1)
pastel (~> 0.8)
tty-platform (0.3.0)
tty-which (0.4.2)
zeitwerk (2.4.0)
zeitwerk (2.4.2)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions layouts/footer.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-2.2.2.min.js" integrity="sha256-36cp2Co+/62rEAAYHLmRCPIych47CvdM+uTBJwSzWjI=" crossorigin="anonymous"></script>
<script src="/assets/bootstrap-3.3.1/js/bootstrap.min.js"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="/assets/bootstrap-3.4.1/js/bootstrap.min.js"></script>
<script src="/assets/docs.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="/assets/ie10-viewport-bug-workaround.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion layouts/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<% end %>

<!-- Bootstrap core CSS -->
<link href="/assets/bootstrap-3.3.1/css/bootstrap.min.css" rel="stylesheet">
<link href="/assets/bootstrap-3.4.1/css/bootstrap.min.css" rel="stylesheet">

<!-- Algolia site search, see https://www.algolia.com/solutions/site-search/ -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
Expand Down
1 change: 0 additions & 1 deletion static/bootstrap-3.3.1/css/bootstrap-theme.css.map

This file was deleted.

5 changes: 0 additions & 5 deletions static/bootstrap-3.3.1/css/bootstrap-theme.min.css

This file was deleted.

1 change: 0 additions & 1 deletion static/bootstrap-3.3.1/css/bootstrap.css.map

This file was deleted.

5 changes: 0 additions & 5 deletions static/bootstrap-3.3.1/css/bootstrap.min.css

This file was deleted.

Binary file not shown.
Loading

0 comments on commit 21126f7

Please sign in to comment.