diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html index 9854aa4..b3290b0 100644 --- a/_includes/themes/twitter/default.html +++ b/_includes/themes/twitter/default.html @@ -11,18 +11,24 @@ - + - - + + + + + + + - + + - + +
+ + {{ site.title }} +
+ + + + + +
+
+ {{ content }}
-
- -
- {{ content }} -
-
-
+ + {% include JB/analytics %} + + + + + + diff --git a/_includes/themes/twitter/page.html b/_includes/themes/twitter/page.html index ff105c1..e981ad9 100644 --- a/_includes/themes/twitter/page.html +++ b/_includes/themes/twitter/page.html @@ -2,8 +2,8 @@

{{ page.title }} {% if page.tagline %} {{ page.tagline }}{% endif %}

-
-
+
+
{{ content }}
diff --git a/_includes/themes/twitter/post.html b/_includes/themes/twitter/post.html index 2774711..b44c5c1 100644 --- a/_includes/themes/twitter/post.html +++ b/_includes/themes/twitter/post.html @@ -2,8 +2,8 @@

{{ page.title }} {% if page.tagline %}{{page.tagline}}{% endif %}

-
-
+
+
{{ page.date | date_to_long_string }}
@@ -13,7 +13,7 @@ {% unless page.categories == empty %}
    -
    • +
    • {% assign categories_list = page.categories %} {% include JB/categories_list %}
@@ -21,28 +21,26 @@ {% unless page.tags == empty %}
    -
    • +
    • {% assign tags_list = page.tags %} {% include JB/tags_list %}
{% endunless %}
- +
{% include JB/comments %}
diff --git a/assets/themes/twitter/bootstrap/css/bs-sticky-footer.css b/assets/themes/twitter/bootstrap/css/bs-sticky-footer.css new file mode 100644 index 0000000..bb76248 --- /dev/null +++ b/assets/themes/twitter/bootstrap/css/bs-sticky-footer.css @@ -0,0 +1,45 @@ +/* Sticky footer styles +-------------------------------------------------- */ + +html, +body { + height: 100%; + /* The html and body elements cannot have any padding or margin. */ +} + +/* Wrapper for page content to push down footer */ +#wrap { + min-height: 100%; + height: auto; + /* Negative indent footer by its height */ + margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; +} + +/* Set the fixed height of the footer here */ +footer { + height: 60px; + background-color: #f5f5f5; +} + + +/* Custom page CSS +-------------------------------------------------- */ +/* Not required for template or sticky footer method. */ + +#wrap > .container { + padding: 60px 15px 0; +} +.container .text-muted { + margin: 20px 0; +} + +footer > .container { + padding-left: 15px; + padding-right: 15px; +} + +code { + font-size: 80%; +} diff --git a/assets/themes/twitter/css/style.css b/assets/themes/twitter/css/style.css index f61e4b5..491cf54 100644 --- a/assets/themes/twitter/css/style.css +++ b/assets/themes/twitter/css/style.css @@ -1,13 +1,17 @@ /* Custom container */ -.container-narrow { + +/* Replaced with normal container and standard footer */ +/*.container-narrow { margin: 0 auto; max-width: 700px; } .container-narrow > hr { margin: 30px 0; } +*/ -.navbar .nav { - float: right; } +/* Replaced with standard BS3 Navbar */ +/*.navbar .nav { + float: right; }*/ /* posts index */ .post > h3.title {