Skip to content

Commit 57649f1

Browse files
duncdrumduncdrum
committed
chore(npm): bump bootstrap to 4
minor navbar reorganization
1 parent 31d57f6 commit 57649f1

File tree

7 files changed

+76
-135
lines changed

7 files changed

+76
-135
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "4.1.1",
44
"description": "Documentation package for eXist-db",
55
"scripts": {
6-
"copy": "cpx node_modules/bootstrap/dist/js/bootstrap.min.js src/main/xar-resources/resources/scripts && cpx node_modules/jquery/dist/jquery.min.js src/main/xar-resources/resources/scripts && cpx node_modules/highlight.js/build/highlight.pack.js src/main/xar-resources/resources/scripts && cpx node_modules/bootstrap/dist/css/bootstrap.min.css src/main/xar-resources/resources/styles && cpx node_modules/bootstrap/dist/css/bootstrap.min.css.map src/main/xar-resources/resources/styles && cpx node_modules/highlight.js/src/styles/atom-one-dark.css src/main/xar-resources/resources/styles",
6+
"copy": "cpx -C node_modules/bootstrap/dist/js/bootstrap.min.js.* src/main/xar-resources/resources/scripts && cpx node_modules/jquery/dist/jquery.min.js src/main/xar-resources/resources/scripts && cpx node_modules/highlight.js/build/highlight.pack.js src/main/xar-resources/resources/scripts && cpx node_modules/bootstrap/dist/css/bootstrap.min.css.* src/main/xar-resources/resources/styles && cpx node_modules/highlight.js/src/styles/atom-one-dark.css src/main/xar-resources/resources/styles",
77
"test": "mocha src/test/mocha/ --recursive --exit"
88
},
99
"repository": {
@@ -28,7 +28,7 @@
2828
"mocha": "^6.1.4"
2929
},
3030
"dependencies": {
31-
"bootstrap": "^3.4.0",
31+
"bootstrap": "^4.2.1",
3232
"highlight.js": "git+https://github.com/duncdrum/highlight.js.git#rebase-2019",
3333
"jquery": "^3.3.1"
3434
}

‎src/main/xar-resources/resources/scripts/bootstrap.min.js‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/xar-resources/resources/scripts/bootstrap.min.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/xar-resources/resources/styles/bootstrap.min.css‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/xar-resources/resources/styles/bootstrap.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/xar-resources/resources/styles/exist-2.2.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ body {
235235
}
236236
#copyright {
237237
float: right;
238-
width: 220px;
238+
width: 240px;
239239
text-align: right;
240240
padding-top: 1em;
241241
}

‎src/main/xar-resources/templates/page.html‎

Lines changed: 61 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -19,138 +19,76 @@
1919
</div>
2020
</div>
2121
</div>
22-
<nav class="navbar navbar-default" role="navigation">
22+
<nav class="navbar navbar-dark bg-dark navbar-expand-md" role="navigation">
2323
<div class="container">
24-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
24+
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-collapse-1">
2525
<span class="sr-only">Toggle navigation</span>
26-
<span class="icon-bar" />
27-
<span class="icon-bar" />
28-
<span class="icon-bar" />
2926
</button>
3027
<div class="navbar-collapse collapse" id="navbar-collapse-1">
31-
<ul class="nav navbar-nav">
32-
<li class="dropdown" id="about">
33-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Home</a>
34-
<ul class="dropdown-menu">
35-
<li>
36-
<a href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
37-
</li>
38-
<li>
39-
<a href="http://exist-db.org">eXist-db.org</a>
40-
</li>
41-
</ul>
28+
<ul class="navbar-nav mr-auto">
29+
<li class="nav-item dropdown" id="about">
30+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Home</a>
31+
<div class="dropdown-menu">
32+
<a class="dropdown-item" href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
33+
<a class="dropdown-item" href="http://exist-db.org">eXist-db.org</a>
34+
</div>
4235
</li>
43-
<li class="dropdown" id="demo">
44-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Demo</a>
45-
<ul class="dropdown-menu">
46-
<li>
47-
<a href="{${demo.pkg.abbrev}}/index.html">Overview</a>
48-
</li>
49-
<li>
50-
<a href="{${demo.pkg.abbrev}}/examples/basic/basics.html">Basic XQuery Examples</a>
51-
</li>
52-
<li>
53-
<a href="{${demo.pkg.abbrev}}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
54-
</li>
55-
<li>
56-
<a href="{${demo.pkg.abbrev}}/examples/web/index.html">Web Examples</a>
57-
</li>
58-
<li>
59-
<a href="{${demo.pkg.abbrev}}/examples/urlrewriting/index.html">URL Rewriting</a>
60-
</li>
61-
<li>
62-
<a href="{${demo.pkg.abbrev}}/examples/special/index.html">Special Features</a>
63-
</li>
64-
<li>
65-
<a href="{${demo.pkg.abbrev}}/examples/templating/templates.html">Templating</a>
66-
</li>
67-
<li>
68-
<a href="{${demo.pkg.abbrev}}/cex-demo.html">Content Extraction</a>
69-
</li>
70-
<li>
71-
<a href="{${demo.pkg.abbrev}}/examples/tests/test.html">Unit Testing</a>
72-
</li>
73-
<li>
74-
<a href="{${demo.pkg.abbrev}}/examples/contacts/html/home.html?browseContacts">RestXQ and
36+
<li class="nav-item dropdown" id="demo">
37+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Demo</a>
38+
<div class="dropdown-menu">
39+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/index.html">Overview</a>
40+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/basic/basics.html">Basic XQuery Examples</a>
41+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
42+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/web/index.html">Web Examples</a>
43+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/urlrewriting/index.html">URL Rewriting</a>
44+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/special/index.html">Special Features</a>
45+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/templating/templates.html">Templating</a>
46+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/cex-demo.html">Content Extraction</a>
47+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/tests/test.html">Unit Testing</a>
48+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/contacts/html/home.html?browseContacts">RestXQ and
7549
AngularJS</a>
76-
</li>
77-
<li>
78-
<a href="{${demo.pkg.abbrev}}/examples/xforms/">XForms and RestXQ</a>
79-
</li>
80-
<li>
81-
<a href="{${demo.pkg.abbrev}}/examples/contacts/html/home.html">Contacts RestXQ Demo</a>
82-
</li>
83-
</ul>
50+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/xforms/">XForms and RestXQ</a>
51+
<a class="dropdown-item" href="{${demo.pkg.abbrev}}/examples/contacts/html/home.html">Contacts RestXQ Demo</a>
52+
</div>
8453
</li>
85-
<li class="dropdown" id="documentation">
86-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation</a>
87-
<ul class="dropdown-menu">
88-
<li>
89-
<a href="documentation.xml">Documentation</a>
90-
</li>
91-
<li>
92-
<a href="diagnostics.html">diagnostics</a>
93-
</li>
94-
<li>
95-
<a href="editorial-view.html">editorial</a>
96-
</li>
97-
<li>
98-
<a href="author-reference.xml">author guidelines</a>
99-
</li>
100-
<li>
101-
<a href="getting-help.xml">Get Support</a>
102-
</li>
103-
<li role="separator" class="divider"></li>
104-
<li>
105-
<a href="{${fundocs.pkg.abbrev}}/index.html">XQuery Functions</a>
106-
</li>
107-
<li role="separator" class="divider"></li>
108-
<li>
109-
<a href="http://exist-db.org/exist/apps/wiki/">News / Wiki</a>
110-
</li>
111-
<li>
112-
<a href="http://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
113-
</li>
114-
</ul>
54+
<li class="nav-item dropdown" id="documentation">
55+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Documentation</a>
56+
<div class="dropdown-menu">
57+
<a class="nav-link dropdown-item" href="documentation.xml">Documentation</a>
58+
<a class="dropdown-item" href="author-reference.xml">author guidelines</a>
59+
<a class="dropdown-item" href="getting-help.xml">Get Support</a>
60+
<div class="dropdown-divider"></div>
61+
<a class="dropdown-item" href="{${fundocs.pkg.abbrev}}/index.html">XQuery Functions</a>
62+
<div class="dropdown-divider"></div>
63+
<a class="dropdown-item" href="http://exist-db.org/exist/apps/wiki/">News / Wiki</a>
64+
<a class="dropdown-item" href="http://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
65+
</div>
11566
</li>
116-
<li class="dropdown" id="development">
117-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Development</a>
118-
<ul class="dropdown-menu">
119-
<li>
120-
<a href="{${exide.pkg.abbrev}}/index.html">eXide</a>
121-
</li>
122-
<li>
123-
<a href="http://exist-db.org/api/index.html">Javadocs</a>
124-
</li>
125-
<li>
126-
<a href="https://github.com/eXist-db/exist/issues">Bug Tracker</a>
127-
</li>
128-
<li>
129-
<a href="https://github.com/eXist-db/exist">Source code</a>
130-
</li>
131-
<li>
132-
<a href="https://github.com/eXist-db/exist#contributing-to-exist">Submit
133-
Patches</a>
134-
</li>
135-
</ul>
67+
<li class="nav-item dropdown" id="development">
68+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Development</a>
69+
<div class="dropdown-menu">
70+
<a class="dropdown-item" href="{${exide.pkg.abbrev}}/index.html">eXide</a>
71+
<a class="dropdown-item" href="http://exist-db.org/api/index.html">Javadocs</a>
72+
<a class="dropdown-item" href="https://github.com/eXist-db/exist/issues">Bug Tracker</a>
73+
<a class="dropdown-item" href="https://github.com/eXist-db/exist">Source code</a>
74+
<a class="dropdown-item" href="https://github.com/eXist-db/exist#contributing-to-exist">Submit Patches</a>
75+
<div class="dropdown-divider"></div>
76+
<a class="dropdown-item" href="diagnostics.html">Documentation Diagnostics</a>
77+
<a class="dropdown-item" href="editorial-view.html">Documentation Editorial</a>
78+
</div>
13679
</li>
137-
<li class="dropdown" id="administration">
138-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Administration</a>
139-
<ul class="dropdown-menu">
140-
<li>
141-
<a href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
142-
</li>
143-
<li>
144-
<a href="/webstart/exist.jnlp">Webstart Client</a>
145-
</li>
146-
<li>
147-
<a href="{${monex.pkg.abbrev}}/">Monitoring and Profiling</a>
148-
</li>
149-
</ul>
80+
<li class="nav-item dropdown" id="administration">
81+
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Administration</a>
82+
<div class="dropdown-menu">
83+
<a class="dropdown-item" href="{${dashboard.pkg.abbrev}}/index.html">Dashboard</a>
84+
<a class="dropdown-item" href="/webstart/exist.jnlp">Webstart Client</a>
85+
<a class="dropdown-item" href="{${monex.pkg.abbrev}}/">Monitoring and Profiling</a>
86+
</div>
15087
</li>
15188
</ul>
152-
<form class="navbar-form navbar-right form-group" role="search" action="search.html" method="GET">
153-
<input type="text" name="q" class="search-query form-control" placeholder="Search Documentation" />
89+
<form class="form-inline" role="search" action="search.html" method="GET">
90+
<input type="text" name="q" class="search-query form-control mr-sm-2" placeholder="Search Documentation" />
91+
<button class="btn btn-outline-info my-2 my-sm-0" type="submit">Search</button>
15492
</form>
15593
</div>
15694
</div>
@@ -178,14 +116,14 @@
178116
<li>
179117
<a href="{${demo.pkg.abbrev}}/index.html">Demo</a>
180118
</li>
181-
<li class="hidden-xs-inline">
119+
<li class="d-inline d-hidden-s">
182120
<a href="/status">Status</a>
183121
</li>
184122
<li>
185123
<a href="legal.xml">Legal</a>
186124
</li>
187125
</ul>
188-
<div id="copyright" class="hidden-xs">
126+
<div id="copyright" class="d-inline d-hidden-s">
189127
<p>Copyright eXist-db Project 2014</p>
190128
</div>
191129
</div>

0 commit comments

Comments
 (0)