aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2016-06-25 02:13:47 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2016-06-25 02:13:47 +0300
commit7f02962f5502bb581f0b50d534be0bcea0a739b2 (patch)
tree43a1cd08cbb888e674e0333a054da787ce8c1599
parentREADME update (diff)
downloadjekyll-theme-7f02962f5502bb581f0b50d534be0bcea0a739b2.tar.gz
jekyll-theme-7f02962f5502bb581f0b50d534be0bcea0a739b2.zip
move common assets to common/, more info to config
Diffstat
-rw-r--r--_config.yml3
-rw-r--r--_includes/common/bootstrap_css.html (renamed from _includes/bootstrap_css.html)0
-rw-r--r--_includes/common/bootstrap_js.html (renamed from _includes/bootstrap_js.html)0
-rw-r--r--_includes/common/footer.html (renamed from _includes/footer.html)4
-rw-r--r--_includes/common/header.html29
-rw-r--r--_includes/common/ie_compat.html (renamed from _includes/ie_compat.html)0
-rw-r--r--_includes/common/jquery.html (renamed from _includes/jquery.html)0
-rw-r--r--_includes/common/navbar.html (renamed from _includes/navbar.html)0
-rw-r--r--_includes/common/pagination.html (renamed from _includes/pagination.html)0
-rw-r--r--_includes/common/sidebar.html (renamed from _includes/sidebar.html)6
-rw-r--r--_includes/header.html24
-rw-r--r--_includes/posts/comments.html (renamed from _includes/comments.html)0
-rw-r--r--_layouts/main.html6
-rw-r--r--_layouts/post.html8
-rw-r--r--_posts/2015-07-03-std-call-once-bug-in-visual-studio-2012-2013.md4
-rw-r--r--css/common/footer.css (renamed from css/footer.css)0
-rw-r--r--css/common/misc.css6
-rw-r--r--css/misc.css9
-rw-r--r--index.html2
19 files changed, 54 insertions, 47 deletions
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/common/bootstrap_css.html
index f47b856..f47b856 100644
--- a/_includes/bootstrap_css.html
+++ b/_includes/common/bootstrap_css.html
diff --git a/_includes/bootstrap_js.html b/_includes/common/bootstrap_js.html
index e724257..e724257 100644
--- a/_includes/bootstrap_js.html
+++ b/_includes/common/bootstrap_js.html
diff --git a/_includes/footer.html b/_includes/common/footer.html
index f3cbb38..9ff7838 100644
--- a/_includes/footer.html
+++ b/_includes/common/footer.html
@@ -19,7 +19,7 @@
</footer>
</div>
</div>
- {% include jquery.html %}
- {% include bootstrap_js.html %}
+ {% include common/jquery.html %}
+ {% include common/bootstrap_js.html %}
</body>
</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 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <title>{{ page.title }} - {{ site.project.name }} - {{ site.personal_info.name }}</title>
+
+ {% include common/bootstrap_css.html %}
+
+ <link rel="stylesheet" href="{{ site.baseurl }}/css/common/footer.css">
+ <link rel="stylesheet" href="{{ site.baseurl }}/css/common/misc.css">
+
+ {% if page.custom_css %}
+ {% for css in page.custom_css %}
+ <link rel="stylesheet" href="{{ site.baseurl }}/css/{{ css }}"/>
+ {% endfor %}
+ {% endif %}
+
+ {% include common/ie_compat.html %}
+ </head>
+ <body>
+ <div class="top-level-footer-wrapper">
+ <div class="footer-wrapper-collapse">
+ {% include common/navbar.html %}
+ </div>
+ <div class="footer-wrapper-expand">
+ <div class="container">
diff --git a/_includes/ie_compat.html b/_includes/common/ie_compat.html
index 3cef67d..3cef67d 100644
--- a/_includes/ie_compat.html
+++ b/_includes/common/ie_compat.html
diff --git a/_includes/jquery.html b/_includes/common/jquery.html
index aa6d2fd..aa6d2fd 100644
--- a/_includes/jquery.html
+++ b/_includes/common/jquery.html
diff --git a/_includes/navbar.html b/_includes/common/navbar.html
index af4a1c5..af4a1c5 100644
--- a/_includes/navbar.html
+++ b/_includes/common/navbar.html
diff --git a/_includes/pagination.html b/_includes/common/pagination.html
index aa2f034..aa2f034 100644
--- a/_includes/pagination.html
+++ b/_includes/common/pagination.html
diff --git a/_includes/sidebar.html b/_includes/common/sidebar.html
index d00fc7a..4637244 100644
--- a/_includes/sidebar.html
+++ b/_includes/common/sidebar.html
@@ -1,6 +1,6 @@
<h4>About the project</h4>
-<p>Personal C++ notes. Feel free to contribute or contact me.</p>
-<div class="list-group reasonable-width">
+<p>{{ site.project.description }}. Feel free to contribute or contact me.</p>
+<div class="list-group wide-enough">
<a class="list-group-item" href="{{ site.github.repository_url }}"><span class="glyphicon glyphicon-home"></span>&nbsp;GitHub repository</a>
<a class="list-group-item" href="mailto:{{ site.personal_info.email }}"><span class="glyphicon glyphicon-envelope"></span>&nbsp;{{ site.personal_info.email }}</a>
</div>
@@ -8,7 +8,7 @@
{% if site.posts.size == 0 %}
<p>Sorry, there're no posts yet.</p>
{% else %}
- <div class="list-group reasonable-width">
+ <div class="list-group wide-enough">
{% for post in site.posts limit: 5 %}
<a class="list-group-item" href="{{ site.baseurl }}{{ post.url }}"><span class="badge"><span class="glyphicon glyphicon-time"></span>&nbsp;{{ post.date | date_to_string }}</span><span class="glyphicon glyphicon-file"></span>&nbsp;{{ post.title }}</a>
{% endfor %}
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 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
-
- <title>{{ page.title }} - C++ notes - {{ site.personal_info.name }}</title>
-
- {% include bootstrap_css.html %}
-
- <link rel="stylesheet" href="{{ site.baseurl }}/css/footer.css">
- <link rel="stylesheet" href="{{ site.baseurl }}/css/misc.css">
- <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
-
- {% include ie_compat.html %}
- </head>
- <body>
- <div class="top-level-footer-wrapper">
- <div class="footer-wrapper-collapse">
- {% include navbar.html %}
- </div>
- <div class="footer-wrapper-expand">
- <div class="container">
diff --git a/_includes/comments.html b/_includes/posts/comments.html
index f16a70c..f16a70c 100644
--- a/_includes/comments.html
+++ b/_includes/posts/comments.html
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 %}
<div class="row">
<div class="col-md-8">
{{ content }}
</div>
<div class="col-md-4">
- {% include sidebar.html %}
+ {% include common/sidebar.html %}
</div>
</div>
-{% 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 %}
<div class="row">
<div class="col-md-8">
<h1>{{ page.title }}</h1>
<p class="text-muted"><span class="glyphicon glyphicon-time"></span> Posted on {{ page.date | date_to_long_string }}</p>
{{ content }}
<hr/>
- {% include comments.html %}
+ {% include posts/comments.html %}
</div>
<div class="col-md-4">
- {% include sidebar.html %}
+ {% include common/sidebar.html %}
</div>
</div>
-{% 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/footer.css b/css/common/footer.css
index 417b3d9..417b3d9 100644
--- a/css/footer.css
+++ b/css/common/footer.css
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/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: <span class="glyphicon glyphicon-home"></span>&nbsp;Main page
<hr/>
{% endfor %}
<div class="text-center">
- {% include pagination.html %}
+ {% include common/pagination.html %}
</div>
{% endif %}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:30:31 +0000