jumbo-jekyll-theme 4.8 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23167a57bce65c4933fd14e2d4a4b137ac94b0daad1adb80a3df4c8a09629dbc
-  data.tar.gz: ce55accff320705b076fc39bac3c4de5f91bd5bfd26ee4e65359c605af3fa3c8
+  metadata.gz: dbeee7269a11344a285aaf2620bafbfc5b5f8de5dd783b8a4e5a669548ca6eaf
+  data.tar.gz: b94b1d0357403aa4ce29d3fbb530dd867549d501f38d4b636c6ebee082868e53
 SHA512:
-  metadata.gz: 47d1102e4fa33c804c54599bf97cb5bba64502c0358b02182e40a5392c039be1d3f02fc48fa86c61dbe8741b01eed30c24ffbf0ea8951903c40c4dcbe1d58933
-  data.tar.gz: 9681f2fb2b2b388f4655cca1de7b33fb6f38471ea6dc685e34a9384712b1b59239921dffa6301b993ddda339d4e4c6d85897c7fcac307e7932bcb620286cf2a0
+  metadata.gz: 010df2d39a504d94cc41328d8c947d3d6538f660bff27265c2d8524b544b78520983139b6a090801bdbafd638a1be4b50413ed9adc2e6e0136d9a9f4a4be8f50
+  data.tar.gz: d5763e126deacac03c3facfa0013f7da5a54ad3bcddbbd1caf6e7931986a369aa31b5d90aa118747a4861b884d297c68f0be739f3437f97b0ebb8ef5c64cccc2

data/_config.yml

@@ -48,26 +48,15 @@ jekyll_tidy:
     compress_html: true
     # JS Path added to exclude to stop errors.
     exclude: ["assets/**/*.js"] 
-# Permalink style to be used for paginating pages in pagination.html
-paginate_path: /blog/:num/
-paginate_path_news: /news/:num/
-paginate_path_authors: /authors/:num/
 # Jekyll Pagination V2 Configuration
 pagination:
-    # Default pagination path for Jekyll Posts
-    # For other permalinks set in the front matter of the post index page
-    permalink: /:num/
-    # Enabled or not?
+    permalink: '/:num/'
     enabled: true
-    # Home many posts to display by default
-    per_page: 5
-    # Number of pages to show either side of the current page i.e - 1, 2, {3}, 4, 5
+    per_page: 9
     trail:
         before: 2
         after: 2
-    # Reverse the order of paginated pages
     sort_reverse: true
-    # Field to sort posts by when paginating
     sort_field: 'date'
 # Jekyll pagination v2 autopages configuration.
 autopages:
@@ -117,5 +106,6 @@ readme_index:
     enabled:          true
     remove_originals: false
 picture:
+  nomarkdown: false
   source: "assets/images"
   output: "assets/images/processed"

data/_data/picture.yml

@@ -22,7 +22,7 @@ markup_presets:
     markup: auto
 
     # Must be an array, in order of decreasing preference. Defaults to just 'original'.
-    formats: [webp, original]
+    formats: [original]
 
     # Must be an array: which image sizes (width in pixels) to generate (unless directed otherwise
     # below). If not specified, will use sensible default values.
@@ -71,24 +71,40 @@ markup_presets:
   # lazyload:
   # https://github.com/verlok/lazyload
   lazy:
-    markup: data_auto
-    formats: [webp, original]
+    markup: data_picture
+    formats: [original]
     widths: [400, 750, 1000]
     noscript: true # Default: false
     attributes: 
       img: class="lazyload"
 
   thumb:
-    markup: data_auto
-    formats: [webp, original]
+    markup: data_picture
+    formats: [original]
     widths: [400, 750, 1000]
     noscript: true # Default: false
     attributes: 
       img: class="lazyload"
 
+  blogThumb:
+    markup: data_picture
+    formats: [original]
+    widths: [50, 100, 200]
+    noscript: true # Default: false
+    attributes: 
+      img: class="lazyload img-responsive"
+
   placeholder:
-    markup: data_auto
-    formats: [webp, original]
+    markup: data_picture
+    formats: [original]
+    noscript: true # Default: false
+    attributes: 
+      img: class="lazyload"
+
+  backgroundImage:
+    markup: data_picture
+    widths: [400, 800, 1100, 1400]
+    formats: [original]
     noscript: true # Default: false
     attributes: 
       img: class="lazyload"
@@ -96,5 +112,5 @@ markup_presets:
   # This is an example of how you'd get generated image and a URL, and nothing else.
   direct:
     markup: direct_url
-    fallback_format: webp # Default original
+    fallback_format:  Default original
     fallback_width: 600 # Default 800

data/_includes/core/call-to-action-banner.html

@@ -0,0 +1,8 @@
+<div class="row" id="call_to_action_banner">
+    {% if include.object.image %}
+        {% picture backgroundImage {{include.object.image.path}} alt=include.object.image.alt %}
+    {% endif %}
+    <div class="container">
+        {% if include.object.title %}<h1>{{include.object.title}}</h1>{% endif %}
+    </div>
+</div>

data/_includes/flow.html

@@ -0,0 +1,19 @@
+<div class="container-fluid content" id="main_container">
+{% for section in include.flow %}
+    {% if section.type == "main-content" %}
+        <div class="row" id="main_content">
+            <div class="container">
+                {{content}}
+            </div>
+        </div>
+    {% elsif section.type == "slider" %}
+        {% include slider.html object=section %}
+    {% elsif section.type == "latest-posts" %}
+        {% include latest_posts.html limit=section.number_of_posts %}
+    {% elsif section.type == "feature-block" %}
+        {% include feature-block.html object=section %}
+    {% elsif section.type == "cards" %}
+        {% include cards.html object=section %}
+    {% endif %}
+{% endfor %}
+</div>

data/_includes/pagination.html

@@ -1,4 +1,4 @@
-{% assign paginate_path = include.path %}
+{% assign paginate_path = include.pagination_permalink %}
 {% assign paginate_base_path = paginate_path | split: ":" %}
 {% if paginator.total_pages > 1 %}
 <div class="row pagination-row">
@@ -9,25 +9,15 @@
         {% else %}
         <li class="disabled"><a href="#">&laquo; Prev</a></li>
         {% endif %}
-            {% if paginator.page_trail %}
-                {% for trail in paginator.page_trail %}
-                <li {% if page.url == trail.path %}class="active"{% endif %}>
-                    <a href="{% if trail.num == 1 %}{{paginate_base_path[0]}}{% else %}
-                    {{ paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', trail.num  }}{% endif %}"
-                    title="{{trail.title}}">{{ trail.num }}</a>
-                </li>
-                {% endfor %}
-            {% else %}
-                {% for page in (1..paginator.total_pages) %}
-                {% if page == paginator.page %}
-                    <li class="active"><a href="">{{ page }}</a></li>
-                {% elsif page == 1 %}
-                    <li><a href="{{paginate_base_path[0]}}">{{ page }}</a></li>
-                {% else %}
-                    <li><a href="{{ paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a></li>
-                {% endif %}
-                {% endfor %}
-            {% endif %}
+        {% if paginator.page_trail %}
+            {% for trail in paginator.page_trail %}
+            <li data-pagination-permalink="{{paginate_path}}" {% if page.url == trail.path %}class="active"{% endif %}>
+                <a href="{% if trail.num == 1 %}{{paginate_base_path[0]}}{% else %}
+                {{ paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', trail.num  }}{% endif %}"
+                title="{{trail.title}}">{{ trail.num }}</a>
+            </li>
+            {% endfor %}
+        {% endif %}
         {% if paginator.next_page %}
             <li><a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">Next </a></li>
         {% else %}

data/_includes/post-sidebar.html

@@ -16,24 +16,17 @@
                 <div class="row featured_blog_post">
                     <div class="col-md-3 col-sm-3 col-xs-3 no-padding">
                             {% if post.image.thumb %}
-                                    {% capture image_path %}{{site.blog_images_dir}}thumbs/{{post.image.thumb}}{% endcapture %}
-                                    {% capture full_path %}/{{site.blog_images_dir}}thumbs/{{post.image.thumb}}{% endcapture %}
-                             {% elsif post.image.name %}
-                                    {% capture image_path %}{{site.blog_images_dir}}{{post.image.name}}{% endcapture %}
-                                    {% capture full_path %}/{{site.blog_images_dir}}{{post.image.name}}{% endcapture %}
+                                    {% capture full_path %}blog/thumbs/{{post.image.thumb}}{% endcapture %}
                             {% elsif post.image.path %}
-                                    {% capture image_path %}{{post.image.path | remove_first: '/'}}{% endcapture %}
-                                    {% capture full_path %}{{post.image.path }}{% endcapture %}
+                                    {% capture full_path %}{{post.image.path | replace: '/assets/images/', ''  }}{% endcapture %}
                             {% elsif post.image == site.data.settings.social_share_image %}
-                                <img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="{{site.data.settings.placeholder}}"
-                                    alt="{{post.title}}" class="center-block img-responsive lazyload" />
+                                    {% capture full_path %}{{site.data.settings.social_share_image | replace: '/assets/images/', '' }}{% endcapture %}
                             {% elsif post.image %}
-                                    {% capture image_path %}{{post.image | remove_first: '/'}}{% endcapture %}
-                                    {% capture full_path %}{{post.image }}{% endcapture %}
+                                    {% capture full_path %}{{post.image | replace: '/assets/images/', '' }}{% endcapture %}
                              {% else %}
-                                <img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
-                                 data-src="{{site.data.settings.placeholder}}" alt="{{post.title}}" class="img-responsive lazyload"/>
+                                    {% capture full_path %}{{site.data.settings.social_share_image | replace: '/assets/images/', '' }}{% endcapture %}
                              {% endif %}
+                             {% picture blogThumb {{full_path}} alt=post.title %}
                     </div>
                     <div class="col-md-9 col-sm-9 col-xs-9 ">
                        {{post.title | truncate: 40}}
@@ -70,24 +63,17 @@
             <div class="row featured_blog_post">
                 <div class="col-md-3 col-sm-3 col-xs-3 no-padding">
                     {% if post.image.thumb %}
-                        {% capture image_path %}{{site.blog_images_dir}}thumbs/{{post.image.thumb}}{% endcapture %}
-                        {% capture full_path %}/{{site.blog_images_dir}}thumbs/{{post.image.thumb}}{% endcapture %}
-                 {% elsif post.image.name %}
-                        {% capture image_path %}{{site.blog_images_dir}}{{post.image.name}}{% endcapture %}
-                        {% capture full_path %}/{{site.blog_images_dir}}{{post.image.name}}{% endcapture %}
-                 {% elsif post.image.path %}
-                        {% capture image_path %}{{post.image.path | remove_first: '/' }}{% endcapture %}
-                        {% capture full_path %}{{post.image.path }}{% endcapture %}
-                {% elsif post.image == site.data.settings.social_share_image %}
-                    <img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="{{site.data.settings.placeholder}}"
-                        alt="{{post.title}}" class="center-block img-responsive lazyload" />
-                 {% elsif post.image %}
-                        {% capture image_path %}{{post.image | remove_first: '/' }}{% endcapture %}
-                        {% capture full_path %}{{post.image }}{% endcapture %}
-                 {% else %}
-                    <img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
-                    data-src="{{site.data.settings.placeholder}}" alt="{{post.title}}" class="img-responsive lazyload"/>
-                 {% endif %}
+                            {% capture full_path %}blog/thumbs/{{post.image.thumb}}{% endcapture %}
+                    {% elsif post.image.path %}
+                            {% capture full_path %}{{post.image.path | replace: '/assets/images/', ''  }}{% endcapture %}
+                    {% elsif post.image == site.data.settings.social_share_image %}
+                            {% capture full_path %}{{site.data.settings.social_share_image | replace: '/assets/images/', '' }}{% endcapture %}
+                    {% elsif post.image %}
+                            {% capture full_path %}{{post.image | replace: '/assets/images/', '' }}{% endcapture %}
+                        {% else %}
+                            {% capture full_path %}{{site.data.settings.social_share_image | replace: '/assets/images/', '' }}{% endcapture %}
+                        {% endif %}
+                        {% picture blogThumb {{full_path}} alt=post.title %}
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-9 ">
                    {{post.title | truncate: 40}}

data/_layouts/jumbotron.html

@@ -9,4 +9,8 @@ layout: base
 {% else %}
     {% include breadcrumb.html %}
 {% endif %}
-{{content}}
+{% if page.flow %}
+    {% include flow.html flow=page.flow %}
+{% else % }
+    {{content}}
+{% endif %}

data/_layouts/post-index.html

@@ -3,14 +3,18 @@ layout: base
 title: Blog
 css-package: blog
 js-package: blog
+pagination:
+    enabled: true
+    category: blog
 ---
 <div class="row" id="content-container">
     <div class="container">
         {% include display-blog-posts.html %}
-        {% if page.news %}
-            {% include pagination.html path="/news/:num/"%}
+        {% if page.pagination_base_url %}
+            {% assign paginationUrl = page.pagination_base_url | append: ':num/' %}
         {% else %}
-            {% include pagination.html path="/blog/:num/"%}
+            {% assign paginationUrl =  "/blog/:num/" %}
         {% endif %}
+        {% include pagination.html pagination_permalink=paginationUrl %}
     </div>
 </div>

data/_layouts/post.html

@@ -3,7 +3,13 @@ layout: base
 js-package: blog
 css-package: blog
 ---
-<div class="row overlay background-image {% if page.image.background-class %}{{page.image.background-class}}{% endif %}" id="jumbotron" style="background: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{% if page.image.path %}{{page.image.path}}{% else %}{{page.image}}{% endif %}');"> <!--Row -->
+<div class="row overlay background-image {% if page.image.background-class %}{{page.image.background-class}}{% endif %}" id="jumbotron">
+    {% if page.image.path %}
+        {% assign image_path = page.image.path | replace: '/assets/images/','' %}
+    {% elsif page.image %}
+        {% assign image_path = page.image | replace: '/assets/images/','' %}
+    {% endif %}
+    {% picture backgroundImage {{image_path}} alt=page.title %}
     <div id="jumbotron-content" class="flex-container"> <!--Jumbotron div -->        
         <div class="container flex-center" id="jumbotron-text"> <!--Container -->
             <h1 id="jumbotron-heading">{{page.title}}</h1>

data/_sass/core/blog.scss

@@ -182,7 +182,7 @@ article {
     }
 }
 // BLOG SIDEBAR
-.blog-sidebar {
+#wrapper .blog-sidebar {
     padding: 15px;
     margin-top: 40px;
     margin-bottom: 40px;

data/_sass/core/jumbotron.scss

@@ -49,6 +49,27 @@
     background-position-y: 0px !important;
     background-position-x: center !important;
 }
+#jumbotron picture img {
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0px;
+    object-fit: cover;
+    height: 100%;
+}
+#jumbotron picture:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  height: $jumbotron-height;
+  left: 0;
+  background-image: linear-gradient(to bottom right, #000, #000);
+  opacity: .6;
+  width: 100%;
+  z-index: 1;
+}
 video#jumbotronVideo {    
     position: absolute;
     right: 0;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jumbo-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: '4.8'
+  version: 4.8.2
 platform: ruby
 authors:
 - Kyle Kirkby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -373,9 +373,11 @@ files:
 - _includes/blog-filler-element.html
 - _includes/breadcrumb.html
 - _includes/carousel-header.html
+- _includes/core/call-to-action-banner.html
 - _includes/css.html
 - _includes/display-blog-posts.html
 - _includes/disqus-comments.html
+- _includes/flow.html
 - _includes/footer.html
 - _includes/github-edit.html
 - _includes/google-analytics.html
@@ -404,9 +406,6 @@ files:
 - _includes/youtube.html
 - _layouts/author.html
 - _layouts/base.html
-- _layouts/container-breadcrumb-tabs.html
-- _layouts/container-breadcrumb.html
-- _layouts/container.html
 - _layouts/default.html
 - _layouts/error.html
 - _layouts/jumbotron-container.html

data/_layouts/container-breadcrumb-tabs.html

@@ -1,10 +0,0 @@
----
-layout: base
----
-{% include breadcrumb.html %}
-<div class="row" id="content-container">
-    {% include sticky-tab-bar.html %}
-    <div class="container">
-        {{ content }}
-    </div>
-</div>

data/_layouts/container-breadcrumb.html

@@ -1,19 +0,0 @@
----
-layout: base
----
-{% if page.jumbotron.carousel-images %}
-    {% include carousel-header.html images=page.jumbotron.carousel-images %}
-    {% include jumbotron.html %}
-{% elsif page.jumbotron %}
-    {% include jumbotron.html %}
-{% else %}
-    {% include breadcrumb.html %}
-{% endif %}
-<div class="row" id="content-container">
-    {% if page.sticky-tab-bar %}
-        {% include sticky-tab-bar.html %}
-    {% endif %}
-    <div class="container">
-        {{ content }}
-    </div>
-</div>

data/_layouts/container.html

@@ -1,8 +0,0 @@
----
-layout: base
----
-{% if page.carousel %}
-    {% include carousel-header.html images=site.page.images %}
-{% endif %}
-{% include jumbotron.html %}
-{{content}}