more updates to doc, some theme tweaks, finalizing the 5.0 release

matuzalemmuller · Mar 21, 2016 · ae69b83 · ae69b83
1 parent 2cbb248
commit ae69b83
Show file tree

Hide file tree

Showing 29 changed files with 485 additions and 353 deletions.
diff --git a/_data/sidebars/mydoc_sidebar.yml b/_data/sidebars/mydoc_sidebar.yml
@@ -1,9 +1,9 @@
 # This is your sidebar TOC. The sidebar code loops through sections here and provides the appropriate formatting.
 
 entries:
-- title: Mydoc
-  product: Mydoc
-  version: version 5.0
+- title: sidebar
+  product: Jekyll Doc Theme
+  version: 5.0
   subcategories:
 
   - title:
@@ -23,6 +23,14 @@ entries:
     output: web, pdf
     items:
 
+    - title: 5.0 Release notes
+      url: /mydoc_release_notes_50/
+      output: web, pdf
+
+    - title: Get started
+      url: /
+      output: web, pdf
+
     - title: Introduction
       url: /mydoc_introduction/
       output: web, pdf
@@ -31,10 +39,6 @@ entries:
       url: /mydoc_supported_features/
       output: web, pdf
 
-    - title: Get started
-      url: /mydoc_getting_started/
-      output: web, pdf
-
     - title: About the theme author
       url: /mydoc_about/
       output: web, pdf
@@ -139,6 +143,10 @@ entries:
       url: /mydoc_commenting_on_files/
       output: web, pdf
 
+#    - title: Git collaboration
+#      url: /mydoc_git_collaboration/
+#      output: web, pdf
+
   - title: Publishing
     output: web, pdf
 
@@ -191,6 +199,10 @@ entries:
       url: /mydoc_glossary/
       output: web, pdf
 
+    - title: FAQ layout
+      url: /mydoc_faq_layout/
+      output: web, pdf
+
   - title: Troubleshooting
     output: web, pdf
 
@@ -214,6 +226,7 @@ entries:
 
       thirdlevel:
       - title: Tag archive pages
+        output: web
         thirdlevelitems:
 
         - title: Formatting pages
@@ -238,4 +251,8 @@ entries:
 
         - title: Collaboration pages
           url: /tag_collaboration/
+          output: web
+
+        - title: Troubleshooting pages
+          url: /tag_troubleshooting/
           output: web
diff --git a/_data/sidebars/product1_sidebar.yml b/_data/sidebars/product1_sidebar.yml
@@ -4,7 +4,7 @@
 entries:
 - title: Sidebar
   product: Product1
-  version: version 1.0
+  version: 1.0
   subcategories:
 
   - title:

diff --git a/_data/sidebars/product2_sidebar.yml b/_data/sidebars/product2_sidebar.yml
@@ -3,7 +3,7 @@
 entries:
 - title: Product2
   product: Product2
-  version: version 1.0
+  version: 1.0
   subcategories:
 
   - title:

diff --git a/_data/sidebars/tags_sidebar.yml b/_data/sidebars/tags_sidebar.yml
@@ -4,33 +4,51 @@ entries:
   product: Tags
   version: all products
   levels: one
+  output: web
   subcategories:
 
   - title: News
+    output: web
     items:
     - title: News
       url: /news/
+      output: web
     - title: News archive
       url: /news_archive/
+      output: web
   - title: Tags
+    output: web
     items:
     - title: Collaboration
       url: /tag_collaboration/
+      output: web
     - title: Content Types
       url: /tag_content_types/
+      output: web
     - title: Formatting
       url: /tag_formatting/
+      output: web
     - title: Getting started
       url: /tag_getting_started/
+      output: web
     - title: Mobile
       url: /tag_mobile/
+      output: web
     - title: Navigation
       url: /tag_navigation/
+      output: web
     - title: News
       url: /tag_news/
+      output: web
     - title: Publishing
       url: /tag_publishing/
+      output: web
     - title: Single sourcing
       url: /tag_single_sourcing/
+      output: web
     - title: Special layouts
-      url: /tag_special_layouts/
+      url: /tag_special_layouts/
+      output: web
+    - title: Troubleshooting
+      url: /tag_troubleshooting/
+      output: web
diff --git a/_data/topnav.yml b/_data/topnav.yml
@@ -24,7 +24,7 @@ topnav_dropdowns:
           external_url: http://idratherbewriting.com/category-jekyll/
     - title: Products
       items:
-        - title: Theme instructions
+        - title: Jekyll Documentation Theme
           url: /mydoc_introduction/
         - title: Product 1
           url: /p1_landing_page/

diff --git a/_includes/head.html b/_includes/head.html
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="{{ "/css/modern-business.css" | prepend: site.baseurl }}">
 <link rel="stylesheet" href="{{ "/css/lavish-bootstrap.css" | prepend: site.baseurl }}">
 <link rel="stylesheet" href="{{ "/css/customstyles.css" | prepend: site.baseurl }}">
-<link rel="stylesheet" href="{{ "/css/theme-green.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ "/css/theme-blue.css" | prepend: site.baseurl }}">
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -0,0 +1,56 @@
+{% include custom/sidebarconfigs.html %}
+
+<div class="sidebarTitle">{{sidebar[0].product}} {{sidebar[0].version}}</div>
+<ul id="mysidebar" class="nav">
+    {% for entry in sidebar %}
+    {% for subcategory in entry.subcategories %}
+    {% if subcategory.output contains "web" %}
+    <li>
+        <a href="#">{{ subcategory.title }}</a>
+        <ul>
+            {% for item in subcategory.items %}
+            {% if item.output contains "web" %}
+            {% if item.external_url %}
+            <li><a href="{{item.external_url}}" target="_blank">{{subcategory.title}}</a></li>
+            {% elsif page.url == item.url %}
+            <li class="active"><a href="{{item.url | prepend: site.baseurl}}">{{item.title}}</a></li>
+            {% else %}
+            <li><a href="{{item.url | prepend: site.baseurl}}">{{item.title}}</a></li>
+            {% endif %}
+            {% for thirdlevel in item.thirdlevel %}
+            {% if thirdlevel.output contains "web" %}
+            <li class="thirdlevel">
+                <a href="#">{{ thirdlevel.title }}</a>
+                <ul>
+                    {% for deeplevel in thirdlevel.thirdlevelitems %}
+                    {% if deeplevel.output contains "web" %}
+                    {% if deeplevel.external_url %}
+                    <li><a href="{{deeplevel.external_url}}" target="_blank">{{deeplevel.title}}</a></li>
+                    {% elsif page.url == deeplevel.url %}
+                    <li class="active"><a href="{{deeplevel.url | prepend: site.baseurl}}">{{deeplevel.title}}</a></li>
+                    {% else %}
+                    <li><a href="{{deeplevel.url | prepend: site.baseurl}}">{{deeplevel.title}}</a></li>
+                    {% endif %}
+                    {% endif %}
+                    {% endfor %}
+                </ul>
+            </li>
+            {% endif %}
+            {% endfor %}
+            {% endif %}
+            {% endfor %}
+        </ul>
+        {% endif %}
+        {% endfor %}
+        {% endfor %}
+        <!-- if you aren't using the accordion, uncomment this block:
+           <p class="external">
+               <a href="#" id="collapseAll">Collapse All</a> | <a href="#" id="expandAll">Expand All</a>
+           </p>
+           -->
+    </li>
+</ul>
+</div>
+
+<!-- this highlights the active parent class in the navgoco sidebar. this is critical so that the parent expands when you're viewing a page. This must appear below the sidebar code above. Otherwise, if placed inside customscripts.js, the script runs before the sidebar code runs and the class never gets inserted.-->
+<script>$("li.active").parents('li').toggleClass("active");</script>
diff --git a/_includes/toc.html b/_includes/toc.html
@@ -18,6 +18,4 @@
 });
 </script>
 
-{% unless page.toc == false %}
 <div id="toc"></div>
-{% endunless %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -62,62 +62,7 @@
         <!-- Sidebar Column -->
         <div class="col-md-3">
 
-            {% include custom/sidebarconfigs.html %}
-            <span class="siteTagline">{{sidebar[0].product}}</span>
-            <span class="versionTagline">{{sidebar[0].version}}</span>
-            <ul id="mysidebar" class="nav">
-                {% for entry in sidebar %}
-                {% for subcategory in entry.subcategories %}
-                {% if subcategory.output contains "web" %}
-                <li>
-                    <a href="#">{{ subcategory.title }}</a>
-                    <ul>
-                        {% for item in subcategory.items %}
-                        {% if item.output contains "web" %}
-                        {% if item.external_url %}
-                        <li><a href="{{item.external_url}}" target="_blank">{{subcategory.title}}</a></li>
-                        {% elsif page.url == item.url %}
-                        <li class="active"><a href="{{item.url | prepend: site.baseurl}}">{{item.title}}</a></li>
-                        {% else %}
-                        <li><a href="{{item.url | prepend: site.baseurl}}">{{item.title}}</a></li>
-                        {% endif %}
-                        {% for thirdlevel in item.thirdlevel %}
-                        {% if thirdlevel.output contains "web" %}
-                        <li class="thirdlevel">
-                            <a href="#">{{ thirdlevel.title }}</a>
-                            <ul>
-                                {% for deeplevel in thirdlevel.thirdlevelitems %}
-                                {% if deeplevel.output contains "web" %}
-                                {% if deeplevel.external_url %}
-                                <li><a href="{{deeplevel.external_url}}" target="_blank">{{deeplevel.title}}</a></li>
-                                {% elsif page.url == deeplevel.url %}
-                                <li class="active"><a href="{{deeplevel.url | prepend: site.baseurl}}">{{deeplevel.title}}</a></li>
-                                {% else %}
-                                <li><a href="{{deeplevel.url | prepend: site.baseurl}}">{{deeplevel.title}}</a></li>
-                                {% endif %}
-                                {% endif %}
-                                {% endfor %}
-                            </ul>
-                        </li>
-                        {% endif %}
-                        {% endfor %}
-                        {% endif %}
-                        {% endfor %}
-                    </ul>
-                    {% endif %}
-                    {% endfor %}
-                    {% endfor %}
-                    <!-- if you aren't using the accordion, uncomment this block:
-                       <p class="external">
-                           <a href="#" id="collapseAll">Collapse All</a> | <a href="#" id="expandAll">Expand All</a>
-                       </p>
-                       -->
-                </li>
-            </ul>
-        </div>
-
-    <!-- this highlights the active parent class in the navgoco sidebar. this is critical so that the parent expands when you're viewing a page. This must appear below the sidebar code above. Otherwise, if placed inside customscripts.js, the script runs before the sidebar code runs and the class never gets inserted.-->
-    <script>$("li.active").parents('li').toggleClass("active");</script>
+          {% include sidebar.html %}
     <!-- Content Column -->
     <div class="col-md-9">
         {{content}}

diff --git a/css/customstyles.css b/css/customstyles.css
@@ -72,16 +72,16 @@ body {
 .breadcrumb > .active {color: #777 !important;}
 
 /* make room for the nav bar */
-h1[id],
-h2[id],
-h3[id],
-h4[id],
-h5[id],
-h6[id],
-dt[id]{
-    padding-top: 60px; 
-    margin-top: -40px
-}
+/*h1[id],*/
+/*h2[id],*/
+/*h3[id],*/
+/*h4[id],*/
+/*h5[id],*/
+/*h6[id],*/
+/*dt[id]{*/
+    /*padding-top: 60px; */
+    /*margin-top: -40px*/
+/*}*/
 
 body h1 {margin-top:40px;}
 
@@ -395,8 +395,6 @@ text-decoration: none;
 }
 
 ul#mysidebar {
-  margin-top:40px;
-
   border-radius:0px;
 }
 
@@ -1000,4 +998,14 @@ span.label.label-default {
 span.label.label-primary {
     background-color: #f0ad4e;
 }
-    .col-lg-12 .nav li a {background-color: white}
+.col-lg-12 .nav li a {background-color: white}
+
+div.sidebarTitle {
+    margin-top:40px;
+    font-weight:normal;
+    font-size:130%;
+    color: #ED1951;
+    margin-bottom:10px;
+    margin-left: 5px;
+
+}
diff --git a/css/theme-blue.css b/css/theme-blue.css
@@ -86,4 +86,8 @@ body.print h4 {color: #679DCE !important; font-size:14px; font-style: italic !im
 
 .anchorjs-link:hover {
     color: #216f9b;
+}
+
+div.sidebarTitle {
+    color: #015CAE;
 }
diff --git a/css/theme-green.css b/css/theme-green.css
@@ -82,4 +82,8 @@ body.print h4 {color: #679DCE !important; font-size:14px; font-style: italic;}
 
 .anchorjs-link:hover {
     color: #4f7233;
+}
+
+div.sidebarTitle {
+    color: #E50E51;
 }
diff --git a/index.html b/index.html