From ccaa0e0d7280a7125e79fa49d51be5dec3903f2b Mon Sep 17 00:00:00 2001 From: Zachary Sailer Date: Sat, 27 Feb 2016 11:43:12 -0800 Subject: [PATCH 1/8] playing around with banner pages --- _config.yml | 2 +- _includes/banner-image.html | 20 ++++++++++++++++++++ _layouts/default.html | 2 ++ _layouts/post.html | 11 +++-------- index.html | 11 +++-------- 5 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 _includes/banner-image.html diff --git a/_config.yml b/_config.yml index 0e5c2a5..c6fc891 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ # Site settings -title: Twenty Blog +title: ScienceHub email: your-email@domain.com description: > # this means to ignore newlines until "baseurl:" Write an awesome description for your new site here. You can edit this diff --git a/_includes/banner-image.html b/_includes/banner-image.html new file mode 100644 index 0000000..9a46ba8 --- /dev/null +++ b/_includes/banner-image.html @@ -0,0 +1,20 @@ + + \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 9ff7bf0..8e6445a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,6 +6,8 @@ {% include header.html %} + {% include banner-image.html %} +
{{ content }}
diff --git a/_layouts/post.html b/_layouts/post.html index e5b8b45..db2104e 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,16 +1,11 @@ --- layout: default --- +
-
-
-

{{ page.title }}

-

{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}

-
- -
+
--> {{ content }} -
+
-->
{% if page.previous %} diff --git a/index.html b/index.html index 7dc52c4..3f3589d 100644 --- a/index.html +++ b/index.html @@ -7,11 +7,7 @@

ScienceHub is an experiment.

-

At ScienceHub, we are both scientists and academics. This service was started by -
- graduate student who, during their graduate tenure, struggled to find effective, -
- interactive methods to educate ourselves and others in the world of science. +

We are both scientists and academics. Sciencehub was started by graduate students who struggled to find a simple and central place to find, share and collaborate about effective methods to educate ourselves and others in the world of science.

@@ -138,13 +134,12 @@

Branches of Sciencehub

-

Want to contribute a post?

-

Proin a ullamcorper elit, et sagittis turpis integer ut fermentum.

+

Want to contribute to ScienceHub?

From 0539d509911b4c22916ca321a87d02e10356748e Mon Sep 17 00:00:00 2001 From: Zachary Sailer Date: Mon, 29 Feb 2016 20:36:34 -0800 Subject: [PATCH 2/8] add svg of logo and place on webpage --- _includes/header.html | 23 +++- logo/tmp.txt => css/sciencehub.css | 0 index.html | 13 +- logos/logo-simple.svg | 166 ++++++++++++++++++++++++ {logo => logos}/logo.png | Bin {logo => logos}/logo.svg | 201 ++++++++++++----------------- {logo => logos}/logo_simple.png | Bin logos/tmp.txt | 0 8 files changed, 279 insertions(+), 124 deletions(-) rename logo/tmp.txt => css/sciencehub.css (100%) create mode 100644 logos/logo-simple.svg rename {logo => logos}/logo.png (100%) rename {logo => logos}/logo.svg (64%) rename {logo => logos}/logo_simple.png (100%) create mode 100644 logos/tmp.txt diff --git a/_includes/header.html b/_includes/header.html index 3bc2ae8..9247a11 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,6 +1,24 @@ + + \ No newline at end of file diff --git a/logo/tmp.txt b/css/sciencehub.css similarity index 100% rename from logo/tmp.txt rename to css/sciencehub.css diff --git a/index.html b/index.html index 3f3589d..ff77e06 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,18 @@

ScienceHub is an experiment.

-

We are both scientists and academics. Sciencehub was started by graduate students who struggled to find a simple and central place to find, share and collaborate about effective methods to educate ourselves and others in the world of science.

+

We are both scientists and academics. +
+
+ Sciencehub was started by graduate students who struggled to find +
+ a simple and central place to find, share and collaborate about effective +
+ methods to educate ourselves and others in the world of science. +
+
+ We believe this is a problem, so we are fixing it. +

diff --git a/logos/logo-simple.svg b/logos/logo-simple.svg new file mode 100644 index 0000000..efd66f6 --- /dev/null +++ b/logos/logo-simple.svg @@ -0,0 +1,166 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logo/logo.png b/logos/logo.png similarity index 100% rename from logo/logo.png rename to logos/logo.png diff --git a/logo/logo.svg b/logos/logo.svg similarity index 64% rename from logo/logo.svg rename to logos/logo.svg index 13274b2..3368856 100644 --- a/logo/logo.svg +++ b/logos/logo.svg @@ -1,51 +1,16 @@ - - + id="svg2" + height="1350" + width="1350"> - - - + id="defs4" /> @@ -59,137 +24,131 @@ + transform="translate(0,297.64025)" + id="layer1"> + x="566.22437" + height="190.16956" + width="197.26816" + id="rect3094" + style="fill:none;stroke:#7c8081;stroke-width:35;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="g4034"> + id="g4161"> + id="path3901-2" /> + id="g4034-1"> + id="g4161-8"> + id="path3901-2-0" /> + id="g4034-1-33"> + id="g4161-8-1"> + id="path3901-2-0-5" /> + x="953.42358" + height="172.05817" + width="178.48071" + id="rect3094-7" + style="fill:none;stroke:#7c8081;stroke-width:35;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="g4466"> + style="stroke-width:69.99999933;stroke-miterlimit:4;stroke-dasharray:none;stroke:#7c8081;stroke-opacity:1"> + style="stroke-width:69.99999957;stroke-miterlimit:4;stroke-dasharray:none;stroke:#7c8081;stroke-opacity:1"> + d="m 441.23947,493.36309 601.34433,40.3414" + style="fill:none;stroke:#7c8081;stroke-width:69.99999957;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + id="rect3094-5" + width="178.48071" + height="172.05817" + x="1001.7665" + y="471.41083" + ry="86.029083" /> - + + y="-159.92519" + x="236.72098" + height="172.05817" + width="178.48071" + id="rect3094-56" + style="fill:none;stroke:#7c8081;stroke-width:34.99999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1" /> + x="454.90826" + height="73.833282" + width="402.51047" + id="rect4691" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:35;stroke-miterlimit:4;stroke-dasharray:none" /> ScienceHub + x="87.096771" + height="99.315063" + width="693.22699" + id="rect4353" />ScienceHub diff --git a/logo/logo_simple.png b/logos/logo_simple.png similarity index 100% rename from logo/logo_simple.png rename to logos/logo_simple.png diff --git a/logos/tmp.txt b/logos/tmp.txt new file mode 100644 index 0000000..e69de29 From 7cc55bf7fdd2c474f9f32d3bc7adb5b64194b151 Mon Sep 17 00:00:00 2001 From: Zachary Sailer Date: Mon, 29 Feb 2016 21:01:14 -0800 Subject: [PATCH 3/8] further styling changes --- _includes/header.html | 2 +- _layouts/default.html | 1 - _layouts/post.html | 11 +++++++---- explore.html | 19 +++++++++++++++---- logos/tmp.txt | 0 5 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 logos/tmp.txt diff --git a/_includes/header.html b/_includes/header.html index 9247a11..cd6628f 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,7 +5,7 @@
- + diff --git a/_layouts/default.html b/_layouts/default.html index 8e6445a..5cfbaf9 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,7 +6,6 @@ {% include header.html %} - {% include banner-image.html %}
{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index db2104e..19d84b3 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,16 +2,19 @@ layout: default ---
- -
--> - {{ content }} -
--> + {% include banner-image.html %} + +
+ {{ content }} +
+ +
diff --git a/explore.html b/explore.html index 61fce0e..f16f469 100644 --- a/explore.html +++ b/explore.html @@ -2,12 +2,22 @@ layout: default --- +
-
- -

What I cannot create, I do not understand.

+ + +
+ +
+ + +
+
\ No newline at end of file diff --git a/logos/tmp.txt b/logos/tmp.txt deleted file mode 100644 index e69de29..0000000 From 19c7e8c0c8cc77fef86f46460fc9fdd1fedce7cd Mon Sep 17 00:00:00 2001 From: Zachary Sailer Date: Tue, 1 Mar 2016 21:38:46 -0800 Subject: [PATCH 4/8] add search feature to blog --- _includes/head.html | 4 + _includes/header.html | 2 +- _layouts/default.html | 2 +- .../simple-jekyll-search/.bower.json | 36 ++ .../simple-jekyll-search/README.md | 265 ++++++++++++ .../simple-jekyll-search/bower.json | 26 ++ .../dest/jekyll-search.js | 377 ++++++++++++++++++ index.html | 24 ++ search.json | 13 + 9 files changed, 747 insertions(+), 2 deletions(-) create mode 100644 bower_components/simple-jekyll-search/.bower.json create mode 100644 bower_components/simple-jekyll-search/README.md create mode 100644 bower_components/simple-jekyll-search/bower.json create mode 100644 bower_components/simple-jekyll-search/dest/jekyll-search.js create mode 100644 search.json diff --git a/_includes/head.html b/_includes/head.html index e5f0bbf..3677c37 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -17,6 +17,10 @@ + + + +