From 7f02962f5502bb581f0b50d534be0bcea0a739b2 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 25 Jun 2016 02:13:47 +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/comments.html | 15 ----------- _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 | 16 ++++++++++++ _includes/footer.html | 25 ------------------ _includes/header.html | 24 ----------------- _includes/ie_compat.html | 11 -------- _includes/jquery.html | 5 ---- _includes/navbar.html | 26 ------------------- _includes/pagination.html | 30 ---------------------- _includes/posts/comments.html | 15 +++++++++++ _includes/sidebar.html | 16 ------------ _layouts/main.html | 6 ++--- _layouts/post.html | 8 +++--- ...std-call-once-bug-in-visual-studio-2012-2013.md | 4 ++- css/common/footer.css | 23 +++++++++++++++++ css/common/misc.css | 6 +++++ css/footer.css | 23 ----------------- css/misc.css | 9 ------- index.html | 2 +- 29 files changed, 210 insertions(+), 203 deletions(-) delete mode 100644 _includes/bootstrap_css.html delete mode 100644 _includes/bootstrap_js.html delete mode 100644 _includes/comments.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 create mode 100644 _includes/posts/comments.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 f6794b5..f5ab9d6 100644 --- a/_config.yml +++ b/_config.yml @@ -20,6 +20,9 @@ jquery_version: 1.11.3 html5shiv_version: 3.7.2 respond_version: 1.4.2 +project: + name: C++ notes + description: Personal C++ notes baseurl: /cpp-notes repository: egor-tensin/cpp-notes 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/comments.html b/_includes/comments.html deleted file mode 100644 index f16a70c..0000000 --- a/_includes/comments.html +++ /dev/null @@ -1,15 +0,0 @@ -{% if site.include_comments %} -
- - -{% 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..9ff7838 --- /dev/null +++ b/_includes/common/footer.html @@ -0,0 +1,25 @@ + + +
+
+
+
+
+
+
This project is licensed under the terms of the MIT License. See License for details.
+
+
+
+
+
This blog was last updated on: {{ site.time | date_to_long_string }}.
+
+
+
+
+
+
+ + {% 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 %} + + +
+
+ {% include common/navbar.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 %} +
    + {% if paginator.previous_page %} + {% if paginator.previous_page == 1 %} +
  •  Prev
    • + {% else %} +
  •  Prev
    • + {% endif %} + {% else %} +
  •  Prev
    • + {% endif %} + {% if paginator.page == 1 %} +
  • 1
    • + {% else %} +
  • 1
    • + {% endif %} + {% for count in (2..paginator.total_pages) %} + {% if count == paginator.page %} +
  • {{ count }}
    • + {% else %} +
  • {{ count }}
    • + {% endif %} + {% endfor %} + {% if paginator.next_page %} +
  • Next 
    • + {% else %} +
  • Next 
    • + {% endif %} +
+{% endif %} diff --git a/_includes/common/sidebar.html b/_includes/common/sidebar.html new file mode 100644 index 0000000..4637244 --- /dev/null +++ b/_includes/common/sidebar.html @@ -0,0 +1,16 @@ +

About the project

+

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

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

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 @@ -
-
-
-
-
-
-
-
-
This project is licensed under the terms of the MIT License. See License for details.
-
-
-
-
-
This blog was last updated on: {{ site.time | date_to_long_string }}.
-
-
-
-
-
-
-
- {% include jquery.html %} - {% include bootstrap_js.html %} - - diff --git a/_includes/header.html b/_includes/header.html deleted file mode 100644 index 3794583..0000000 --- a/_includes/header.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - {{ page.title }} - C++ notes - {{ site.personal_info.name }} - - {% include bootstrap_css.html %} - - - - - - {% include ie_compat.html %} - - -
-
- {% include navbar.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 %} -
    - {% if paginator.previous_page %} - {% if paginator.previous_page == 1 %} -
  •  Prev
    • - {% else %} -
  •  Prev
    • - {% endif %} - {% else %} -
  •  Prev
    • - {% endif %} - {% if paginator.page == 1 %} -
  • 1
    • - {% else %} -
  • 1
    • - {% endif %} - {% for count in (2..paginator.total_pages) %} - {% if count == paginator.page %} -
  • {{ count }}
    • - {% else %} -
  • {{ count }}
    • - {% endif %} - {% endfor %} - {% if paginator.next_page %} -
  • Next 
    • - {% else %} -
  • Next 
    • - {% endif %} -
-{% endif %} diff --git a/_includes/posts/comments.html b/_includes/posts/comments.html new file mode 100644 index 0000000..f16a70c --- /dev/null +++ b/_includes/posts/comments.html @@ -0,0 +1,15 @@ +{% if site.include_comments %} +
+ + +{% endif %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html deleted file mode 100644 index d00fc7a..0000000 --- a/_includes/sidebar.html +++ /dev/null @@ -1,16 +0,0 @@ -

About the project

-

Personal C++ notes. Feel free to contribute or contact me.

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

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 %}
{{ content }}
- {% include sidebar.html %} + {% include common/sidebar.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 %}

{{ page.title }}

Posted on {{ page.date | date_to_long_string }}

{{ content }}
- {% include comments.html %} + {% include posts/comments.html %}
- {% include sidebar.html %} + {% include common/sidebar.html %}
-{% include footer.html %} +{% include common/footer.html %} diff --git a/_posts/2015-07-03-std-call-once-bug-in-visual-studio-2012-2013.md b/_posts/2015-07-03-std-call-once-bug-in-visual-studio-2012-2013.md index accafd4..d88ee1f 100644 --- a/_posts/2015-07-03-std-call-once-bug-in-visual-studio-2012-2013.md +++ b/_posts/2015-07-03-std-call-once-bug-in-visual-studio-2012-2013.md @@ -4,13 +4,15 @@ layout: post excerpt: > In this post, I will describe a neat bug I've stumbled upon in C++ Standard Library implementation shipped with Microsoft Visual Studio 2012/2013. +custom_css: + - syntax.css --- ### Abstract In this post, I will describe a neat bug I've stumbled upon in C++ Standard Library implementation shipped with Microsoft Visual Studio 2012/2013. -### Licensing +### License This post, including code samples, is licenced under the terms of the MIT License. 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..c6cbd9d --- /dev/null +++ b/css/common/misc.css @@ -0,0 +1,6 @@ +.wide-enough { + max-width: 400px; +} +.wider { + max-width: 600px; +} 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 ead7dd9..0000000 --- a/css/misc.css +++ /dev/null @@ -1,9 +0,0 @@ -.reasonable-width { - max-width: 400px; -} -.reasonable-width-wider { - max-width: 600px; -} -div.panel-body figure.highlight pre { - margin-bottom: 0; -} diff --git a/index.html b/index.html index 14924b5..5e30871 100644 --- a/index.html +++ b/index.html @@ -25,6 +25,6 @@ navbar_link:  Main page
{% endfor %}
- {% include pagination.html %} + {% include common/pagination.html %}
{% endif %} -- cgit v1.2.3