guides_style_18f 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce17bb3ce830151e80b02ba3d972d29d2d52eaf
-  data.tar.gz: 56b84fb06608302738694a29f9a74cb7dade21c2
+  metadata.gz: 27092e8c2efab9855a6ddaec5cd50fc576ff1fe0
+  data.tar.gz: f009351555d27696c70106f80f4f0fe8da47eaf5
 SHA512:
-  metadata.gz: eb9110487567bca200583b368fc657b7677d70074efa224d08fa475ec9ebf6416a851f185906b1e43e5ab66969dd5f309b8a24e7ac56789c3379b0fb381dbed4
-  data.tar.gz: eb7dcebc6877231d7e8d2b1244b00c709f47fc27e53d0f1b77a895241830018a91a36ed8f78744c7dd2fe5dfc31d027d5e9424412cc9bae7212ab90060a3bbae
+  metadata.gz: a0b688165970e6445f3e7a7aa1f047974fa9c4873dae129eacfad5329b1373bb9c4ca9b6b459cc8b84816d6c8436dd521649684ac46329bf18913fa56d5f31d5
+  data.tar.gz: 9e5a2f706e720cd28ca7ccd8608326084933e3dcd0e0699cc71af300e89aadfd6f5f14f468efb714fe88d8ac979376e6deb4a1f5ae6ff3e4db1aec10f069188f

data/README.md

@@ -82,6 +82,37 @@ navtitle: Polonius's advice
 ---
 ```
 
+### Selectively expanding navigation bar items
+
+If you wish to expand or contract specific navigation bar items, add the
+`expand_nav:` property to those items in the `navigation:` list in
+`_config.yml`. For example, the `Update the config file` entry will expand
+since the default `expand_nav` property is `true`, but `Add a new page` will
+remain collapsed:
+
+```yaml
+expand_nav: true
+
+navigation:
+- text: Introduction
+  internal: true
+- text: Add a new page
+  url: add-a-new-page/
+  internal: true
+  expand_nav: false
+  children:
+  - text: Make a child page
+    url: make-a-child-page/
+    internal: true
+- text: Update the config file
+  url: update-the-config-file/
+  internal: true
+  children:
+  - text: Understanding the `baseurl:` property
+    url: understanding-baseurl/
+    internal: true
+```
+
 ### Development
 
 First, choose a Jekyll site you'd like to use to view the impact of your

data/lib/guides_style_18f/includes/sidebar-children.html

@@ -1,5 +1,5 @@
 {% if parent.children %}
-{% capture expand_nav %}{% guides_style_18f_should_expand_nav parent_url %}{% endcapture %}
+{% capture expand_nav %}{% guides_style_18f_should_expand_nav parent, parent_url %}{% endcapture %}
 <button class="expand-subnav"
         aria-expanded="{{ expand_nav }}"
         aria-controls="nav-collapsible-{{ forloop.index }}">+</button>

data/lib/guides_style_18f/sass/_guides_style_18f_main.scss

@@ -328,8 +328,7 @@ header {
 }
 
 .main-content img {
-    width: 100%;
-
+  max-width: 100%;
 }
 
 /*

data/lib/guides_style_18f/tags.rb

@@ -6,18 +6,28 @@ module GuidesStyle18F
     NAME = 'guides_style_18f_should_expand_nav'
     ::Liquid::Template.register_tag(NAME, self)
 
-    attr_reader :reference
+    attr_reader :parent_reference, :url_reference
 
     def initialize(_tag_name, markup, _)
-      @reference = markup.strip
+      references = markup.split(',').map(&:strip)
+      @parent_reference = references.shift
+      @url_reference = references.shift
     end
 
     def render(context)
-      return true if context['site']['expand_nav']
-      scope = context.scopes.detect { |s| s.member?(reference) }
-      parent_url = scope[reference]
+      scope = context.scopes.detect { |s| s.member?(url_reference) }
+      parent_url = scope[url_reference]
       page_url = context['page']['url']
-      page_url != parent_url && page_url.start_with?(parent_url)
+      (page_url != parent_url && page_url.start_with?(parent_url)) || (
+        expand_nav_default(scope, context))
+    end
+
+    private
+
+    def expand_nav_default(scope, context)
+      default = scope[parent_reference]['expand_nav']
+      default = context['site']['expand_nav'] if default.nil?
+      default.nil? ? false : default
     end
   end
 

data/lib/guides_style_18f/version.rb

@@ -1,5 +1,5 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 module GuidesStyle18F
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guides_style_18f
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll