Skip to content

Commit

Permalink
Pulled changes from upstream/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyle Kirkby committed Dec 3, 2020
2 parents ae827c2 + b418212 commit af4bfdf
Show file tree
Hide file tree
Showing 36 changed files with 1,199 additions and 400 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Expand Up @@ -17,6 +17,22 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
### Breaks


## 4.2.0 - (2020-11-23)
---

### New
* Added a documentation layout. This will predominantly be used by the 96boards documentation
* Added the ability to simply provide a path to the navbar brand image and also specifiy an alt tag
* Added support for the use of a sticky tab bar. Provides per page sub navigation as a tabbed navbar row.
* Added breadcrumb background image support by setting `breadcrumb_banner` in your `_config.yml`.
* Added inner-image support to jumbotron header
* Added animated dropdown menu feature. The first dropdowns will show on hover.


### Fixes
* Added missing image alt text and aria labels


## 4.1.6 - (2020-11-16)
---

Expand Down
20 changes: 20 additions & 0 deletions _config.yml
Expand Up @@ -33,6 +33,7 @@ plugins:
- japr
- jekyll_picture_tag
- jekyll-tidy
- jekyll-toc
collections:
authors:
output: true
Expand Down Expand Up @@ -107,10 +108,19 @@ google_analytics:
social_media_share_image: /assets/images/social-media-image.png
# Set the default favicon
favicon: /assets/images/favicon.png
# Toggle the animated navbar dropdown feature
# Navbar dropdowns will open on hover
hover_nav_dropdowns: true
# Set the class used to animate dropdowns e.g. fade-up / fade-down
nav_dropdowns_animation_class: fade-down
# The bootstrap breakpoint at which the navbars will expand
nav_expand_breakpoint: lg
# Site Name - your brand name
name: Jumbo Jekyll Theme
# The blog filler element
blog_filler_element: blog/blog_filler_element.html
# Breadcrumb banner image
breadcrumb_banner: /assets/images/breadcrumb-banner.png
# Placeholder avatar
avatar_placeholder: /assets/images/avatar-placeholder.jpg
# Blog Post Image Placholder
Expand Down Expand Up @@ -188,3 +198,13 @@ asset_pipeline:
compress: true
output_path: assets/js
gzip: false
# jekyll-toc
toc:
min_level: 1
max_level: 6
ordered_list: false
no_toc_section_class: no_toc_section
list_class: list-group docs_nav sticky-top
sublist_class: "list-group"
item_class: toc-entry
item_prefix: toc-
21 changes: 18 additions & 3 deletions _data/nav.yml
Expand Up @@ -2,6 +2,11 @@ universal_nav: true
search:
enabled: true
label: Linaro
expand_breakpoint: lg
brand:
# custom_include: nav/brand.html
path: /assets/images/Linaro-Logo.svg
alt: Linaro logo
pages:
- title: Features
options:
Expand All @@ -25,9 +30,12 @@ pages:
url: /flow/
- text: Post
url: /post/
- url: /documentation-page/
text: Documentation Page
- options:
- text: Overview
url: /engineering/
external: true
- text: Artificial Intelligence
url: /engineering/artificial-intelligence/
- text: Autonomous Vehicles
Expand All @@ -49,7 +57,13 @@ pages:
- text: Power Management
url: /engineering/core/arm-power-management/
- text: Power Management EAS
url: /engineering/core/arm-power-management/eas/
options:
- text: Flow
url: /flow/
- text: Post
url: /post/
- url: /documentation-page/
text: Documentation Page
- text: Power Management Farm
url: /engineering/core/arm-power-management/pmwg-farm/
- text: Security
Expand All @@ -67,7 +81,8 @@ pages:
- text: Multimedia
url: /engineering/multimedia/
title: Engineering
- title: Membership
url: /membership/
- title: View on GitHub
url: https://www.github.com/linaro-marketing/linaro-jekyll-theme
external: true
- url: /blog/
title: Blog
6 changes: 6 additions & 0 deletions _data/picture.yml
Expand Up @@ -155,3 +155,9 @@ markup_presets:
fallback_format: webp
fallback_width: 400
widths: [400]
breadcrumb_banner:
markup: data_picture
attributes:
img: 'class="lazyload breadcrumb_image"'
formats: [webp, original]
widths: [1000, 1200, 2000]
24 changes: 24 additions & 0 deletions _data/sticky_tab_bar.yml
@@ -0,0 +1,24 @@
pages:
# - list:
# - title: Blog
# url: /blog/
# sub-pages: true
# - title: Flow Layout
# url: /flow/
# right: true
# urls: [/, /flow/]
- list:
- title: Documentation Example
url: /documentation-page/
sub-pages: true
- title: Getting Started
url: /flow/
urls: [/documentation-page/]
- list:
- title: __current_page__
url: __current_page__
sub-pages: true
- title: Getting Started
url: /flow/
sub-pages-enabled: true
urls: [/]
11 changes: 11 additions & 0 deletions _includes/blog/post_search_fess.html
@@ -0,0 +1,11 @@
{% assign data = include.object.payload %}
<div class="col col-12 ">
<div id="post_search" data-search-label="{{data.search_label}}">
<input class="form-control form-control-lg" id="search-input" type="text"
placeholder="Search {{site.categories[data.category].size}} posts..." />
<a class="close_search" href="#">
X <span class="sr-only">Clear Search</span>
</a>
<ul class="list-unstyled p-3" id="results-container"></ul>
</div>
</div>
7 changes: 5 additions & 2 deletions _includes/components/breadcrumb.html
@@ -1,10 +1,13 @@
{% assign page-url = page.url | split: "/" %}
{% assign iterator = 2 %}
{% assign breadcrumb-path = "/" %}
<nav aria-label="breadcrumb" id="breadcrumb">
<nav aria-label="breadcrumb" {% if site.breadcrumb_banner %}class="breadcrumb_bg"{% endif %}id="breadcrumb">
{% if site.breadcrumb_banner %}
{% picture breadcrumb_banner {{site.breadcrumb_banner}} --alt "Breadcrumb banner" %}
{% endif %}
<div class="container">
<h1>{{page.title}}</h1>
<ol class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList">
<ol class="breadcrumb mb-0"" itemscope itemtype="http://schema.org/BreadcrumbList">
<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"
class="breadcrumb-item">
<a itemprop="item" href="/">
Expand Down
4 changes: 2 additions & 2 deletions _includes/components/cookie_manager.html
Expand Up @@ -27,7 +27,7 @@ <h3>Necessary Cookies</h3>
<div class="col col-12 col-sm-3">
<div class="df-switch">
<button type="button" class="btn btn-lg btn-toggle active" disabled data-toggle="button" aria-pressed="false"
autocomplete="off">
autocomplete="off" aria-label="Toggle Necessary Cookies">
<div class="inner-handle"></div>
<div class="handle"></div>
</button>
Expand Down Expand Up @@ -62,7 +62,7 @@ <h3>Analytics Cookies</h3>
<div class="col col-12 col-sm-3">
<div class="df-switch">
<button id="analytics_toggle" type="button" class="btn btn-lg btn-toggle" data-toggle="button" aria-pressed="false"
autocomplete="off">
autocomplete="off" aria-label="Toggle Necessary Cookies">
<div class="inner-handle"></div>
<div class="handle"></div>
</button>
Expand Down
29 changes: 24 additions & 5 deletions _includes/components/jumbotron.html
Expand Up @@ -5,15 +5,21 @@
{% for slide in page.jumbotron.slider %}
<div class="item d-flex align-items-center owl-slide {% if forloop.first %}active{% endif %}">
{% if slide.image %}
{% assign image_path = slide.image %}
{% picture header_slider_image {{image_path}} %}
{% assign image_path = slide.image %}
{% if slide.image_alt %}
{% capture image_alt %}{{slide.image_alt}}{% endcapture%}
{% else %}
{% if slide.title %}{% assign alt_title = slide.title %}{% else %}{% assign alt_title = page.title %}{% endif %}
{% capture image_alt %}{{alt_title}} slider header background{% endcapture%}
{% endif %}
{% picture header_slider_image {{image_path}} --alt {{image_alt}} %}
{% endif %}
<div class="container {% if slide.inner_class %}{{slide.inner_class}}{% endif %}">
<div class="inner_content_wrapper">
{% if slide.inner-image %}
<img class="d-inline-block lazyload"
src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
data-src="{{slide.inner-image}}" alt="Slide {{forloop.index}} inner image" />
data-src="{{slide.inner-image}}" alt="Slide {{forloop.index}}" />
{% endif %}
{% if slide.title %}
<h1 class=" {% if slide.title-class %}{{slide.title-class}}{% endif %}">
Expand Down Expand Up @@ -47,7 +53,13 @@ <h1 class=" {% if slide.title-class %}{{slide.title-class}}{% endif %}">
{% if page.jumbotron.image %}background_image{% endif%} {% if page.jumbotron.class %}{{page.jumbotron.class}}{% endif %}">
{% if page.jumbotron.image %}
{% assign image_path = page.jumbotron.image %}
{% picture header_image {{image_path}} %}
{% if page.jumbotron.image_alt %}
{% capture image_alt %}{{page.jumbotron.image_alt}}{% endcapture%}
{% else %}
{% if page.jumbotron.title %}{% assign alt_title = page.jumbotron.title %}{% else %}{% assign alt_title = page.title %}{% endif %}
{% capture image_alt %}{{alt_title}} header background{% endcapture%}
{% endif %}
{% picture header_image {{image_path}} --alt {{alt_title}} %}
{% endif %}
{% if page.jumbotron.video %}
<video autoplay muted preload="none" poster="{{page.jumbotron.video.poster}}" playsinline loop id="jumbotronVideo">
Expand All @@ -64,7 +76,14 @@ <h1 class=" {% if slide.title-class %}{{slide.title-class}}{% endif %}">
{% endif %}
<div class="container {% if page.jumbotron.inner_class %}{{page.jumbotron.inner_class}}{% endif %}">
<div class="inner_content_wrapper">
<h1 class="">{{page.jumbotron.title}}</h1>
{% if page.jumbotron.inner-image %}
<img class="d-inline-block lazyload"
src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
data-src="{{page.jumbotron.inner-image}}" alt="Header inner image" />
{% endif %}
{% if page.jumbotron.title %}
<h1 {% if page.jumbotron.title-class %}class="{{page.jumbotron.title-class}}"{% endif %}>{{page.jumbotron.title}}</h1>
{% endif %}
{% if page.jumbotron.description %}
<p class="lead">
{{page.jumbotron.description }}
Expand Down
76 changes: 76 additions & 0 deletions _includes/components/sticky_tab_bar.html
@@ -0,0 +1,76 @@
{% if page.sticky_tab_bar.first %}
{% assign tab-list = page.sticky_tab_bar %}
{% else %}
{% assign sub-nav-tabs = site.data.sticky_tab_bar.pages %}
{% endif %}
{% if sub-nav-tabs %}
{% assign page-base = page.url | split:'/' %}
{% for each in sub-nav-tabs %}
{% for each-url in each.urls %}
{% if each-url == page.url %}
{% if each.list %}
{% assign tab-list = each.list %}
{% endif %}
{% elsif each.sub-pages-enabled %}
{% if page.url contains each-url %}
{% assign tab-list = each.list %}
{% endif %}
{% endif %}
{% endfor %}
{% if each.custom-include %}
{% assign custom-include = each.custom-include %}
{% endif %}
{% endfor %}
{% endif %}
{% if tab-list %}
<div class="tabbed-area non-sticky-nav" id="tabbed-nav-bar"><!-- Nav tabs Wrapper-->
<nav class="navbar navbar-expand-lg navbar-light bg-light {% if site.hover_nav_dropdowns %}hover_animated{% endif %}" role="navigation"><!-- Nav -->
<div class="container">
<a class="navbar-brand d-block d-lg-none" id="sub-navigation-header" href="#"></a><!-- Navbar Brand -->
<button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target="#tabbed-nav-bar-collapse"
aria-controls="tabbed-nav-bar-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="sr-only">Toggle navigation</span>
</button>
<div class="collapse navbar-collapse" id="tabbed-nav-bar-collapse"><!-- Navbar Collapse -->
<ul class="nav nav-pills flex-column flex-lg-row tabbed-nav w-100" id="tab-row" role="tablist">
{% for tab in tab-list %}
{% if tab.options %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
{{tab.title}}
</a>
<div class="dropdown-menu {% if site.nav_dropdowns_animation_class %}{{site.nav_dropdowns_animation_class}}{% endif %}">
{% for option in tab.options %}
<a class="dropdown-item" href="{{option.url}}">{{option.title}}</a>
{% endfor %}
</div>
</li>
{% else %}
<li role="presentation"
class=" nav-item tabbed-nav-btn {% if tab.right %}pull-right{% endif %}">
<a href="{% if tab.url == '__current_page__' %}{{page.url}}{% else %}{{tab.url}}{% endif %}"
class="nav-link {% if tab.url == '__current_page__'%}active{% elsif page.url == tab.url or tab.sub-pages and page.url contains tab.url or tab.active %}active{% endif %}"
aria-controls="overview" role="link">
{% if tab.title == "__current_page__" %}
{{page.title}}
{% else %}
{{tab.title}}
{% endif %}
</a>
</li>
{% endif %}
{% endfor %}

</ul>
</div>
</div>
</nav>
</div>
{% elsif custom-include %}
{% include {{custom-include}}.html %}
{% else %}
No content found - please add to _data/sticky_tab_bar.yml. More information available <a href="/jekyll/includes/sticky-tab-bar/">here</a>.
{% endif %}

0 comments on commit af4bfdf

Please sign in to comment.