Skip to content

Commit 84dc976

Browse files
Temp UX (#47)
* Add bootstrap * Wrap in container * New navbar? * Update darker navbar - Stretch navbar to full width - Remove annoying line at top of page * add tipue search assets Co-authored-by: DeltaDizzy <[email protected]>
1 parent cf1998f commit 84dc976

10 files changed

+1200
-115
lines changed

Gemfile.lock

+99-96
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.11.1)
5-
i18n (~> 0.7)
4+
activesupport (5.2.2.1)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
6+
i18n (>= 0.7, < 2)
67
minitest (~> 5.1)
7-
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9-
addressable (2.6.0)
10-
public_suffix (>= 2.0.2, < 4.0)
9+
addressable (2.7.0)
10+
public_suffix (>= 2.0.2, < 5.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source
1313
execjs
1414
coffee-script-source (1.11.1)
1515
colorator (1.1.0)
1616
commonmarker (0.17.13)
1717
ruby-enum (~> 0.5)
18-
concurrent-ruby (1.1.5)
19-
dnsruby (1.61.2)
20-
addressable (~> 2.5)
18+
concurrent-ruby (1.0.5)
19+
dnsruby (1.61.4)
20+
simpleidn (~> 0.1)
2121
em-websocket (0.5.1)
2222
eventmachine (>= 0.12.9)
2323
http_parser.rb (~> 0.6.0)
2424
ethon (0.12.0)
2525
ffi (>= 1.3.0)
2626
eventmachine (1.2.7)
27-
eventmachine (1.2.7-x64-mingw32)
2827
execjs (2.7.0)
29-
faraday (0.15.4)
28+
faraday (1.0.1)
3029
multipart-post (>= 1.2, < 3)
31-
ffi (1.11.1)
32-
ffi (1.11.1-x64-mingw32)
30+
ffi (1.9.10)
3331
forwardable-extended (2.6.0)
3432
gemoji (3.0.1)
35-
github-pages (198)
36-
activesupport (= 4.2.11.1)
33+
github-pages (207)
3734
github-pages-health-check (= 1.16.1)
38-
jekyll (= 3.8.5)
39-
jekyll-avatar (= 0.6.0)
35+
jekyll (= 3.9.0)
36+
jekyll-avatar (= 0.7.0)
4037
jekyll-coffeescript (= 1.1.1)
41-
jekyll-commonmark-ghpages (= 0.1.5)
38+
jekyll-commonmark-ghpages (= 0.1.6)
4239
jekyll-default-layout (= 0.1.4)
43-
jekyll-feed (= 0.11.0)
40+
jekyll-feed (= 0.13.0)
4441
jekyll-gist (= 1.5.0)
45-
jekyll-github-metadata (= 2.12.1)
46-
jekyll-mentions (= 1.4.1)
47-
jekyll-optional-front-matter (= 0.3.0)
42+
jekyll-github-metadata (= 2.13.0)
43+
jekyll-mentions (= 1.5.1)
44+
jekyll-optional-front-matter (= 0.3.2)
4845
jekyll-paginate (= 1.1.0)
49-
jekyll-readme-index (= 0.2.0)
50-
jekyll-redirect-from (= 0.14.0)
51-
jekyll-relative-links (= 0.6.0)
52-
jekyll-remote-theme (= 0.3.1)
46+
jekyll-readme-index (= 0.3.0)
47+
jekyll-redirect-from (= 0.15.0)
48+
jekyll-relative-links (= 0.6.1)
49+
jekyll-remote-theme (= 0.4.1)
5350
jekyll-sass-converter (= 1.5.2)
54-
jekyll-seo-tag (= 2.5.0)
55-
jekyll-sitemap (= 1.2.0)
56-
jekyll-swiss (= 0.4.0)
51+
jekyll-seo-tag (= 2.6.1)
52+
jekyll-sitemap (= 1.4.0)
53+
jekyll-swiss (= 1.0.0)
5754
jekyll-theme-architect (= 0.1.1)
5855
jekyll-theme-cayman (= 0.1.1)
5956
jekyll-theme-dinky (= 0.1.1)
@@ -63,88 +60,89 @@ GEM
6360
jekyll-theme-midnight (= 0.1.1)
6461
jekyll-theme-minimal (= 0.1.1)
6562
jekyll-theme-modernist (= 0.1.1)
66-
jekyll-theme-primer (= 0.5.3)
63+
jekyll-theme-primer (= 0.5.4)
6764
jekyll-theme-slate (= 0.1.1)
6865
jekyll-theme-tactile (= 0.1.1)
6966
jekyll-theme-time-machine (= 0.1.1)
70-
jekyll-titles-from-headings (= 0.5.1)
71-
jemoji (= 0.10.2)
72-
kramdown (= 1.17.0)
73-
liquid (= 4.0.0)
74-
listen (= 3.1.5)
67+
jekyll-titles-from-headings (= 0.5.3)
68+
jemoji (= 0.11.1)
69+
kramdown (= 2.3.0)
70+
kramdown-parser-gfm (= 1.1.0)
71+
liquid (= 4.0.3)
7572
mercenary (~> 0.3)
76-
minima (= 2.5.0)
77-
nokogiri (>= 1.8.5, < 2.0)
78-
rouge (= 2.2.1)
73+
minima (= 2.5.1)
74+
nokogiri (>= 1.10.4, < 2.0)
75+
rouge (= 3.19.0)
7976
terminal-table (~> 1.4)
8077
github-pages-health-check (1.16.1)
8178
addressable (~> 2.3)
8279
dnsruby (~> 1.60)
8380
octokit (~> 4.0)
8481
public_suffix (~> 3.0)
8582
typhoeus (~> 1.3)
86-
html-pipeline (2.11.0)
83+
html-pipeline (2.13.0)
8784
activesupport (>= 2)
8885
nokogiri (>= 1.4)
8986
http_parser.rb (0.6.0)
9087
i18n (0.9.5)
9188
concurrent-ruby (~> 1.0)
92-
jekyll (3.8.5)
89+
jekyll (3.9.0)
9390
addressable (~> 2.4)
9491
colorator (~> 1.0)
9592
em-websocket (~> 0.5)
9693
i18n (~> 0.7)
9794
jekyll-sass-converter (~> 1.0)
9895
jekyll-watch (~> 2.0)
99-
kramdown (~> 1.14)
96+
kramdown (>= 1.17, < 3)
10097
liquid (~> 4.0)
10198
mercenary (~> 0.3.3)
10299
pathutil (~> 0.9)
103100
rouge (>= 1.7, < 4)
104101
safe_yaml (~> 1.0)
105-
jekyll-avatar (0.6.0)
106-
jekyll (~> 3.0)
102+
jekyll-avatar (0.7.0)
103+
jekyll (>= 3.0, < 5.0)
107104
jekyll-coffeescript (1.1.1)
108105
coffee-script (~> 2.2)
109106
coffee-script-source (~> 1.11.1)
110107
jekyll-commonmark (1.3.1)
111108
commonmarker (~> 0.14)
112109
jekyll (>= 3.7, < 5.0)
113-
jekyll-commonmark-ghpages (0.1.5)
110+
jekyll-commonmark-ghpages (0.1.6)
114111
commonmarker (~> 0.17.6)
115-
jekyll-commonmark (~> 1)
116-
rouge (~> 2)
112+
jekyll-commonmark (~> 1.2)
113+
rouge (>= 2.0, < 4.0)
117114
jekyll-default-layout (0.1.4)
118115
jekyll (~> 3.0)
119-
jekyll-feed (0.11.0)
120-
jekyll (~> 3.3)
116+
jekyll-feed (0.13.0)
117+
jekyll (>= 3.7, < 5.0)
121118
jekyll-gist (1.5.0)
122119
octokit (~> 4.2)
123-
jekyll-github-metadata (2.12.1)
124-
jekyll (~> 3.4)
120+
jekyll-github-metadata (2.13.0)
121+
jekyll (>= 3.4, < 5.0)
125122
octokit (~> 4.0, != 4.4.0)
126-
jekyll-mentions (1.4.1)
123+
jekyll-mentions (1.5.1)
127124
html-pipeline (~> 2.3)
128-
jekyll (~> 3.0)
129-
jekyll-optional-front-matter (0.3.0)
130-
jekyll (~> 3.0)
125+
jekyll (>= 3.7, < 5.0)
126+
jekyll-optional-front-matter (0.3.2)
127+
jekyll (>= 3.0, < 5.0)
131128
jekyll-paginate (1.1.0)
132-
jekyll-readme-index (0.2.0)
133-
jekyll (~> 3.0)
134-
jekyll-redirect-from (0.14.0)
135-
jekyll (~> 3.3)
136-
jekyll-relative-links (0.6.0)
137-
jekyll (~> 3.3)
138-
jekyll-remote-theme (0.3.1)
139-
jekyll (~> 3.5)
140-
rubyzip (>= 1.2.1, < 3.0)
129+
jekyll-readme-index (0.3.0)
130+
jekyll (>= 3.0, < 5.0)
131+
jekyll-redirect-from (0.15.0)
132+
jekyll (>= 3.3, < 5.0)
133+
jekyll-relative-links (0.6.1)
134+
jekyll (>= 3.3, < 5.0)
135+
jekyll-remote-theme (0.4.1)
136+
addressable (~> 2.0)
137+
jekyll (>= 3.5, < 5.0)
138+
rubyzip (>= 1.3.0)
141139
jekyll-sass-converter (1.5.2)
142140
sass (~> 3.4)
143-
jekyll-seo-tag (2.5.0)
144-
jekyll (~> 3.3)
145-
jekyll-sitemap (1.2.0)
146-
jekyll (~> 3.3)
147-
jekyll-swiss (0.4.0)
141+
jekyll-seo-tag (2.6.1)
142+
jekyll (>= 3.3, < 5.0)
143+
jekyll-sitemap (1.4.0)
144+
jekyll (>= 3.7, < 5.0)
145+
jekyll-swiss (1.0.0)
148146
jekyll-theme-architect (0.1.1)
149147
jekyll (~> 3.5)
150148
jekyll-seo-tag (~> 2.0)
@@ -172,8 +170,8 @@ GEM
172170
jekyll-theme-modernist (0.1.1)
173171
jekyll (~> 3.5)
174172
jekyll-seo-tag (~> 2.0)
175-
jekyll-theme-primer (0.5.3)
176-
jekyll (~> 3.5)
173+
jekyll-theme-primer (0.5.4)
174+
jekyll (> 3.5, < 5.0)
177175
jekyll-github-metadata (~> 2.9)
178176
jekyll-seo-tag (~> 2.0)
179177
jekyll-theme-slate (0.1.1)
@@ -185,45 +183,46 @@ GEM
185183
jekyll-theme-time-machine (0.1.1)
186184
jekyll (~> 3.5)
187185
jekyll-seo-tag (~> 2.0)
188-
jekyll-titles-from-headings (0.5.1)
189-
jekyll (~> 3.3)
186+
jekyll-titles-from-headings (0.5.3)
187+
jekyll (>= 3.3, < 5.0)
190188
jekyll-watch (2.2.1)
191189
listen (~> 3.0)
192-
jemoji (0.10.2)
190+
jemoji (0.11.1)
193191
gemoji (~> 3.0)
194192
html-pipeline (~> 2.2)
195-
jekyll (~> 3.0)
196-
kramdown (1.17.0)
197-
liquid (4.0.0)
198-
listen (3.1.5)
199-
rb-fsevent (~> 0.9, >= 0.9.4)
200-
rb-inotify (~> 0.9, >= 0.9.7)
201-
ruby_dep (~> 1.2)
193+
jekyll (>= 3.0, < 5.0)
194+
kramdown (2.3.0)
195+
rexml
196+
kramdown-parser-gfm (1.1.0)
197+
kramdown (~> 2.0)
198+
liquid (4.0.3)
199+
listen (3.2.1)
200+
rb-fsevent (~> 0.10, >= 0.10.3)
201+
rb-inotify (~> 0.9, >= 0.9.10)
202202
mercenary (0.3.6)
203203
mini_portile2 (2.4.0)
204-
minima (2.5.0)
205-
jekyll (~> 3.5)
204+
minima (2.5.1)
205+
jekyll (>= 3.5, < 5.0)
206206
jekyll-feed (~> 0.9)
207207
jekyll-seo-tag (~> 2.1)
208208
minitest (5.11.3)
209209
multipart-post (2.1.1)
210-
nokogiri (1.10.4)
211-
mini_portile2 (~> 2.4.0)
212-
nokogiri (1.10.4-x64-mingw32)
210+
nokogiri (1.10.10)
213211
mini_portile2 (~> 2.4.0)
214-
octokit (4.14.0)
212+
octokit (4.18.0)
213+
faraday (>= 0.9)
215214
sawyer (~> 0.8.0, >= 0.5.3)
216215
pathutil (0.16.2)
217216
forwardable-extended (~> 2.6)
218217
public_suffix (3.1.1)
219-
rb-fsevent (0.10.3)
220-
rb-inotify (0.10.0)
218+
rb-fsevent (0.10.4)
219+
rb-inotify (0.10.1)
221220
ffi (~> 1.0)
222-
rouge (2.2.1)
223-
ruby-enum (0.7.2)
221+
rexml (3.2.4)
222+
rouge (3.19.0)
223+
ruby-enum (0.8.0)
224224
i18n
225-
ruby_dep (1.5.0)
226-
rubyzip (2.0.0)
225+
rubyzip (2.3.0)
227226
safe_yaml (1.0.5)
228227
sass (3.7.4)
229228
sass-listen (~> 4.0.0)
@@ -233,21 +232,25 @@ GEM
233232
sawyer (0.8.2)
234233
addressable (>= 2.3.5)
235234
faraday (> 0.8, < 2.0)
235+
simpleidn (0.1.1)
236+
unf (~> 0.1.4)
236237
terminal-table (1.8.0)
237238
unicode-display_width (~> 1.1, >= 1.1.1)
238239
thread_safe (0.3.6)
239-
typhoeus (1.3.1)
240+
typhoeus (1.4.0)
240241
ethon (>= 0.9.0)
241242
tzinfo (1.2.5)
242243
thread_safe (~> 0.1)
243-
tzinfo-data (1.2019.2)
244+
tzinfo-data (1.2020.1)
244245
tzinfo (>= 1.0.0)
245-
unicode-display_width (1.6.0)
246+
unf (0.1.4)
247+
unf_ext
248+
unf_ext (0.0.7.7)
249+
unicode-display_width (1.7.0)
246250
wdm (0.1.1)
247251

248252
PLATFORMS
249253
ruby
250-
x64-mingw32
251254

252255
DEPENDENCIES
253256
github-pages
@@ -258,4 +261,4 @@ DEPENDENCIES
258261
wdm (~> 0.1.0)
259262

260263
BUNDLED WITH
261-
2.0.2
264+
2.1.4

_includes/header.html

+32-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
<p id="referrer">{%- capture referlink -%}{%- endcapture -%}</p>
1717
{%- assign default_paths = site.pages | map: "path" -%}
1818
{%- assign page_paths = site.header_pages | append: referlink | split: ", " | default: default_paths -%}
19-
<a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
19+
2020

2121
{%- if page_paths -%}
22+
{% comment %}
2223
<nav class="site-nav">
2324
<input type="checkbox" id="nav-trigger" class="nav-trigger" />
2425
<label for="nav-trigger">
@@ -30,7 +31,9 @@
3031
</label>
3132

3233
<div class="trigger">
34+
{% comment %}
3335
<p id="referrerdebug"></p>
36+
{% endcomment %}
3437
{%- for path in page_paths -%}
3538
{%- assign my_page = site.pages | where: "path", path | first -%}
3639
{%- if my_page.title -%}
@@ -39,6 +42,34 @@
3942
{%- endfor -%}
4043
</div>
4144
</nav>
45+
{% endcomment %}
46+
47+
<nav class="navbar-inverse">
48+
<div class="container-fluid">
49+
<div class="navbar-header">
50+
<a class="navbar-brand site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
51+
</div>
52+
<ul class="nav navbar-nav">
53+
{% comment %}
54+
<li class="dropdown">
55+
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Page 1
56+
<span class="caret"></span></a>
57+
<ul class="dropdown-menu">
58+
<li><a href="#">Page 1-1</a></li>
59+
<li><a href="#">Page 1-2</a></li>
60+
<li><a href="#">Page 1-3</a></li>
61+
</ul>
62+
</li>
63+
{% endcomment %}
64+
{%- for path in page_paths -%}
65+
{%- assign my_page = site.pages | where: "path", path | first -%}
66+
{%- if my_page.title -%}
67+
<li><a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a></li>
68+
{%- endif -%}
69+
{%- endfor -%}
70+
</ul>
71+
</div>
72+
</nav>
4273
{%- endif -%}
4374
</div>
4475
</header>

0 commit comments

Comments
 (0)