asciidoctor-rsd 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e526a0019eca20c9c067e73648cc475bc832be4b28236e8eb44d5b4db09c3943
-  data.tar.gz: 34fd9a52e1c5fa4cb258e268fd70b3689e77292393d0058fd4bb788d67316ca8
+  metadata.gz: 813292bdbf2b3942ccc79cfab2231536c9cd31e7c8e7acfaf9dabff9865ba77c
+  data.tar.gz: e5ed7ed7882a84ed528f1caf63f59626ebe77463b724a04685e4298c8fbfc558
 SHA512:
-  metadata.gz: b54fca6af0a03b5975faf337cc8cc865c859229b9d3444774f36d92c198da12cf1904c38967d34e742bc4134402223a3872b48a9ae87e647dda901cda2ddef25
-  data.tar.gz: 7307404bd340d97a68687721bcc79f3e9579e9f29a0d660adca957da48d49c9b570afb8c5aafcac78c1d25f70e431277d29acabcf9db1b7a7b0456783fa519b7
+  metadata.gz: eb87419fa4def14b4c59f3edc986ab066489de2ffb060c380ee9378981c9e4ed985046eea758d5ece33c4593fcf77590e0346d3217dedc65c14af49c8ad728dd
+  data.tar.gz: 500bd710427ff1668042f964af2cdfcce2fa0bd867d800a16c0dc63020455505b022fec23e0beeb1202c68de7ae3df84a3e64e608d92e66215963feb3a3014aa

data/.travis.yml

@@ -1,7 +1,16 @@
+dist: trusty
 sudo: false
 language: ruby
 rvm:
-  - 2.4.3
+  - 2.5
+  - 2.4
+  - ruby-head
 before_install:
   - gem install bundler -v 1.16.1
+  - npm install -g puppeteer
+  - npm install
   - unset _JAVA_OPTIONS
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+

data/Gemfile

@@ -1,8 +1,4 @@
 source "https://rubygems.org"
 git_source(:github) {|repo| "https://github.com/#{repo}" }
 
-gem "isodoc", github: "riboseinc/isodoc"
-gem "asciidoctor-iso", github: "riboseinc/asciidoctor-iso"
-gem "html2doc", github: "riboseinc/html2doc"
-
 gemspec

data/README.adoc

@@ -148,6 +148,7 @@ or `provisional`.
 
 `:language:` :: The language of the document (only `en` for now)  (mandatory)
 
+`:security:` :: Security level classification, e.g., "confidential", "client confidential"
 
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.

data/asciidoctor-rsd.gemspec

@@ -26,18 +26,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
-  spec.add_dependency "asciimath"
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "ruby-xslt"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "uuidtools"
-
-  spec.add_dependency "asciidoctor-iso", ">= 0.8.0"
-  spec.add_dependency "isodoc", ">= 0.7.0"
+  spec.add_dependency "asciidoctor-iso", "~> 0.9.6"
+  spec.add_dependency "isodoc", ">= 0.8.4"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -49,5 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma"
+  spec.add_development_dependency "metanorma", "~> 0.2.6"
 end

data/lib/asciidoctor-rsd.rb

@@ -1,7 +1,8 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/rsd/converter"
-require_relative "isodoc/rsd/rsdhtmlconvert"
-require_relative "isodoc/rsd/rsdwordconvert"
+require_relative "isodoc/rsd/html_convert"
+require_relative "isodoc/rsd/word_convert"
+require_relative "isodoc/rsd/pdf_convert"
 require_relative "asciidoctor/rsd/version"
 
 if defined? Metanorma

data/lib/asciidoctor/rsd.rb

@@ -2,6 +2,8 @@ require "asciidoctor/rsd/version"
 
 module Asciidoctor
   module Rsd
-    # Your code goes here...
+
+    RSD_NAMESPACE = "https://open.ribose.com/standards/rsd"
+
   end
 end

data/lib/asciidoctor/rsd/converter.rb

@@ -1,15 +1,15 @@
 require "asciidoctor"
-require "asciidoctor/rsd/version"
-require "isodoc/rsd/rsdhtmlconvert"
-require "isodoc/rsd/rsdwordconvert"
+require "asciidoctor/rsd"
 require "asciidoctor/iso/converter"
+require "isodoc/rsd/html_convert"
+require "isodoc/rsd/word_convert"
 
 module Asciidoctor
   module Rsd
-    RSD_NAMESPACE = "https://open.ribose.com/standards/rsd"
 
     # A {Converter} implementation that generates RSD output, and a document
     # schema encapsulation of the document for validation
+    #
     class Converter < ISO::Converter
 
       register_for "rsd"
@@ -67,6 +67,16 @@ module Asciidoctor
         end
       end
 
+      def metadata_security(node, xml)
+        security = node.attr("security") || return
+        xml.security security
+      end
+
+      def metadata(node, xml)
+        super
+        metadata_security(node, xml)
+      end
+
       def title_validate(root)
         nil
       end

data/lib/asciidoctor/rsd/isodoc.rng

@@ -888,12 +888,18 @@
       </attribute>
       <optional>
         <attribute name="width">
-          <data type="int"/>
+          <choice>
+            <data type="int"/>
+            <value>auto</value>
+          </choice>
         </attribute>
       </optional>
       <optional>
         <attribute name="height">
-          <data type="int"/>
+          <choice>
+            <data type="int"/>
+            <value>auto</value>
+          </choice>
         </attribute>
       </optional>
     </element>

data/lib/asciidoctor/rsd/rsd.rng

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
-    default namespace = "http://riboseinc.com/rsd"
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
-    namespaces, one for isostandard and one for rsd additions. And we do not want that.
+    namespaces, one for isostandard and one for csand additions. And we do not want that.
   -->
   <include href="isostandard.rng">
     <start>
@@ -25,19 +24,6 @@
         <ref name="FormattedString"/>
       </element>
     </define>
-    <define name="status">
-      <element name="status">
-        <choice>
-          <value>proposal</value>
-          <value>working-draft</value>
-          <value>committee-draft</value>
-          <value>draft-standard</value>
-          <value>final-draft</value>
-          <value>published</value>
-          <value>withdrawn</value>
-        </choice>
-      </element>
-    </define>
     <define name="figure">
       <element name="figure">
         <attribute name="id">
@@ -70,6 +56,20 @@
         </choice>
       </element>
     </define>
+    <define name="status">
+      <element name="status">
+        <choice>
+          <value>proposal</value>
+          <value>working-draft</value>
+          <value>committee-draft</value>
+          <value>draft-standard</value>
+          <value>final-draft</value>
+          <value>published</value>
+          <value>withdrawn</value>
+          <ref name="LocalizedString"/>
+        </choice>
+      </element>
+    </define>
     <!-- TextElement |= keyword -->
     <define name="TextElement">
       <choice>
@@ -92,15 +92,88 @@
         <ref name="keyword"/>
       </choice>
     </define>
+    <define name="BibItemType" combine="choice">
+      <choice>
+        <value>policy-and-procedures</value>
+        <value>best-practices</value>
+        <value>supporting-document</value>
+        <value>report</value>
+        <value>legal</value>
+        <value>directives</value>
+        <value>proposal</value>
+        <value>standard</value>
+      </choice>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <ref name="committee"/>
+      </element>
+    </define>
+    <define name="BibData">
+      <optional>
+        <attribute name="type">
+          <ref name="BibItemType"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="btitle"/>
+      </oneOrMore>
+      <optional>
+        <ref name="formattedref"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bsource"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docidentifier"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="bdate"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="edition"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="biblionote"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="language"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="script"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="abstract"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="status"/>
+      </optional>
+      <ref name="copyright"/>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+      <ref name="editorialgroup"/>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="security"/>
+      </optional>
+    </define>
   </include>
-  <define name="BibItemType" combine="choice">
-    <choice>
-      <value>code</value>
-      <value>presentation</value>
-      <value>proposal</value>
-      <value>standard</value>
-      <value>report</value>
-    </choice>
+  <define name="committee">
+    <element name="committee">
+      <attribute name="type">
+        <choice>
+          <value>technical</value>
+          <value>provisional</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
   </define>
   <define name="pre">
     <element name="pre">
@@ -112,6 +185,11 @@
       <text/>
     </element>
   </define>
+  <define name="security">
+    <element name="security">
+      <text/>
+    </element>
+  </define>
   <define name="rsd-standard">
     <element name="rsd-standard">
       <ref name="bibdata"/>

data/lib/asciidoctor/rsd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Rsd
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/isodoc/rsd/html/html_rsd_titlepage.html

@@ -1,14 +1,14 @@
-<div class="document-stage-band" id="working-draft-band">
+<div class="document-stage-band" id='{{ status | downcase | replace: " ", "-" }}-band'>
     <p class="document-stage">{{ status }}</p>
 </div>
 
-<div class="document-type-band" id="standard-band">
+<div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
     <p class="document-type">Ribose {{ doctype }}</p>
 </div>
   
     
 
-  <div id='toggle'> <span>•</span> </div>
+  <div id='toggle'> <span>&#x2022;</span> </div>
 
   <header>
 
@@ -30,7 +30,7 @@
   </div>
 
   <div class="coverpage-logo">
-    <span>Ribose Group Inc.</span>
+    <span>Ribose Group Inc. {{ docyear }}</span>
   </div>
 
   <div class="coverpage-tc-name">
@@ -46,7 +46,10 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span>
+    <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span></p>
+{% if security %}
+<p><span class="coverpage-maturity">Classification: {{ security }}</span></p>
+{% endif %}
 </div>
 
 {% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
@@ -67,6 +70,7 @@
   </div>
 {% endif %}
 
+<div class="info-section">
 <div class="copyright">
   <p class="year">
     &copy; {{ docyear }} Ribose Group Inc.
@@ -96,6 +100,7 @@
 
 <div class="rule"></div>
 </div>
+  </div>
 
 
 </header>

data/lib/isodoc/rsd/html/htmlstyle.scss

@@ -2,7 +2,7 @@
     0 CSS RESET
 */
 
-/* http://meyerweb.com/eric/tools/css/reset/ 
+/* http://meyerweb.com/eric/tools/css/reset/
    v2.0 | 20110126
    License: none (public domain)
 */
@@ -18,12 +18,12 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary, 
+menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
         margin: 0;
         padding: 0;
 }
-    
+
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -39,8 +39,8 @@ menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
         border: 0;
         font-size: 100%;
-} 
-    
+}
+
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -55,9 +55,9 @@ figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
         vertical-align: baseline;
-}   
-    
-    
+}
+
+
 html, body, div, span, applet, object, iframe,
 p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -71,12 +71,12 @@ article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-  font-family: $bodyfont; 
-} 
+  font-family: $bodyfont;
+}
 
 h1, h2, h3, h4, h5, h6, .h2Annex {
   font-family: $headerfont;
-} 
+}
 
 dl {
   display: grid;
@@ -96,7 +96,7 @@ dd p, dt p {
 }
 
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
 	display: block;
 }
@@ -117,12 +117,12 @@ table {
 	border-spacing: 0;
 }
 
- 
+
 /*
     1. HTML & Body
 */
 
-  body { 
+  body {
     margin: 0;
     margin-left: auto;
     margin-right: auto;
@@ -157,7 +157,7 @@ table {
         overflow: auto;
         padding: 0 0 0 45px;
         margin-right: 30px;
-        background-color:#f7f7f7; 
+        background-color:#f7f7f7;
     }
 
     #toggle {
@@ -173,10 +173,10 @@ table {
     #toggle span {
         text-align: center;
         width: 100%;
-        position: absolute;             
+        position: absolute;
         top: 50%;
         transform: translate(0, -50%);
-        
+
     }
 
     .container {
@@ -203,7 +203,7 @@ table {
         overflow: visible;
     }
 }
-  
+
 
 
 #toc ul {
@@ -250,6 +250,10 @@ table {
      box-shadow: none;
 }
 
+#toc li a {
+  text-transform: uppercase;
+}
+
 /*
     Document types + stages
 */
@@ -317,19 +321,28 @@ p.document-stage {
     height:160px;
 }
 
-#standard-band {
+#standard-band p{
+  height: 270px;
+}
+
+#proposal-band p {
+  height: 150px;
+}
+
+
+#standard-band,  #published-band {
     background-color: #9ABD48;
 }
 
-#standard {
+#standard, #published {
     border-bottom: solid 3px #9ABD48;
 }
 
-#governance {
+#governance, #policy-and-procedures {
     border-bottom: solid 3px #750697;
 }
 
-#governance-band {
+#governance-band, #policy-and-procedures-band {
     background-color: #750697;
 }
 
@@ -349,11 +362,11 @@ p.document-stage {
     text-transform: uppercase;
     }
 
-#working-draft {
+#working-draft, #proposal {
     border-bottom: solid 3px #F7803C;
 }
 
-#working-draft-band {
+#working-draft-band, #proposal-band {
     background-color: #F7803C;
 }
 
@@ -396,17 +409,17 @@ p.document-stage {
 /*
     3.1 Titles
 */
-  
+
   h1,h2,h3,h4,h5,h6 {
     font-family: $headerfont;
     color: #1661AD;
     font-weight: 300;
-    margin-top: 2em;
+    margin-top: 1.6em;
     margin-bottom: 0.3em;
   }
 
   h1 {
-    font-size: 1.6em; 
+    font-size: 1.6em;
     text-transform: uppercase;
     margin-top: 2em;
   }
@@ -414,47 +427,51 @@ p.document-stage {
   h1#content {
       margin-top: 2em;
   }
-  
-  h2 {font-size: 1.5em;
-      font-weight: 400; }
-  
-  h3 {font-size: 1.1em;
-      font-weight: 100;}
+
+  h2 {
+    margin-top: 1.3em;
+    font-size: 1.3em;
+    font-weight: 400;
+  }
+
+  h3 {
+    margin-top: 1.1em;
+    font-size: 1.1em;
+    font-weight: 100;
+  }
 
   .TermNum, .Terms, .AltTerms {
     color: #1661AD;
     font-weight: 100;
   }
 
-  p.TermNum {
-    font-size: 0.9em;
-    line-height: 1em;
-    margin: 0;
-    margin-top: 2em;
+  h2.TermNum {
+    margin-bottom: 0;
   }
 
   p.Terms {
     font-size: 1.1em;
-    line-height: 1.7em;
+    line-height: 1.5em;
     margin: 0;
   }
-  
-  /*
+
   p.AltTerms {
+    /*
     font-style: italic;
+     */
+    font-size: 1.1em;
     margin: 0;
   }
-  */
 
 /*
     3.2 Links
 */
-  
+
     a, a:visited{
         text-decoration: none;
         color: #485094;
     }
-      
+
     a:hover {
         color: white;
         background: #1661AD;
@@ -479,11 +496,11 @@ p.document-stage {
       }
 
 
-      
+
 /*
     3.3 Lists
 */
-        
+
     ul, ol {margin-left: 1.2em;}
 
   ul  li {
@@ -503,9 +520,9 @@ p.document-stage {
 ul li:first-child {
   margin-top: 1em;
 }
-      
+
     #toc-list ul {margin-bottom: 0.25em;}
-      
+
     #toc-list li {list-style-type: none;}
 
     #toc li:before {
@@ -562,7 +579,11 @@ p.Biblio, p.NormRef {
     background-color: #fff495;
     color: #47430c;
     padding: 1.2em;
-    margin: 2em 0 1em 0;
+    margin: 1em 0 1em 0;
+
+    p {
+        margin: 0;
+    }
 }
 
 /*
@@ -571,7 +592,7 @@ p.Biblio, p.NormRef {
 
 .example {
     background-color: #e1eef1;
-    padding: 0 1.2em 0 1.2em;
+    padding: 1.2em;
     margin: 2em 0 1em 0;
 }
 
@@ -660,19 +681,20 @@ a.footnote-number {
 */
 
 .contact-info {
-    background-color: #1661AD;
-    color: white;
     padding: 2em;
     margin-top: 5em;
-    width: auto;
-    margin-left: auto;
-    margin-right: auto;
-    text-align: left;
+    width: 250px;
+
+  text-align: left;
+  border: #1661AD solid 2px;
+  color: #1661AD!important;
+  border-radius: 25px;
+
 }
 
 .contact-info a,
 .contact-info a:hover {
-  color: white;
+  color: #1661AD;
 }
 
 .contact-info p, .contact-info a {
@@ -722,11 +744,16 @@ h2 p {
     4.1 Top Logo
 */
 
+.icon-svg {
+  width: 100%;
+  color: #5ecf86;
+}
+
 .wrapper-top {
-    background-color:#1661AD;
-    /* background-image: url("img/dots@2x.png"); */
-    color: #ffffff;
-    padding: 2em 0;
+  background: linear-gradient(200deg, #0f365e, #1661AD);
+  color: #ffffff;
+  padding: 2em 0;
+  width: 100%;
 }
 
 .wrapper-top-bottom {
@@ -745,23 +772,26 @@ h2 p {
   .coverpage-title {
       padding-bottom: 0.5em;
       font-family: $headerfont;
-      font-size: 1.5em;
-      line-height: 1.2em;
+      font-size: 1.2em;
+      line-height: 1.5em;
   font-weight: 100;
   padding-left: 1em;
   padding-right: 1em;
   text-transform: uppercase;
   }
-  
+
   .WordSection11 {
     padding: 0 2em 0 3em;
   }
 
+ .info-section {
+    padding: 0 2em 0 5em; }
+
   .prefatory-section {
     padding: 0 3em 0 6em;
   }
-  
-  
+
+
   .zzSTDTitle1, .MsoCommentText {
     display: none;
   }
@@ -777,13 +807,13 @@ h2 p {
       text-transform: none;
       font-weight: 300;
   }
-  
+
   .coverpage-tc-name {
     font-size: 1.2em;
     line-height: 1.2em;
     margin: 0.25em 0;
   }
-  
+
 /*
     4.2 Document Identity
 */
@@ -792,14 +822,14 @@ h2 p {
     font-size: 2em;
     line-height: 2em;
   }
-  
+
   .coverpage-title .title-second {
     display: none;
   }
 
   .coverpage-stage-block {
     font-family: $bodyfont;
-    font-weight: 700;
+    font-weight: 600;
     font-size: 1.25em;
     margin: 2em 0em 2em 0em;
     text-transform: uppercase;
@@ -810,14 +840,14 @@ h2 p {
 */
 
   .coverpage-warning {
-      background: #f36f36;
-  color: white!important;
+    border: #f36f36 solid 2px;
+  color: #f36f36!important;
   margin: 1em 2em;
   color: #485094;
   padding: 2em 1em 1em 1em;
   border-radius: 25px;
   }
-  
+
   .coverpage-warning .title {
     font-family: $headerfont;
     font-weight: 300;
@@ -825,20 +855,20 @@ h2 p {
     font-size: 1.2em;
   }
 
-  
+
 /*
     4.4 Copyright
-*/  
+*/
 
   .copyright {
     padding: 1em;
-    font-size: 0.8em;
+    font-size: 0.9em;
     text-align: left;
   }
-  
-  
+
+
 /*  .copyright .name, .copyright .address {color: #485094;} */
-  
+
 
 
 /*
@@ -869,7 +899,7 @@ To top button
     border-radius: 4px;
     text-transform: uppercase;
   }
-  
+
   #myBtn:hover {
     opacity: 1;
   }
@@ -880,3 +910,119 @@ To top button
   box-shadow: none;
 }
 
+@page {
+  margin: 2cm 1cm;
+}
+
+@media print {
+
+
+  .document-info,  nav, .copyright {
+      page-break-before: always;
+  }
+
+  nav {
+    page-break-after: always;
+  }
+
+  h1, h2, h3, h4 {
+    page-break-after: avoid;
+    margin-top: 1.2em;
+  }
+
+  .note, .figure, .Sourcecode, table {
+    page-break-inside: avoid;
+  }
+
+  .info-section {
+    display: none;
+  }
+
+  .coverpage {
+      height: 23cm;
+  }
+
+  .wrapper-top {
+    top: 0;
+    padding-top: 4cm;
+    padding-bottom: 4cm;
+  }
+
+  .wrapper-top-bottom {
+    margin-top: -5px;
+  }
+
+
+  #toggle, .document-stage-band,
+  .document-type-band, button#myBtn {
+      display: none;
+  }
+
+  button#myBtn {
+    background-color: white;
+  }
+
+  .container {
+      padding-left: 0;
+  }
+
+  nav {
+      position: relative;
+      width: auto;
+      font-size: 0.9em;
+      overflow: auto;
+      padding: 0;
+      margin-right: 0;
+      background-color: white;
+  }
+
+    #toc .toc-active a {
+    color: #4D7EA5;
+  }
+
+  #toc .toc-active, #toc li:hover {
+    background: white;
+    box-shadow: none !important; }
+
+    #toc li:hover a {
+    color: black; }
+
+
+    h1.content {
+      margin-top: 2em; 
+      line-height: 2.5em;
+    }
+
+    h1 {
+      font-size: 1.5em;
+      line-height: 1.5;
+    }
+
+    h2 {
+      font-size: 1.2em
+    }
+
+    h3 {
+      font-size: 1em;
+    }
+
+    .Note {
+        background-color: #fff495;
+        color: #47430c;
+        padding: 5px;
+        margin: 2em 0 1em 0; }
+
+    .Note p {
+      padding: 0 5px 0 5px;
+    }
+
+    nav {
+      line-height: 1;
+    }
+
+    .wrapper-top-bottom {
+      display: none;
+    }
+
+}
+