bookbindery 9.7.1 → 9.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d62aa5475411b0c80c753dc8f4cf0e21f12fd9
-  data.tar.gz: c65a07607977b4e01c9c983eba047b890f851c07
+  metadata.gz: ba0eb60bf1b74bd384b03d691636d672d718c632
+  data.tar.gz: 733bc8f77a67d9e9cd7295f6d814b5ec248cc49a
 SHA512:
-  metadata.gz: 34aa3f3fcb0825763f670d727f5df1da9a015ab8c4e4a3a492c2286af14bc597e48597aec70b040fa5467f544b64664cf8712aed9dad3a74ee92c479c41c97c0
-  data.tar.gz: 32e916ec01b7cd9300f40b0627a24bd89fcb8b3528579cde47dbd94967da41ad48f0b7c124826656d701bcf7d665316d9f36cd101e3b984b6c0ee7d732a42422
+  metadata.gz: bf39f3a12f00b60420890535a5a9569fcf6f7a0c25c30b7c710692b9779fd8eddb1bc11afa78202ff73cb8127951442685441d436e997220d9103334eafbef4b
+  data.tar.gz: 2fdec800de37d2d01c805df4e7451dd09f75923e9cef60c0509b13a67800dc9bf5598af92a12b7b14605e1f92a09cd9465dfe0dc8ad2bc0c81a1765c2af3233f

data/bookbinder.gemspec

@@ -2,13 +2,13 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '9.7.1'
+  s.version     = '9.8.0'
   s.summary     = 'Markdown to Rackup application documentation generator'
   s.description = 'A command line utility to be run in Book repositories to stitch together their constituent Markdown repos into a static-HTML-serving application'
   s.authors     = ['Mike Grafton', 'Lucas Marks', 'Gavin Morgan', 'Nikhil Gajwani', 'Dan Wendorf', 'Brenda Chan', 'Matthew Boedicker', 'Andrew Bruce', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock', 'Michael Trestman', 'Alpha Chen', 'Sarah McAlear', 'Gregg Van Hove']
   s.email       = Base64.decode64('Z21vcmdhbkBnb3Bpdm90YWwuY29t') # Gavin's
 
-  s.files       = Dir['lib/**/*'] + Dir['template_app/**/*'] + Dir['master_middleman/**/*'] + Dir['install_bin/**/*'] + Dir['bookbinder.gemspec']
+  s.files       = Dir['lib/**/*'] + Dir['template_app/**/*'] + Dir['master_middleman/**/*'] + Dir['install_bin/bookbinder'] + Dir['bookbinder.gemspec']
   s.homepage    = 'https://github.com/pivotal-cf/bookbinder'
   s.license     = 'MIT'
   s.bindir      = 'install_bin'

data/lib/bookbinder/config/section_config.rb

@@ -64,7 +64,7 @@ module Bookbinder
       alias_method :subnav_name, :product_id
 
       def product_info
-        return '' if config['product_info'].nil?
+        return {} if config['product_info'].nil?
         config['product_info']
       end
 

data/lib/bookbinder/preprocessing/dita_pdf_preprocessor.rb

@@ -36,7 +36,7 @@ module Bookbinder
       end
 
       def most_recent_pdf(dir_path)
-        pdfs_by_modified_date = Dir.glob(dir_path + '*.pdf').sort_by{ |f| File.mtime(f) }
+        pdfs_by_modified_date = Dir.glob(dir_path + '*/*.pdf').sort_by{ |f| File.mtime(f) }
         pdfs_by_modified_date.last
       end
 

data/master_middleman/bookbinder_helpers.rb

@@ -104,14 +104,7 @@ module Bookbinder
       end
 
       def product_info
-        temp_template_key = template_key
-        if config[:product_info][temp_template_key] == ''
-          default = {use_local_header: false, changelog_href: '', local_header_img: '', local_header_title: '',
-            local_header_links: [''], local_header_version_list: ['']}
-          OpenStruct.new default
-        else
-          OpenStruct.new config[:product_info][temp_template_key]
-        end
+        config[:product_info].fetch(template_key, {})
       end
 
       def quick_links

data/master_middleman/source/javascripts/bookbinder.js

@@ -11,7 +11,7 @@
   }
 
   function openSubmenu(e) {
-    if (e.srcElement.tagName !== 'A') {
+    if (e.target.tagName !== 'A') {
       var el = e.currentTarget;
       toggleClass(el, 'expanded');
       e.stopPropagation();

data/master_middleman/source/layouts/_title.erb

@@ -0,0 +1,5 @@
+<% if current_page.data.title %>
+  <h1 class="title-container">
+    <%= current_page.data.title %>
+  </h1>
+<% end %>

data/master_middleman/source/layouts/layout.erb

@@ -14,8 +14,8 @@
     <%= vars.book_title_short %>
   </title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <%= stylesheet_link_tag 'base', :media => 'screen, print' %>
-  <%= stylesheet_link_tag 'book-styles', :media => 'screen, print' %>
+  <%= stylesheet_link_tag 'all', :media => 'screen, print' %>
+  <%= stylesheet_link_tag 'print', :media => 'print' %>
   <link href='/images/favicon.ico' rel='shortcut icon'>
 
   <%= javascript_include_tag "all" %>
@@ -32,7 +32,6 @@
 
     <%= partial 'layouts/header' %>
 
-
     <div class="container">
 
       <!--googleoff: index-->
@@ -42,11 +41,7 @@
       <main class="content content-layout" id="js-content" role="main">
         <a id="top"></a>
         <%= partial 'layouts/local-header' %>
-        <% if current_page.data.title %>
-          <h1 class="title-container">
-            <%= current_page.data.title %>
-          </h1>
-        <% end %>
+        <%= partial 'layouts/title' %>
         <% if quick_links %>
           <div id="js-quick-links">
             <%= quick_links %>

data/master_middleman/source/stylesheets/all.css.scss

@@ -0,0 +1,3 @@
+@import "base";
+@import "layout-styles";
+@import "book-styles";

data/master_middleman/source/stylesheets/base.scss

@@ -26,7 +26,15 @@
 .content-layout {
   padding: 2em 1.5em 2em 1.5em;
   @media (min-width: $bp-wide) {
-    padding-top: 4.2em;
+    padding-top: 0;
+  }
+
+  @media (min-width: $bp-wide) {
+    #top {
+      padding-bottom: 4em;
+      border: none;
+      display: block;
+    }
   }
 }
 .has-subnav .container {
@@ -41,7 +49,7 @@
 .has-subnav .content-layout {
   @media (min-width: $bp-wide) {
     max-width: 45em;
-    padding: 6.2em 2em 2em;
+    padding: 0 2em 2em;
   }
 }
 .nav-container {

data/master_middleman/source/stylesheets/partials/_header.scss

@@ -291,12 +291,6 @@ category: basics
 .searchbar a:hover {
   border-bottom: 0;
 }
-.searchbar:hover,
-.active.searchbar {
-  @media (min-width: $bp-wide) {
-    //@include contrasted($color-accent-bright);
-  }
-}
 .search-input-inner {
   position: relative;
 }
@@ -321,7 +315,6 @@ category: basics
   //@include border-bottom-radius(3px);
   display: none;
   @media (min-width: $bp-wide) {
-    //@include contrasted($color-accent-bright);
     padding: 1em;
     position: absolute;
     right: 0;
@@ -413,9 +406,6 @@ category: basics
   color: $color-text;
   display: block;
   padding-left: 0.9em;
-  &:hover {
-    //@include contrasted($color-accent-bright);
-  }
 }
 .header-dropdown-content ol,
 .header-dropdown-content ul {

data/master_middleman/source/stylesheets/partials/_vars.scss

@@ -22,7 +22,7 @@ $gray6: #fdfdfd;
 
 $color-accent: $gray6;
 $color-accent-bright: $gray6;
-$color-access-bright-contrast: #000000;
+$color-accent-bright-contrast: #000000;
 
 // text colors
 $color-header: $gray2;

data/master_middleman/source/stylesheets/print.css.scss

@@ -0,0 +1,58 @@
+/*
+ * FILE: print.scss
+======================================================================== */
+@import "partials/_vars.scss";
+
+// Book-specific overrides
+@import "partials/_book-vars.scss";
+
+pre code, p code, .terminal {
+  font-family: "DejaVu Sans Mono";
+  page-break-inside: avoid;
+}
+
+ol li {
+  margin-left: 15px;
+}
+
+.wrap {
+  width: 2400px;
+
+  .container {
+    margin-left: 0;
+  }
+}
+
+li p code {
+  width: auto;
+  display: inline;
+}
+
+note {
+  overflow: visible;
+  page-break-inside: avoid !important;
+  page-break-before: avoid !important;
+}
+
+pre, pre code {
+  overflow: visible;
+}
+
+.pivotalcf .logo {
+  background: none;
+  padding-left: 0;
+}
+
+.quick-links,
+.nav-container,
+.header,
+.site-footer-links,
+#feedback {
+  display: none;
+}
+
+h1 {
+  margin-top: 0;
+  font-size: $font-size-l;
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 9.7.1
+  version: 9.8.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -444,8 +444,12 @@ files:
 - master_middleman/source/layouts/_header.erb
 - master_middleman/source/layouts/_local-header.erb
 - master_middleman/source/layouts/_page-footer.erb
+- master_middleman/source/layouts/_title.erb
 - master_middleman/source/layouts/layout.erb
+- master_middleman/source/stylesheets/all.css.scss
 - master_middleman/source/stylesheets/base.scss
+- master_middleman/source/stylesheets/book-styles.css.scss
+- master_middleman/source/stylesheets/layout-styles.scss
 - master_middleman/source/stylesheets/partials/_book-base-values.scss
 - master_middleman/source/stylesheets/partials/_book-vars.scss
 - master_middleman/source/stylesheets/partials/_default.scss
@@ -457,6 +461,7 @@ files:
 - master_middleman/source/stylesheets/partials/_sidenav.scss
 - master_middleman/source/stylesheets/partials/_syntax-highlight.scss
 - master_middleman/source/stylesheets/partials/_vars.scss
+- master_middleman/source/stylesheets/print.css.scss
 - master_middleman/source/subnavs/_default.erb
 - master_middleman/source/subnavs/_nav-links.erb
 - master_middleman/source/subnavs/_subnav_template.erb