Skip to content

Commit 378d892

Browse files
jordansisseljordansissel
committed
- start working on search.
1 parent e65d73d commit 378d892

File tree

6 files changed

+105
-39
lines changed

6 files changed

+105
-39
lines changed

‎_layouts/default.html

+19-9
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,25 @@
4242
{{ site.title }}
4343
</a>
4444
</span>
45-
<span class="edit-this-page">
46-
<script>
47-
document.writeln(
48-
'<a href="https://github.com/{{ site.repo }}/edit/{{ site.branch }}/'
49-
+ '{{page.url}}'.replace('.html', '.md').replace(/^\//, '')
50-
+ '">[edit this page]</a>'
51-
);
52-
</script>
53-
</span>
45+
<span class="float-right">
46+
<div class="edit-this-page">
47+
<script>
48+
document.writeln(
49+
'<a href="https://github.com/{{ site.repo }}/edit/{{ site.branch }}/'
50+
+ '{{page.url}}'.replace('.html', '.md').replace(/^\//, '')
51+
+ '">[edit this page]</a>'
52+
);
53+
</script>
54+
</div>
55+
<!-- I'll work on search later. Maybe will just use google site search.
56+
<div class="search">
57+
<form method="GET" action="{{site.baseurl}}/search.html">
58+
<input id="search-field" type="text" name="q" placeholder="Search"></input>
59+
<input type="submit">
60+
</form>
61+
</div>
62+
-->
63+
</span>
5464
</header>
5565

5666
{{ content }}

‎_layouts/search.html

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
layout: default
3+
class: search
4+
script: search.js
5+
---
6+
<div class="article-splash logstashize outer splash">
7+
<div class="inner">
8+
<h1>
9+
{{ page.title }}
10+
</h1>
11+
</div>
12+
</div>
13+
14+
<div role="main" id="content">
15+
{{ content }}
16+
</div>

‎css/style.css

+41-28
Original file line numberDiff line numberDiff line change
@@ -318,49 +318,61 @@ header .logo a:hover {
318318
}
319319
/* line 184, ../sass/style.scss */
320320
header .edit-this-page {
321+
text-align: right;
322+
}
323+
/* line 188, ../sass/style.scss */
324+
header .search {
325+
float: right;
326+
}
327+
/* line 191, ../sass/style.scss */
328+
header .search input[type="submit"] {
329+
display: none;
330+
}
331+
/* line 196, ../sass/style.scss */
332+
header .float-right {
321333
float: right;
322334
}
323335

324-
/* line 190, ../sass/style.scss */
336+
/* line 202, ../sass/style.scss */
325337
a {
326338
color: #f1cfd2;
327339
font-weight: bold;
328340
text-decoration: none;
329341
}
330342

331-
/* line 196, ../sass/style.scss */
343+
/* line 208, ../sass/style.scss */
332344
a:hover {
333345
color: #BDF;
334346
text-decoration: underline;
335347
}
336348

337-
/* line 201, ../sass/style.scss */
349+
/* line 213, ../sass/style.scss */
338350
h1, h2, h3 {
339351
font-family: "Gudea", sans-serif !important;
340352
}
341353

342-
/* line 205, ../sass/style.scss */
354+
/* line 217, ../sass/style.scss */
343355
#content {
344356
padding-bottom: 1em;
345357
}
346358

347-
/* line 209, ../sass/style.scss */
359+
/* line 221, ../sass/style.scss */
348360
.article-splash {
349361
border-bottom: 2px solid black;
350362
}
351-
/* line 213, ../sass/style.scss */
363+
/* line 225, ../sass/style.scss */
352364
.article-splash .inner {
353365
padding: 40px;
354366
padding-top: 1em;
355367
padding-bottom: 1em;
356368
}
357369
@media (max-width: 400px) {
358-
/* line 213, ../sass/style.scss */
370+
/* line 225, ../sass/style.scss */
359371
.article-splash .inner {
360372
padding: 5px !important;
361373
}
362374
}
363-
/* line 222, ../sass/style.scss */
375+
/* line 234, ../sass/style.scss */
364376
.article-splash h1 {
365377
text-shadow: black 1px 1px 8px;
366378
margin: 0px;
@@ -371,13 +383,13 @@ h1, h2, h3 {
371383
}
372384

373385
/* article-splash */
374-
/* line 232, ../sass/style.scss */
386+
/* line 244, ../sass/style.scss */
375387
.article-splash ~ * {
376388
margin-left: 20px;
377389
margin-right: 20px;
378390
}
379391

380-
/* line 237, ../sass/style.scss */
392+
/* line 249, ../sass/style.scss */
381393
.table-of-contents {
382394
border: 1px solid black;
383395
min-width: 300px;
@@ -389,70 +401,71 @@ h1, h2, h3 {
389401
width: 30%;
390402
}
391403
@media (max-width: 400px) {
392-
/* line 237, ../sass/style.scss */
404+
/* line 249, ../sass/style.scss */
393405
.table-of-contents {
394406
min-width: 260px;
395407
}
396408
}
397-
/* line 251, ../sass/style.scss */
409+
/* line 263, ../sass/style.scss */
398410
.table-of-contents ul, .table-of-contents ol {
399411
margin: 0;
400412
padding-left: 1em;
401413
}
402-
/* line 257, ../sass/style.scss */
414+
/* line 269, ../sass/style.scss */
403415
.table-of-contents h1 {
404416
font-size: 130%;
405417
padding: 0;
406418
margin: 0;
407419
}
408-
/* line 263, ../sass/style.scss */
420+
/* line 275, ../sass/style.scss */
409421
.table-of-contents .topic-h1 {
410422
margin-left: 1em;
411423
}
412-
/* line 264, ../sass/style.scss */
424+
/* line 276, ../sass/style.scss */
413425
.table-of-contents .topic-h2 {
414426
margin-left: 2em;
415427
}
416-
/* line 265, ../sass/style.scss */
428+
/* line 277, ../sass/style.scss */
417429
.table-of-contents .topic-h3 {
418430
margin-left: 3em;
419431
}
420432

421433
/* .table-of-contents */
422-
/* line 269, ../sass/style.scss */
434+
/* line 281, ../sass/style.scss */
423435
.article .bullet-list {
424436
margin: 0;
425-
margin-top: 1em;
437+
margin-top: 1.5em;
426438
padding: 1.282%;
427439
border-radius: 15px;
440+
box-shadow: 0px 0px 7px 7px #417b32;
428441
max-width: 50%;
429442
min-width: 300px;
430443
opacity: 0.9;
431444
}
432445
@media (max-width: 400px) {
433-
/* line 269, ../sass/style.scss */
446+
/* line 281, ../sass/style.scss */
434447
.article .bullet-list {
435448
min-width: 260px;
436449
}
437450
}
438-
/* line 284, ../sass/style.scss */
451+
/* line 297, ../sass/style.scss */
439452
.article .bullet-list li.bullet:last {
440453
margin-bottom: 0em;
441454
}
442-
/* line 288, ../sass/style.scss */
455+
/* line 301, ../sass/style.scss */
443456
.article .bullet-list li.bullet {
444457
font-size: 110%;
445458
margin: 0;
446459
list-style-type: none;
447460
padding-top: 1px;
448461
padding-bottom: 1px;
449462
}
450-
/* line 296, ../sass/style.scss */
463+
/* line 309, ../sass/style.scss */
451464
.article .bullet-list .bullet-title {
452465
font-weight: bold;
453466
padding-right: 5px;
454467
}
455-
/* line 302, ../sass/style.scss */
468+
/* line 315, ../sass/style.scss */
456469
.article pre.code-header {
457470
margin-bottom: 0px;
458471
border-bottom-left-radius: 0px;
@@ -462,25 +475,25 @@ h1, h2, h3 {
462475
overflow: hidden;
463476
color: black;
464477
}
465-
/* line 311, ../sass/style.scss */
478+
/* line 324, ../sass/style.scss */
466479
.article pre.code-header * {
467480
color: black;
468481
}
469-
/* line 316, ../sass/style.scss */
482+
/* line 329, ../sass/style.scss */
470483
.article pre.code {
471484
margin-top: 0px;
472485
border-top-left-radius: 0px;
473486
border-top-right-radius: 0px;
474487
border-top: 0px;
475488
}
476-
/* line 323, ../sass/style.scss */
489+
/* line 336, ../sass/style.scss */
477490
.article pre.wrap {
478491
white-space: pre-wrap;
479492
overflow: auto;
480493
}
481-
/* line 328, ../sass/style.scss */
494+
/* line 341, ../sass/style.scss */
482495
.article pre {
483-
overflow-x: scroll;
496+
overflow-x: auto;
484497
max-width: 100%;
485498
border: 1px solid #8bd078;
486499
color: white;

‎js/search.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
$(document).ready(function() {
2+
var params_list = document.location.search.substring(1).split("&");
3+
var params = { };
4+
for (var i = 0; i < params_list.length; i++) {
5+
var p = params_list[i].split("=", 2);
6+
params[decodeURIComponent(p[0])] = decodeURIComponent(p[1]).replace(/\+/g, " ");
7+
}
8+
console.log(params);
9+
});

‎sass/style.scss

+15-2
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,18 @@ header {
182182
.logo {
183183
}
184184
.edit-this-page {
185+
text-align: right;
186+
}
187+
188+
.search {
189+
float: right;
190+
191+
input[type="submit"] {
192+
display: none;
193+
}
194+
}
195+
196+
.float-right {
185197
float: right;
186198
}
187199
padding: 1em;
@@ -268,10 +280,11 @@ h1, h2, h3 {
268280
.article {
269281
.bullet-list {
270282
margin: 0;
271-
margin-top: 1em;
283+
margin-top: 1.5em;
272284
padding: $margin;
273285
@extend .primary-2;
274286
border-radius: 15px;
287+
box-shadow: 0px 0px 7px 7px $primary_2;
275288
max-width: 50%;
276289

277290
min-width: $boxminwidth;
@@ -326,7 +339,7 @@ h1, h2, h3 {
326339
}
327340

328341
pre {
329-
overflow-x: scroll;
342+
overflow-x: auto;
330343
max-width: 100%;
331344
border: 1px solid $primary-5;
332345
color: white;

‎search.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
layout: search
3+
title: search results
4+
---
5+

0 commit comments

Comments
 (0)