From 361d9f960e31baf80e1e83a7ddfad1510d4e8853 Mon Sep 17 00:00:00 2001 From: Tom Johnson Date: Mon, 5 Jun 2017 06:10:01 -0700 Subject: [PATCH] updates for 6.1 - removed sidebarconfigs, added topnav flexibility, removed scroll layout, updated docs, removed lavish-bootstrap, replaced with normal bootstrap, added styles to compensate --- .gitignore | 1 - Gemfile.lock | 2 - _config.yml | 2 + _data/sidebars/mydoc_sidebar.yml | 4 - _includes/custom/sidebarconfigs.html | 33 - _includes/disqus.html | 35 +- _includes/head.html | 17 +- _includes/sidebar.html | 98 +- _includes/topnav.html | 8 +- _layouts/default.html | 3 + css/customstyles.css | 10 - css/lavish-bootstrap.css | 5898 -------------------------- css/theme-blue.css | 14 +- css/theme-green.css | 10 +- index.md | 85 +- js/customscripts.js | 1 - js/jquery.localScroll.min.js | 7 - js/jquery.scrollTo.min.js | 7 - js/mydoc_scroll.html | 240 -- pages/mydoc/mydoc_generating_pdfs.md | 20 +- pages/mydoc/mydoc_scroll.html | 242 -- pages/mydoc/mydoc_special_layouts.md | 6 +- pages/mydoc/mydoc_tables.md | 2 +- pages/mydoc/mydoc_troubleshooting.md | 6 +- pdfconfigs/config_mydoc_pdf.yml | 4 +- pdfconfigs/config_product1_pdf.yml | 4 +- pdfconfigs/config_product2_pdf.yml | 4 +- pdfconfigs/prince-list.txt | 4 +- pdfconfigs/tocpage.html | 2 +- 29 files changed, 197 insertions(+), 6572 deletions(-) delete mode 100644 _includes/custom/sidebarconfigs.html delete mode 100644 css/lavish-bootstrap.css delete mode 100644 js/jquery.localScroll.min.js delete mode 100644 js/jquery.scrollTo.min.js delete mode 100644 js/mydoc_scroll.html delete mode 100644 pages/mydoc/mydoc_scroll.html diff --git a/.gitignore b/.gitignore index b33f767..43aa0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ _site/ .sass-cache/ .jekyll-metadata _pdf -.idea/ .DS_Store diff --git a/Gemfile.lock b/Gemfile.lock index 2090f4d..352091d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,14 +190,12 @@ GEM tzinfo (1.2.2) thread_safe (~> 0.1) unicode-display_width (1.1.3) - wdm (0.1.1) PLATFORMS ruby DEPENDENCIES github-pages - wdm (>= 0.1.0) BUNDLED WITH 1.14.3 diff --git a/_config.yml b/_config.yml index dba7540..d3e399c 100644 --- a/_config.yml +++ b/_config.yml @@ -73,6 +73,7 @@ defaults: comments: true search: true sidebar: home_sidebar + topnav: topnav - scope: path: "" @@ -92,6 +93,7 @@ defaults: comments: true search: true sidebar: home_sidebar + topnav: topnav # these are defaults used for the frontmatter for these file types diff --git a/_data/sidebars/mydoc_sidebar.yml b/_data/sidebars/mydoc_sidebar.yml index f278e60..d28e306 100644 --- a/_data/sidebars/mydoc_sidebar.yml +++ b/_data/sidebars/mydoc_sidebar.yml @@ -244,10 +244,6 @@ entries: url: /mydoc_faq_layout.html output: web, pdf - - title: Scroll layout - url: /mydoc_scroll.html - output: web, pdf - - title: Shuffle layout url: /mydoc_shuffle.html output: web, pdf diff --git a/_includes/custom/sidebarconfigs.html b/_includes/custom/sidebarconfigs.html deleted file mode 100644 index 36167ad..0000000 --- a/_includes/custom/sidebarconfigs.html +++ /dev/null @@ -1,33 +0,0 @@ -{% if page.sidebar == "home_sidebar" %} -{% assign sidebar = site.data.sidebars.home_sidebar.entries %} - -{% elsif page.sidebar == "product1_sidebar" %} -{% assign sidebar = site.data.sidebars.product1_sidebar.entries %} - -{% elsif page.sidebar == "product2_sidebar" %} -{% assign sidebar = site.data.sidebars.product2_sidebar.entries %} - -{% elsif page.sidebar == "mydoc_sidebar" %} -{% assign sidebar = site.data.sidebars.mydoc_sidebar.entries %} - -{% else %} -{% assign sidebar = site.data.sidebars.home_sidebar.entries %} -{% endif %} - - - -{% comment %} -sidebar configuration for print files -{% endcomment %} - -{% if site.product == "mydoc" %} -{% assign sidebar_pdf = site.data.sidebars.mydoc_sidebar.entries %} -{% endif %} - -{% if site.product == "product1" %} -{% assign sidebar_pdf = site.data.sidebars.product1_sidebar.entries %} -{% endif %} - -{% if site.product == "product2" %} -{% assign sidebar_pdf = site.data.sidebars.product2_sidebar.entries %} -{% endif %} diff --git a/_includes/disqus.html b/_includes/disqus.html index 4fad7a2..2481e4a 100644 --- a/_includes/disqus.html +++ b/_includes/disqus.html @@ -1,16 +1,25 @@ {% if site.disqus_shortname %} -
- - -{% endif %} \ No newline at end of file + var disqus_config = function () { + this.page.url = "{{site.url}}/{{page.permalink}}"; // Replace PAGE_URL with your page's canonical URL variable + this.page.identifier = "{{page.permalink}}"; // Replace PAGE_IDENTIFIER with your page's unique identifier variable + }; + + (function() { // REQUIRED CONFIGURATION VARIABLE: EDIT THE SHORTNAME BELOW + var d = document, s = d.createElement('script'); + + s.src = 'https://{{site.disqus_shortname}}.disqus.com/embed.js'; // IMPORTANT: Replace EXAMPLE with your forum shortname! + + s.setAttribute('data-timestamp', +new Date()); + (d.head || d.body).appendChild(s); + })(); + + +{% endif %} diff --git a/_includes/head.html b/_includes/head.html index 6c2e9ee..33be6b8 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -6,20 +6,25 @@ {{ page.title }} | {{ site.site_title }} - - - - - + + + + + + + + - + + + diff --git a/_includes/sidebar.html b/_includes/sidebar.html index e10834e..93260f7 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,54 +1,54 @@ -{% include custom/sidebarconfigs.html %} +{% assign sidebar = site.data.sidebars[page.sidebar].entries %} diff --git a/_includes/topnav.html b/_includes/topnav.html index 39a172a..0182f0d 100644 --- a/_includes/topnav.html +++ b/_includes/topnav.html @@ -15,7 +15,11 @@
  • Nav
  • - {% for entry in site.data.topnav.topnav %} + +{% assign topnav = site.data[page.topnav] %} +{% assign topnav_dropdowns = site.data[page.topnav].topnav_dropdowns %} + + {% for entry in topnav %} {% for item in entry.items %} {% if item.external_url %}
  • {{item.title}}
  • @@ -28,7 +32,7 @@ {% endfor %} - {% for entry in site.data.topnav.topnav_dropdowns %} + {% for entry in topnav_dropdowns %} {% for folder in entry.folders %}