Various css fixes

11 files changed, 177 insertions, 148 deletions

diff --git a/_includes/git-wiki/components/action_btn/downloads.html b/_includes/git-wiki/components/action_btn/downloads.html
index 8f654f9..8bd356b 100644
--- a/_includes/git-wiki/components/action_btn/downloads.html
+++ b/_includes/git-wiki/components/action_btn/downloads.html
@@ -1,4 +1,4 @@
-<ul class="downloads">
+<ul class="git-wiki-downloads">
     <li><a href="{{ site.github.zip_url }}">Download <strong>ZIP File</strong></a></li>
     <li><a href="{{ site.github.tar_url }}">Download <strong>TAR Ball</strong></a></li>
     <li><a href="{{ site.github.repository_url }}">View On <strong>GitHub</strong></a></li>
diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html
index d0e15b3..08c6e6f 100644
--- a/_includes/git-wiki/components/action_btn/page_actions.html
+++ b/_includes/git-wiki/components/action_btn/page_actions.html
@@ -1,23 +1,29 @@
-{% if site.use_github_wiki %}
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/_new">Add new</a></span>
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/{{url | remove: '.html' | append: ''}}/_edit">Edit</a></span>
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/{{url | remove: '.html' | append: ''}}/_history">History</a></span>
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/{{url | remove: '.html' | append: '.md'}}/">Source</a></span>
-{% else %}
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/new/{{site.git_branch}}?filename={{ site.wiki_folder | default: 'wiki' }}/">Add new</a></span>
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/edit/{{site.git_branch}}/{{page.path}}">Edit</a></span>
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/commits/{{site.git_branch}}/{{page.path}}">History</a></span>
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/blob/{{site.git_branch}}/{{page.path}}">Source</a></span>
-{% if site.blog_feature %}
-<span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/new/{{site.git_branch}}?filename=_posts/">Add new post</a></span>
-{% endif %}
+<div class="git-wiki-tools">
+    {% if site.use_github_wiki %}
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/_new">Add new</a></span>
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/{{url | remove: '.html' | append: ''}}/_edit">Edit</a></span>
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/{{url | remove: '.html' | append: ''}}/_history">History</a></span>
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/wiki/{{url | remove: '.html' | append: '.md'}}/">Source</a></span>
+    {% else %}
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/new/{{site.git_branch}}?filename={{ site.wiki_folder | default: 'wiki' }}/">Add
+            new</a></span>
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/edit/{{site.git_branch}}/{{page.path}}">Edit</a></span>
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/commits/{{site.git_branch}}/{{page.path}}">History</a></span>
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/blob/{{site.git_branch}}/{{page.path}}">Source</a></span>
+    {% if site.blog_feature %}
+    <span class="tools-element"><a target="_blank" href="{{ site.github.repository_url }}/new/{{site.git_branch}}?filename=_posts/">Add
+            new post</a></span>
+    {% endif %}
     {% if site.use_prose_io %}
     <br>
-    Prose.io: 
-    <span class="tools-element"><a target="_blank" href="http://prose.io/#{{site.github.repository_nwo}}/new/{{site.git_branch}}/{{ site.wiki_folder | default: 'wiki' }}">Add new</a></span>
+    Prose.io:
+    <span class="tools-element"><a target="_blank" href="http://prose.io/#{{site.github.repository_nwo}}/new/{{site.git_branch}}/{{ site.wiki_folder | default: 'wiki' }}">Add
+            new</a></span>
     <span class="tools-element"><a target="_blank" href="http://prose.io/#{{site.github.repository_nwo}}/edit/{{site.git_branch}}/{{page.path}}">Edit</a></span>
     {% if site.blog_feature %}
-    <span class="tools-element"><a target="_blank" href="http://prose.io/#{{site.github.repository_nwo}}/new/{{site.git_branch}}/_posts/">Add new post</a></span>
+    <span class="tools-element"><a target="_blank" href="http://prose.io/#{{site.github.repository_nwo}}/new/{{site.git_branch}}/_posts/">Add
+            new post</a></span>
+    {% endif %}
     {% endif %}
     {% endif %}
-{% endif %}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/_includes/git-wiki/components/copyrights/copyrights.html b/_includes/git-wiki/components/copyrights/copyrights.html
index d53ff75..8a2841e 100644
--- a/_includes/git-wiki/components/copyrights/copyrights.html
+++ b/_includes/git-wiki/components/copyrights/copyrights.html
@@ -1,9 +1,11 @@
 {% if site.github.is_project_page %}
-<p>This project is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
-{% endif %}
-<p><small>Hosted on GitHub Pages &mdash; Powered by <a href="https://github.com/Drassil/git-wiki">Git-Wiki v{{
-            version }}</a> </p>
+<div class="git-wiki-copyrights">
+    <p>This project is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></p>
+    {% endif %}
+    <p><small>Hosted on GitHub Pages &mdash; Powered by <a href="https://github.com/Drassil/git-wiki">Git-Wiki v{{
+                version }}</a> </p>
 
-{% if site.github.is_project_page %}
-<p class="view"><a href="{{ site.github.repository_url }}">View the Project on GitHub <small>{{ github_name }}</small></a></p>
+    {% if site.github.is_project_page %}
+    <p class="view"><a href="{{ site.github.repository_url }}">View the Project on GitHub <small>{{ github_name }}</small></a></p>
+</div>
 {% endif %}
\ No newline at end of file
diff --git a/_includes/git-wiki/components/lists/page-list.html b/_includes/git-wiki/components/lists/page-list.html
index 8c32b63..5fb118d 100644
--- a/_includes/git-wiki/components/lists/page-list.html
+++ b/_includes/git-wiki/components/lists/page-list.html
@@ -1,26 +1,29 @@
-{% if site.inc_before_page_list %}
-{% include {{ site.inc_before_page_list }} %}
-{% endif %}
+<div class="git-wiki-page-list">
+    {% if site.inc_before_page_list %}
+    {% include {{ site.inc_before_page_list }} %}
+    {% endif %}
 
-<span class="page-list-title">Pages {% if (site.show_wiki_pages_limit >= 1 %} (Latest {{site.show_wiki_pages_limit }} updated) {% endif %}:</span>
-<ul class="page-list">
-{% assign numPages=0 %}
-{% assign items = site.pages | sort: 'date' %}
-{% for post in items %}
-{% if numPages >= site.show_wiki_pages_limit %}
-    {% break %}
-{% endif %}
+    <span class="page-list-title">Pages {% if (site.show_wiki_pages_limit >= 1 %} (Latest {{site.show_wiki_pages_limit
+        }} updated) {% endif %}:</span>
+    <ul class="page-list">
+        {% assign numPages=0 %}
+        {% assign items = site.pages | sort: 'date' %}
+        {% for post in items %}
+        {% if numPages >= site.show_wiki_pages_limit %}
+        {% break %}
+        {% endif %}
 
-{% if post.layout != "null" and post.sitemap != false and post.title %}
-    <li class="page-list-item">
-        <a href="{{ post.url | relative_url }}">{{ post.title}}</a>
-    </li>
-    {% assign numPages = numPages | plus: 1 %}
-{% endif %}
+        {% if post.layout != "null" and post.sitemap != false and post.title %}
+        <li class="page-list-item">
+            <a href="{{ post.url | relative_url }}">{{ post.title}}</a>
+        </li>
+        {% assign numPages = numPages | plus: 1 %}
+        {% endif %}
 
-{% endfor %}
-</ul>
+        {% endfor %}
+    </ul>
 
-{% if site.inc_after_page_list %}
-{% include {{ site.inc_after_page_list }} %}
-{% endif %}
\ No newline at end of file
+    {% if site.inc_after_page_list %}
+    {% include {{ site.inc_after_page_list }} %}
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/_includes/git-wiki/components/lists/post-list.html b/_includes/git-wiki/components/lists/post-list.html
index be1aa35..d6fa663 100644
--- a/_includes/git-wiki/components/lists/post-list.html
+++ b/_includes/git-wiki/components/lists/post-list.html
@@ -1,28 +1,31 @@
-{% if site.inc_before_post_list %}
-{% include {{ site.inc_before_post_list }} %}
-{% endif %}
+<div class="git-wiki-page-list">
+    {% if site.inc_before_post_list %}
+    {% include {{ site.inc_before_post_list }} %}
+    {% endif %}
 
-<span class="post-list-title">Posts {% if (site.show_wiki_posts_limit >= 1 %} (Latest {{site.show_wiki_posts_limit }} updated) {% endif %}:</span>
-<ul class="post-list">
-{% assign numPages=0 %}
-{% assign items = site.posts | sort: 'date' %}
-{% for post in items %}
-{% if numPages >= site.show_wiki_posts_limit %}
-    {% break %}
-{% endif %}
+    <span class="post-list-title">Posts {% if (site.show_wiki_posts_limit >= 1 %} (Latest {{site.show_wiki_posts_limit
+        }} updated) {% endif %}:</span>
+    <ul class="post-list">
+        {% assign numPages=0 %}
+        {% assign items = site.posts | sort: 'date' %}
+        {% for post in items %}
+        {% if numPages >= site.show_wiki_posts_limit %}
+        {% break %}
+        {% endif %}
 
-{% if post.layout != "null" and post.sitemap != false and post.title %}
-    <li class="post-list-item">
-        <a href="{{ post.url | relative_url }}">{{ post.title}}</a>
-    </li>
-    {% assign numPages = numPages | plus: 1 %}
-{% endif %}
+        {% if post.layout != "null" and post.sitemap != false and post.title %}
+        <li class="post-list-item">
+            <a href="{{ post.url | relative_url }}">{{ post.title}}</a>
+        </li>
+        {% assign numPages = numPages | plus: 1 %}
+        {% endif %}
 
-{% endfor %}
-</ul>
+        {% endfor %}
+    </ul>
 
-<span class="post-list read-all"><a href="{{ '/blog/' | relative_url}}">Read all</a></span>
+    <span class="post-list read-all"><a href="{{ '/blog/' | relative_url}}">Read all</a></span>
 
-{% if site.inc_after_post_list %}
-{% include {{ site.inc_after_post_list }} %}
-{% endif %}
\ No newline at end of file
+    {% if site.inc_after_post_list %}
+    {% include {{ site.inc_after_post_list }} %}
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/_includes/git-wiki/components/search/index.html b/_includes/git-wiki/components/search/index.html
index 8af31e8..f6b5ba3 100644
--- a/_includes/git-wiki/components/search/index.html
+++ b/_includes/git-wiki/components/search/index.html
@@ -1,7 +1,9 @@
-{% comment %}
+<div class="git-wiki-search">
+    {% comment %}
     This component just select your preferred search engine based on _config.yml value
-{% endcomment %}
+    {% endcomment %}
 
-{% assign se = site.search_engine | default: "github" %}
-{% assign file = "git-wiki/components/search/se_" | append: se | append: ".html" %}
-{% include {{file}} %}
\ No newline at end of file
+    {% assign se = site.search_engine | default: "github" %}
+    {% assign file = "git-wiki/components/search/se_" | append: se | append: ".html" %}
+    {% include {{file}} %}
+</div>
\ No newline at end of file
diff --git a/_includes/git-wiki/components/search/se_github.html b/_includes/git-wiki/components/search/se_github.html
index efcc5e8..8605410 100644
--- a/_includes/git-wiki/components/search/se_github.html
+++ b/_includes/git-wiki/components/search/se_github.html
@@ -1,10 +1,12 @@
-<form method="GET" action="{{ site.github.repository_url }}/search">
-    <input type="text" name="q[]" placeholder="Text to search">
-    {% if site.use_github_wiki %}
-    <input type="hidden" name="type" value="Wikis">
-    {% else %}
-    <!-- <input type="hidden" name="l" value="Markdown"> -->
-    <input type="hidden" name="q[]" value="path:/{{ site.wiki_folder }}">
-    {% endif %}
-    <input type="submit" value="Search">
-</form>
\ No newline at end of file
+<div class="git-wiki-search-github">
+    <form method="GET" action="{{ site.github.repository_url }}/search">
+        <input type="text" name="q[]" placeholder="Text to search">
+        {% if site.use_github_wiki %}
+        <input type="hidden" name="type" value="Wikis">
+        {% else %}
+        <!-- <input type="hidden" name="l" value="Markdown"> -->
+        <input type="hidden" name="q[]" value="path:/{{ site.wiki_folder }}">
+        {% endif %}
+        <input type="submit" value="Search">
+    </form>
+</div>
\ No newline at end of file
diff --git a/_includes/git-wiki/components/search/se_google.html b/_includes/git-wiki/components/search/se_google.html
index 0c3e675..f0cd5c1 100644
--- a/_includes/git-wiki/components/search/se_google.html
+++ b/_includes/git-wiki/components/search/se_google.html
@@ -1,12 +1,14 @@
-<script>
-    (function () {
-        var cx = "{{site.google_cse_token}}";
-        var gcse = document.createElement('script');
-        gcse.type = 'text/javascript';
-        gcse.async = true;
-        gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(gcse, s);
-    })();
-</script>
-<gcse:search></gcse:search>
\ No newline at end of file
+<div class="git-wiki-search-google">
+    <script>
+        (function () {
+            var cx = "{{site.google_cse_token}}";
+            var gcse = document.createElement('script');
+            gcse.type = 'text/javascript';
+            gcse.async = true;
+            gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(gcse, s);
+        })();
+    </script>
+    <gcse:search></gcse:search>
+</div>
\ No newline at end of file
diff --git a/_includes/git-wiki/components/search/se_js.html b/_includes/git-wiki/components/search/se_js.html
index 9e75464..056dd87 100644
--- a/_includes/git-wiki/components/search/se_js.html
+++ b/_includes/git-wiki/components/search/se_js.html
@@ -1,15 +1,16 @@
-<div class="container">
-	<div class="well" id="searchbox">
-		<input id="search-field" placeholder="Search the Site"/>
-		<ul id="results"></ul>
+<div class="git-wiki-search-js">
+	<div class="container">
+		<div class="well" id="searchbox">
+			<input id="search-field" placeholder="Search the Site" />
+			<ul id="results"></ul>
+		</div>
 	</div>
 </div>
-
-<script src="{{ '/assets/js/jquery.camelhunter.min.js' | relative_url }}"></script>
-<script type="text/javascript">
-	$("#search-field").camelHunter({
-		onKeyUp 			: true,
-		rss: "{{ '/sitemap_full.xml' | relative_url }}",
-		results   : "#results"
-	});
-</script>
\ No newline at end of file
+	<script src="{{ '/assets/js/jquery.camelhunter.min.js' | relative_url }}"></script>
+	<script type="text/javascript">
+		$("#search-field").camelHunter({
+			onKeyUp: true,
+			rss: "{{ '/sitemap_full.xml' | relative_url }}",
+			results: "#results"
+		});
+	</script>
diff --git a/_includes/git-wiki/sections/content/content.html b/_includes/git-wiki/sections/content/content.html
index b86a729..58e4421 100644
--- a/_includes/git-wiki/sections/content/content.html
+++ b/_includes/git-wiki/sections/content/content.html
@@ -1,25 +1,28 @@
-<section>
-  {% include git-wiki/sections/tools/tools.html %}
+<div class="git-wiki-content">
+  <section>
 
-  {% if site.inc_before_toc %}
-  {% include {{ site.inc_before_toc }} %}
-  {% endif %}
+    {% include git-wiki/sections/tools/tools.html %}
 
-  <div id="toc"></div>
+    {% if site.inc_before_toc %}
+    {% include {{ site.inc_before_toc }} %}
+    {% endif %}
 
-  {% if site.inc_after_toc %}
-  {% include {{ site.inc_after_toc }} %}
-  {% endif %}
+    <div id="toc"></div>
 
-  {% if site.inc_before_content %}
-  {% include {{ site.inc_before_content }} %}
-  {% endif %}
+    {% if site.inc_after_toc %}
+    {% include {{ site.inc_after_toc }} %}
+    {% endif %}
 
-  <div id="content">
-    {{ content }}
-  </div>
+    {% if site.inc_before_content %}
+    {% include {{ site.inc_before_content }} %}
+    {% endif %}
 
-  {% if site.inc_after_content %}
-  {% include {{ site.inc_after_content }} %}
-  {% endif %}
-</section>
\ No newline at end of file
+    <div id="content">
+      {{ content }}
+    </div>
+
+    {% if site.inc_after_content %}
+    {% include {{ site.inc_after_content }} %}
+    {% endif %}
+  </section>
+</div>
\ No newline at end of file
diff --git a/_sass/git-wiki-style.scss b/_sass/git-wiki-style.scss
index eb58d8b..bb01ebc 100644
--- a/_sass/git-wiki-style.scss
+++ b/_sass/git-wiki-style.scss
@@ -118,6 +118,7 @@ img {
   width: 100%;
   border-bottom: 1px solid;
   border-radius: 10px;
+  z-index: 999;
 }
 
 #git-wiki-sidebar {
@@ -128,7 +129,7 @@ img {
   /*overflow-y: auto;
   overflow-x: auto;*/
   max-height: 100%;
-  padding-bottom: 30px;
+  padding-bottom: 55px !important;
 }
 
 @media print, screen and (max-width: 992px) {
@@ -139,13 +140,17 @@ img {
     border-bottom: 1px solid;
     border-radius: 10px;
   }
+
+  .git-wiki-content {
+    margin-top:50px;
+  }
 }
 
 .git-wiki-main-logo {
   max-width: 270px;
 }
 
-header .downloads {
+#git-wiki-sidebar .git-wiki-downloads {
   list-style:none;
   height:40px;
   padding:0;
@@ -155,22 +160,22 @@ header .downloads {
   width:270px;
 }
 
-header .downloads li {
+#git-wiki-sidebar .git-wiki-downloads li {
   width:89px;
   float:left;
   border-right:1px solid #e0e0e0;
   height:40px;
 }
 
-header .downloads li:first-child a {
+#git-wiki-sidebar .git-wiki-downloads li:first-child a {
   border-radius:5px 0 0 5px;
 }
 
-header .downloads li:last-child a {
+#git-wiki-sidebar .git-wiki-downloads li:last-child a {
   border-radius:0 5px 5px 0;
 }
 
-header .downloads a {
+#git-wiki-sidebar .git-wiki-downloads a {
   line-height:1;
   font-size:11px;
   color:#999;
@@ -180,11 +185,11 @@ header .downloads a {
   height:34px;
 }
 
-header .downloads a:hover {
+#git-wiki-sidebar .git-wiki-downloads a:hover {
   color:#999;
 }
 
-header .downloads a:active {
+#git-wiki-sidebar .git-wiki-downloads a:active {
   background-color:#f0f0f0;
 }
 
@@ -193,18 +198,18 @@ strong {
   font-weight:700;
 }
 
-header .downloads li + li + li {
+#git-wiki-sidebar .git-wiki-downloads li + li + li {
   border-right:none;
   width:89px;
 }
 
-header .downloads a strong {
+#git-wiki-sidebar .git-wiki-downloads a strong {
   font-size:14px;
   display:block;
   color:#222;
 }
 
-section {
+.git-wiki-content {
   /*width:500px;
   float:right;*/
   padding-left: 320px;
@@ -243,28 +248,28 @@ footer {
     margin:0;
   }
 
-  header, section, footer {
+  #git-wiki-sidebar, .git-wiki-content, footer {
     float:none;
     position:static;
     width:auto;
   }
 
-  header {
+  #git-wiki-sidebar{
     padding-right:320px;
   }
 
-  section, footer {
+  .git-wiki-content, footer {
     border:1px solid #e5e5e5;
     border-width:1px 0;
     padding:20px 0;
     margin:0 0 20px;
   }
 
-  header a small {
+  #git-wiki-sidebara small {
     display:inline;
   }
 
-  /*header .downloads {
+  /*#git-wiki-sidebar .git-wiki-downloads {
     position:absolute;
     right:50px;
     top:52px;
@@ -277,11 +282,11 @@ footer {
     word-wrap:break-word;
   }
 
-  header {
+  #git-wiki-sidebar{
     padding:0;
   }
 
-  header .downloads, header p.view {
+  #git-wiki-sidebar .git-wiki-downloads, #git-wiki-sidebarp.view {
     position:static;
   }
 
@@ -295,11 +300,11 @@ footer {
     padding:15px;
   }
 
-  header .downloads {
+  #git-wiki-sidebar .git-wiki-downloads {
     width:99%;
   }
 
-  header li, header .downloads li + li + li {
+  #git-wiki-sidebarli, #git-wiki-sidebar .git-wiki-downloads li + li + li {
     width:33%;
   }
 }