Date: Sat, 25 Jun 2016 03:20:21 +0300 Subject: move common assets to common/, more info to config --- _config.yml | 3 +++ _includes/bootstrap_css.html | 5 ----- _includes/bootstrap_js.html | 5 ----- _includes/common/bootstrap_css.html | 5 +++++ _includes/common/bootstrap_js.html | 5 +++++ _includes/common/footer.html | 25 +++++++++++++++++++++++++ _includes/common/header.html | 29 +++++++++++++++++++++++++++++ _includes/common/ie_compat.html | 11 +++++++++++ _includes/common/jquery.html | 5 +++++ _includes/common/navbar.html | 26 ++++++++++++++++++++++++++ _includes/common/pagination.html | 30 ++++++++++++++++++++++++++++++ _includes/common/sidebar.html | 18 ++++++++++++++++++ _includes/footer.html | 25 ------------------------- _includes/header.html | 30 ------------------------------ _includes/ie_compat.html | 11 ----------- _includes/jquery.html | 5 ----- _includes/navbar.html | 26 -------------------------- _includes/pagination.html | 30 ------------------------------ _includes/sidebar.html | 18 ------------------ _layouts/main.html | 6 +++--- _layouts/plots.html | 4 ++-- _layouts/post.html | 8 ++++---- css/common/footer.css | 23 +++++++++++++++++++++++ css/common/misc.css | 3 +++ css/footer.css | 23 ----------------------- css/misc.css | 3 --- index.html | 2 +- plots.html | 3 ++- 28 files changed, 195 insertions(+), 192 deletions(-) delete mode 100644 _includes/bootstrap_css.html delete mode 100644 _includes/bootstrap_js.html create mode 100644 _includes/common/bootstrap_css.html create mode 100644 _includes/common/bootstrap_js.html create mode 100644 _includes/common/footer.html create mode 100644 _includes/common/header.html create mode 100644 _includes/common/ie_compat.html create mode 100644 _includes/common/jquery.html create mode 100644 _includes/common/navbar.html create mode 100644 _includes/common/pagination.html create mode 100644 _includes/common/sidebar.html delete mode 100644 _includes/footer.html delete mode 100644 _includes/header.html delete mode 100644 _includes/ie_compat.html delete mode 100644 _includes/jquery.html delete mode 100644 _includes/navbar.html delete mode 100644 _includes/pagination.html delete mode 100644 _includes/sidebar.html create mode 100644 css/common/footer.css create mode 100644 css/common/misc.css delete mode 100644 css/footer.css delete mode 100644 css/misc.css diff --git a/_config.yml b/_config.yml index b2ad1f9..c4740ad 100644 --- a/_config.yml +++ b/_config.yml @@ -19,6 +19,9 @@ jquery_version: 1.11.3 html5shiv_version: 3.7.2 respond_version: 1.4.2 +project: + name: Sorting algorithms + description: Getting the hang out of the (sorting) algorithms baseurl: /sorting-algorithms repository: egor-tensin/sorting-algorithms personal_info: diff --git a/_includes/bootstrap_css.html b/_includes/bootstrap_css.html deleted file mode 100644 index f47b856..0000000 --- a/_includes/bootstrap_css.html +++ /dev/null @@ -1,5 +0,0 @@ -{% if site.minified_externals %} - -{% else %} - -{% endif %} diff --git a/_includes/bootstrap_js.html b/_includes/bootstrap_js.html deleted file mode 100644 index e724257..0000000 --- a/_includes/bootstrap_js.html +++ /dev/null @@ -1,5 +0,0 @@ -{% if site.minified_externals %} - -{% else %} - -{% endif %} diff --git a/_includes/common/bootstrap_css.html b/_includes/common/bootstrap_css.html new file mode 100644 index 0000000..f47b856 --- /dev/null +++ b/_includes/common/bootstrap_css.html @@ -0,0 +1,5 @@ +{% if site.minified_externals %} + +{% else %} + +{% endif %} diff --git a/_includes/common/bootstrap_js.html b/_includes/common/bootstrap_js.html new file mode 100644 index 0000000..e724257 --- /dev/null +++ b/_includes/common/bootstrap_js.html @@ -0,0 +1,5 @@ +{% if site.minified_externals %} + +{% else %} + +{% endif %} diff --git a/_includes/common/footer.html b/_includes/common/footer.html new file mode 100644 index 0000000..0273971 --- /dev/null +++ b/_includes/common/footer.html @@ -0,0 +1,25 @@ + + + + + {% include common/jquery.html %} + {% include common/bootstrap_js.html %} + + diff --git a/_includes/common/header.html b/_includes/common/header.html new file mode 100644 index 0000000..c21b442 --- /dev/null +++ b/_includes/common/header.html @@ -0,0 +1,29 @@ + + + + + + + + {{ page.title }} - {{ site.project.name }} - {{ site.personal_info.name }} + + {% include common/bootstrap_css.html %} + + + + + {% if page.custom_css %} + {% for css in page.custom_css %} + + {% endfor %} + {% endif %} + + {% include common/ie_compat.html %} + + +

+ +

diff --git a/_includes/common/ie_compat.html b/_includes/common/ie_compat.html new file mode 100644 index 0000000..3cef67d --- /dev/null +++ b/_includes/common/ie_compat.html @@ -0,0 +1,11 @@ +{% if site.minified_externals %} + +{% else %} + +{% endif %} diff --git a/_includes/common/jquery.html b/_includes/common/jquery.html new file mode 100644 index 0000000..aa6d2fd --- /dev/null +++ b/_includes/common/jquery.html @@ -0,0 +1,5 @@ +{% if site.minified_externals %} + +{% else %} + +{% endif %} diff --git a/_includes/common/navbar.html b/_includes/common/navbar.html new file mode 100644 index 0000000..af4a1c5 --- /dev/null +++ b/_includes/common/navbar.html @@ -0,0 +1,26 @@ + diff --git a/_includes/common/pagination.html b/_includes/common/pagination.html new file mode 100644 index 0000000..aa2f034 --- /dev/null +++ b/_includes/common/pagination.html @@ -0,0 +1,30 @@ +{% if site.posts.size != 0 %} +

Prev
Prev
Prev
1
1
{{ count }}
{{ count }}
Next
Next

+{% endif %} diff --git a/_includes/common/sidebar.html b/_includes/common/sidebar.html new file mode 100644 index 0000000..e6041c3 --- /dev/null +++ b/_includes/common/sidebar.html @@ -0,0 +1,18 @@ +

About the project

{{ site.project.description }}. Feel free to contribute or contact me.

+ GitHub repository + {{ site.personal_info.email }} +

The implemented algorithms have been plotted to study their performance. +You can examine the plots here.

Latest posts

+{% if site.posts.size == 0 %} +

Sorry, there're no posts yet.

+{% else %} +

+ {% for post in site.posts limit: 5 %} + {{ post.date | date_to_string }} {{ post.title }} + {% endfor %} +

+{% endif %} diff --git a/_includes/footer.html b/_includes/footer.html deleted file mode 100644 index f3cbb38..0000000 --- a/_includes/footer.html +++ /dev/null @@ -1,25 +0,0 @@ -

- -

- {% include jquery.html %} - {% include bootstrap_js.html %} - - diff --git a/_includes/header.html b/_includes/header.html deleted file mode 100644 index 29a2729..0000000 --- a/_includes/header.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - {{ page.title }} - Sorting algorithms - {{ site.personal_info.name }} - - {% include bootstrap_css.html %} - - - - - - {% if page.custom_css %} - {% for css in page.custom_css %} - - {% endfor %} - {% endif %} - - {% include ie_compat.html %} - - -

- -

diff --git a/_includes/ie_compat.html b/_includes/ie_compat.html deleted file mode 100644 index 3cef67d..0000000 --- a/_includes/ie_compat.html +++ /dev/null @@ -1,11 +0,0 @@ -{% if site.minified_externals %} - -{% else %} - -{% endif %} diff --git a/_includes/jquery.html b/_includes/jquery.html deleted file mode 100644 index aa6d2fd..0000000 --- a/_includes/jquery.html +++ /dev/null @@ -1,5 +0,0 @@ -{% if site.minified_externals %} - -{% else %} - -{% endif %} diff --git a/_includes/navbar.html b/_includes/navbar.html deleted file mode 100644 index af4a1c5..0000000 --- a/_includes/navbar.html +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/_includes/pagination.html b/_includes/pagination.html deleted file mode 100644 index aa2f034..0000000 --- a/_includes/pagination.html +++ /dev/null @@ -1,30 +0,0 @@ -{% if site.posts.size != 0 %} -

Prev
Prev
Prev
1
1
{{ count }}
{{ count }}
Next
Next

-{% endif %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html deleted file mode 100644 index b318997..0000000 --- a/_includes/sidebar.html +++ /dev/null @@ -1,18 +0,0 @@ -

About the project

Getting the hang out of the sorting algorithms. Feel free to contribute or contact me.

- GitHub repository - {{ site.personal_info.email }} -

The implemented algorithms have been plotted to study their performance. -You can examine the plots here.

Latest posts

-{% if site.posts.size == 0 %} -

Sorry, there're no posts yet.

-{% else %} -

- {% for post in site.posts limit: 5 %} - {{ post.date | date_to_string }} {{ post.title }} - {% endfor %} -

-{% endif %} diff --git a/_layouts/main.html b/_layouts/main.html index 920cbd9..f151314 100644 --- a/_layouts/main.html +++ b/_layouts/main.html @@ -1,10 +1,10 @@ -{% include header.html %} +{% include common/header.html %}

- {% include sidebar.html %} + {% include common/sidebar.html %}

-{% include footer.html %} +{% include common/footer.html %} diff --git a/_layouts/plots.html b/_layouts/plots.html index 9a6a620..db09984 100644 --- a/_layouts/plots.html +++ b/_layouts/plots.html @@ -1,7 +1,7 @@ -{% include header.html %} +{% include common/header.html %}

-{% include footer.html %} +{% include common/footer.html %} diff --git a/_layouts/post.html b/_layouts/post.html index 4b05318..9d91204 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,14 +1,14 @@ -{% include header.html %} +{% include common/header.html %}

Posted on {{ page.date | date_to_long_string }}

- {% include comments.html %} + {% include posts/comments.html %}

- {% include sidebar.html %} + {% include common/sidebar.html %}

-{% include footer.html %} +{% include common/footer.html %} diff --git a/css/common/footer.css b/css/common/footer.css new file mode 100644 index 0000000..417b3d9 --- /dev/null +++ b/css/common/footer.css @@ -0,0 +1,23 @@ +html, body { + height: 100%; + width: 100%; +} +.top-level-footer-wrapper { + height: 100%; + width: 100%; + display: table; +} +.footer-wrapper-collapse { + display: table-row; + height: 1px; +} +.footer-wrapper-expand { + display: table-row; + height: auto; +} +footer { + margin-top: 20px; + padding: 15px 0 15px; + border-width: 1px 0; + border-style: solid; +} diff --git a/css/common/misc.css b/css/common/misc.css new file mode 100644 index 0000000..49072c4 --- /dev/null +++ b/css/common/misc.css @@ -0,0 +1,3 @@ +.wide-enough { + max-width: 400px; +} diff --git a/css/footer.css b/css/footer.css deleted file mode 100644 index 417b3d9..0000000 --- a/css/footer.css +++ /dev/null @@ -1,23 +0,0 @@ -html, body { - height: 100%; - width: 100%; -} -.top-level-footer-wrapper { - height: 100%; - width: 100%; - display: table; -} -.footer-wrapper-collapse { - display: table-row; - height: 1px; -} -.footer-wrapper-expand { - display: table-row; - height: auto; -} -footer { - margin-top: 20px; - padding: 15px 0 15px; - border-width: 1px 0; - border-style: solid; -} diff --git a/css/misc.css b/css/misc.css deleted file mode 100644 index 06c6675..0000000 --- a/css/misc.css +++ /dev/null @@ -1,3 +0,0 @@ -.reasonable-width { - max-width: 400px; -} diff --git a/index.html b/index.html index d7b1b05..9066aa6 100644 --- a/index.html +++ b/index.html @@ -26,6 +26,6 @@ navbar_link: Main page

{% endfor %}

- {% include pagination.html %} + {% include common/pagination.html %}

{% endif %} diff --git a/plots.html b/plots.html index f185f4f..8bb40aa 100644 --- a/plots.html +++ b/plots.html @@ -4,7 +4,8 @@ layout: plots groups: - navbar navbar_link: Plots -custom_css: plots.css +custom_css: + - plots.css input_order: - ascending - random -- cgit v1.2.3