Merge branch 'master' into gh-pages

IEEEmadC · Feb 19, 2019 · 42fe9a3 · 42fe9a3
2 parents d993227 + b7c469c
commit 42fe9a3
Show file tree

Hide file tree

Showing 7 changed files with 1,036 additions and 7 deletions.
diff --git a/_includes/git-wiki/sections/content/content.html b/_includes/git-wiki/sections/content/content.html
@@ -7,7 +7,7 @@
     {% include {{ site.inc_before_toc }} %}
     {% endif %}
 
-    <div id="toc"></div>
+    <div id="git-wiki-toc"></div>
 
     {% if site.inc_after_toc %}
     {% include {{ site.inc_after_toc }} %}

diff --git a/_includes/git-wiki/sections/tail/tail.html b/_includes/git-wiki/sections/tail/tail.html
@@ -20,7 +20,7 @@
 
 <script type="text/javascript">
     $(document).ready(function () {
-        $('#toc').toc({
+        $('#git-wiki-toc').toc({
             title: '<i>Contents</i>',
             showSpeed: 0,
             headers: '#git-wiki-content h1, #git-wiki-content h2, #git-wiki-content h3, #git-wiki-content h4, #git-wiki-content h5, #git-wiki-content h6'

diff --git a/_layouts/git-wiki-bs-github.html b/_layouts/git-wiki-bs-github.html
@@ -0,0 +1,73 @@
+{% comment %}
+#
+# This layout uses bootstrap with united theme
+#
+{% endcomment %}
+
+{% include git-wiki/defines/defines.html %}
+
+<!doctype html>
+<html>
+
+<head>
+    {% if site.inc_before_head %}
+    {% include {{ site.inc_before_head }} %}
+    {% endif %}
+
+    {% include git-wiki/sections/head/meta.html %}
+    {% include git-wiki/sections/head/scripts.html %}
+    {% include git-wiki/sections/head/styles.html %}
+
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootswatch/4.1.3/united/bootstrap.min.css">
+    <link rel="stylesheet" href="{{ '/assets/css/github.css?v=' | append: site.github.build_revision | relative_url }}">
+
+    {% if site.inc_after_head %}
+    {% include {{ site.inc_after_head }} %}
+    {% endif %}
+</head>
+
+<body>
+    <div class="wrapper">
+        <div class="row">
+            <div class="col-lg-9">
+                <div class="git-wiki-page">
+                    {% include git-wiki/sections/tools/tools.html %}
+
+                    {% if site.inc_before_toc %}
+                    {% include {{ site.inc_before_toc }} %}
+                    {% endif %}
+
+                    <div id="git-wiki-toc"></div>
+
+                    {% if site.inc_after_toc %}
+                    {% include {{ site.inc_after_toc }} %}
+                    {% endif %}
+
+                    {% if site.inc_before_content %}
+                    {% include {{ site.inc_before_content }} %}
+                    {% endif %}
+
+                    <div id="git-wiki-content">
+                        {{ content }}
+                    </div>
+
+                    {% if site.inc_after_content %}
+                    {% include {{ site.inc_after_content }} %}
+                    {% endif %}
+                </div>
+            </div>
+            <div class="col-lg-3">
+                {% include git-wiki/sections/header/header.html %}
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                {% include git-wiki/sections/footer/footer.html %}
+            </div>
+        </div>
+    </div>
+
+    {% include git-wiki/sections/tail/tail.html %}
+</body>
+
+</html>
diff --git a/_layouts/git-wiki-bs-lux.html b/_layouts/git-wiki-bs-lux.html
@@ -50,7 +50,7 @@
                     {% include {{ site.inc_before_toc }} %}
                     {% endif %}
 
-                    <div id="toc"></div>
+                    <div id="git-wiki-toc"></div>
 
                     {% if site.inc_after_toc %}
                     {% include {{ site.inc_after_toc }} %}

diff --git a/_layouts/git-wiki-bs-united.html b/_layouts/git-wiki-bs-united.html
@@ -36,7 +36,7 @@
                     {% include {{ site.inc_before_toc }} %}
                     {% endif %}
 
-                    <div id="toc"></div>
+                    <div id="git-wiki-toc"></div>
 
                     {% if site.inc_after_toc %}
                     {% include {{ site.inc_after_toc }} %}