From 3558bbaec2fbd1e3cf7561f2ceccc0797d3ddf54 Mon Sep 17 00:00:00 2001 From: Abdel Olakara Date: Wed, 2 Jul 2014 18:50:05 +0400 Subject: [PATCH] New layout for the blog pages and other pages --- 404.html | 23 +++++++++++++++++++---- _config.yml | 2 +- _includes/footer.html | 21 ++++++--------------- _layouts/master.html | 10 ++++++++++ _layouts/post.html | 25 ++++++++++--------------- about/index.html | 16 +++++++++++----- assets/css/app.css | 21 ++++++++++++++------- blog/index.html | 37 +++++++++++++++++++++++++------------ 8 files changed, 96 insertions(+), 59 deletions(-) diff --git a/404.html b/404.html index 0969592..c533b5c 100644 --- a/404.html +++ b/404.html @@ -3,7 +3,22 @@ title: "404: Page not found" --- -
-

404: Page not found

-

Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. Head back home to try finding it again.

-
+
+
+
+   +
+
+ :-( +
+
+   +
+
+
+
+

Sorry, that URL is pointing to something that doesn't exist!


+

You can go to my home page or to my blog.

+
+
+
diff --git a/_config.yml b/_config.yml index dd872aa..2022f5c 100644 --- a/_config.yml +++ b/_config.yml @@ -31,4 +31,4 @@ navigation: url: /about/ # Custom vars -version: 0.6.0 +version: 0.5.6 diff --git a/_includes/footer.html b/_includes/footer.html index d24605e..c8ecee1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,15 +1,6 @@ - - + \ No newline at end of file diff --git a/_layouts/master.html b/_layouts/master.html index 13ea0b2..6fd0c91 100644 --- a/_layouts/master.html +++ b/_layouts/master.html @@ -3,5 +3,15 @@ {% include head.html %} {{ content }} + + diff --git a/_layouts/post.html b/_layouts/post.html index 3fba5fe..4b24dbf 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,9 +2,9 @@ layout: master --- -
+
- - - \ No newline at end of file +
\ No newline at end of file diff --git a/about/index.html b/about/index.html index 581bf01..81ee4c8 100644 --- a/about/index.html +++ b/about/index.html @@ -3,8 +3,14 @@ title: About Me --- -
-

About Me!!

- - Some more text about me!! :) :) -
\ No newline at end of file +
+
+ +
+ + {% include footer.html %} +
+
+
diff --git a/assets/css/app.css b/assets/css/app.css index 2a9c679..9c69c8d 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -8,15 +8,22 @@ padding-bottom: 10px; } -.btn-back { - margin-left: -46px; - text-decoration:none !important; -} -.colx { -margin-bottom:-9999px;padding-bottom:9999px; +@media (min-width: 768px) { + .sidebar { + position: fixed; + top: 0px; + bottom: 0; + left: 0; + z-index: 1000; + display: block; + padding: 20px; + overflow-x: hidden; + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ + } } + .container > header { color: #2672EC; } @@ -49,7 +56,7 @@ margin-bottom:-9999px;padding-bottom:9999px; } .blue { - background: #2672EC; + background: #007fff; } .orange { diff --git a/blog/index.html b/blog/index.html index 738eda5..195b6da 100644 --- a/blog/index.html +++ b/blog/index.html @@ -4,18 +4,32 @@ --- -
+
-