Skip to content

Commit

Permalink
fixing layouts and assets
Browse files Browse the repository at this point in the history
updating Gemfile.lock with bundle install (rvm use ruby-2.2.9)

Updated links in header and footer

switch to paginate v2 gem

comment sidebar logic

fixing css regression

retry paginate

updated local ruby version

reverting to original pagination gem

remove text, make heading roboto, next/prev as buttons
  • Loading branch information
tehut committed Mar 8, 2018
1 parent 4baf995 commit 1b166de
Show file tree
Hide file tree
Showing 201 changed files with 1,849 additions and 2,024 deletions.
36 changes: 2 additions & 34 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,42 +44,10 @@ group :jekyll_plugins do
gem "jekyll-theme-tactile", "0.0.3"
gem "jekyll-theme-time-machine", "0.0.3"
gem "jekyll-titles-from-headings", "~> 0.1"
gem "jekyll-include-cache", "~> 0.1"
gem 'jekyll-youtube', '~> 1.0'
end




gem "jekyll-feed", "~> 0.6"
gem "jekyll-sitemap"
gem "jekyll-gist"
gem "jekyll-paginate", "1.1.0"
gem "jekyll-seo-tag"
gem 'jekyll-youtube', '~> 1.0'
gem "jekyll-avatar", "~> 0.4"
gem "jekyll-coffeescript", "~> 1.0"
gem "jekyll-default-layout", "~> 0.1"
gem "jekyll-github-metadata", "~> 2.2"
gem "jekyll-optional-front-matter", "~> 0.1"
gem "jekyll-readme-index", "0.0.3"
gem "jekyll-redirect-from", "~> 0.11"
gem "jekyll-relative-links", "~> 0.2"
gem "jekyll-swiss", "~> 0.4"
gem "jekyll-theme-architect", "0.0.3"
gem "jekyll-theme-cayman", "0.0.3"
gem "jekyll-theme-dinky", "0.0.3"
gem "jekyll-theme-hacker", "0.0.3"
gem "jekyll-theme-leap-day", "0.0.3"
gem "jekyll-theme-merlot", "0.0.3"
gem "jekyll-theme-midnight", "0.0.3"
gem "jekyll-theme-minimal", "0.0.3"
gem "jekyll-theme-modernist", "0.0.3"
gem "jekyll-theme-primer", "~> 0.1"
gem "jekyll-theme-slate", "0.0.3"
gem "jekyll-theme-tactile", "0.0.3"
gem "jekyll-theme-time-machine", "0.0.3"
gem "jekyll-titles-from-headings", "~> 0.1"
gem "jekyll-include-cache", "~> 0.1"

gem "kramdown", "~> 1.11"
gem "rouge", "~> 2.0"
gem "pry"
55 changes: 31 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ GEM
ethon (0.11.0)
ffi (>= 1.3.0)
execjs (2.7.0)
faraday (0.13.1)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
ffi (1.9.21)
forwardable-extended (2.6.0)
jekyll (3.6.0)
addressable (~> 2.4)
Expand All @@ -33,11 +33,11 @@ GEM
coffee-script (~> 2.2)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.9.2)
jekyll-feed (0.9.3)
jekyll (~> 3.3)
jekyll-gist (1.4.1)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.9.3)
jekyll-github-metadata (2.9.4)
jekyll (~> 3.1)
octokit (~> 4.0, != 4.4.0)
jekyll-include-cache (0.1.0)
Expand All @@ -47,15 +47,15 @@ GEM
jekyll-paginate (1.1.0)
jekyll-readme-index (0.0.3)
jekyll (~> 3.0)
jekyll-redirect-from (0.12.1)
jekyll-redirect-from (0.13.0)
jekyll (~> 3.3)
jekyll-relative-links (0.5.1)
jekyll-relative-links (0.5.2)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.3.0)
jekyll-seo-tag (2.4.0)
jekyll (~> 3.3)
jekyll-sitemap (1.1.1)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-swiss (0.4.0)
jekyll-theme-architect (0.0.3)
Expand Down Expand Up @@ -86,35 +86,41 @@ GEM
jekyll (~> 3.3)
jekyll-theme-time-machine (0.0.3)
jekyll (~> 3.3)
jekyll-titles-from-headings (0.5.0)
jekyll-titles-from-headings (0.5.1)
jekyll (~> 3.3)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
jekyll-watch (1.5.1)
listen (~> 3.0)
jekyll-youtube (1.0.0)
jekyll
json (1.8.6)
kramdown (1.15.0)
kramdown (1.16.2)
liquid (4.0.0)
listen (3.0.8)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
method_source (0.9.0)
minima (2.1.1)
jekyll (~> 3.3)
minima (2.3.0)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
multipart-post (2.0.0)
octokit (4.7.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
pry (0.11.2)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.0)
public_suffix (3.0.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.3)
sass (3.5.5)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down Expand Up @@ -145,7 +151,7 @@ DEPENDENCIES
jekyll-optional-front-matter (~> 0.1)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.0.3)
jekyll-redirect-from (~> 0.11)
jekyll-redirect-from (~> 0.13)
jekyll-relative-links (~> 0.2)
jekyll-seo-tag
jekyll-sitemap
Expand All @@ -164,6 +170,7 @@ DEPENDENCIES
jekyll-theme-tactile (= 0.0.3)
jekyll-theme-time-machine (= 0.0.3)
jekyll-titles-from-headings (~> 0.1)
jekyll-youtube (~> 1.0)
json (~> 1.7, >= 1.7.7)
kramdown (~> 1.11)
minima (~> 2.0)
Expand All @@ -173,4 +180,4 @@ DEPENDENCIES
unicode-display_width (~> 1.1)

BUNDLED WITH
1.15.4
1.16.1
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build: ## Build site with production settings and put deliverables in _site.
bundle exec jekyll build

build-preview: ## Build site with drafts and future posts enabled.
bundle exec jekyll build --drafts --future
bundle exec jekyll build --drafts --future --trace

serve: ## Boot the development server.
bundle exec jekyll serve
Expand Down
3 changes: 2 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ safe: false
lsi: false

latest: "v1.9"

paginate: 7
paginate_path: "blog/page:num"
paginate_path: "/blog/page:num/"

defaults:
-
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<nav>
<a href="/docs/tutorials/stateless-application/hello-minikube/">Get Started</a>
<a href="/docs/home/">Documentation</a>
<a href="http://blog.kubernetes.io/">Blog</a>
<a href="/blog">Blog</a>
<a href="/partners/">Partners</a>
<a href="/community/">Community</a>
<a href="/case-studies/">Case Studies</a>
Expand Down
2 changes: 1 addition & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="nav-buttons" data-auto-burger="primary">
<ul class="global-nav">
<li><a href="/docs/home/">Documentation</a></li>
<li><a href="http://blog.kubernetes.io/">Blog</a></li>
<li><a href="/blog">Blog</a></li>
<li><a href="/partners/">Partners</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/case-studies/">Case Studies</a></li>
Expand Down
66 changes: 33 additions & 33 deletions _layouts/blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@


<body>
<div id="cellophane" onclick="kub.toggleMenu()"></div>
<header>
<div class="nav-buttons" data-auto-burger="primary">
<nav class="nav-buttons" data-auto-burger="primary">
<ul class="global-nav">
<li><a href="/docs/home/">Documentation</a></li>
<li><a href="/blog">Blog</a></li>
Expand All @@ -71,25 +72,23 @@
<a href="/docs/home" class="button" id="viewDocs" data-auto-burger-exclude>View Documentation</a>
<a href="/docs/tutorials/kubernetes-basics/" class="button" id="tryKubernetes" data-auto-burger-exclude>Try Kubernetes</a>
<button id="hamburger" onclick="kub.toggleMenu()" data-auto-burger-exclude><div></div></button>
</div>
</nav>
</div>
</header>

<div class="container-fluid">

<div id="blog-hero" class="light-text">
<a class= 'logo' href='http://kubernetes.io/'></a>
<div class='blog-title'>
<h1> Kubernetes Blog </h1>
</div>

<div>
<h5>Kubernetes: an open source system for automating deployment, scaling, and operations of applications.</h5>
</div>
<div class="clear" style="clear: both"></div>
</div>


<div class="row blog-content" >
<div class="col-xs-12 col-sm-9 col-lg-9 text">
<div class="col-xs-10 col-sm-9 col-lg-9 text">

<h6 class="date-header">{{ page.date | date: '%B %-d, %Y' }} </h6>

Expand All @@ -98,66 +97,67 @@ <h3 class="post-title entry-title"> {{page.title}} </h3>
</div>


<div class="col-xs-6 col-sm-3 col-sm-3 col-lg-3 text">



<div ="widget-content">
<link href='http://kubernetes.io/feed.xml' rel='alternate' type='application/atom+xml'>
<a class="widget-link" href="https://kubernetes.io/feed.xml"> <i class="fas fa-rss"> </i> </a>
<a class="widget-link" href="https://twitter.com/kubernetesio.com"> <i class="fab fa-twitter-square"> </i> @Kubernetesio</a>
<a class="widget-link" href="https://github.com/kubernetes/kubernetes"> <i class="fab fa-github-square"></i> View on Github </a>
<a class="widget-link" href="https://slack.k8s.io"><i class='fab fa-slack'> </i> #kubernetes-users </a>
<a class="widget-link" href="http://stackoverflow.com/questions/tagged/kubernetes"><i class="fab fa-stack-overflow"></i>Stack Overflow</a>
<a class="widget-link" href="http://get.k8s.io/"><i class="fab fa-stack-overflow"></i>Download Kubernetes</a>
</div>

<div class="col-xs-1 col-sm-1 col-sm-3 col-lg-3 text">
<div ="widget-content">
<link href='http://kubernetes.io/feed.xml' rel='alternate' type='application/atom+xml'>
<a class="widget-link" href="https://kubernetes.io/feed.xml"> <i class="fas fa-rss"> </i> </a>
<a class="widget-link" href="https://twitter.com/kubernetesio"> <i class="fab fa-twitter-square"> </i> @Kubernetesio</a>
<a class="widget-link" href="https://github.com/kubernetes/kubernetes"> <i class="fab fa-github-square"></i> View on Github </a>
<a class="widget-link" href="http://slack.k8s.io"><i class='fab fa-slack'> </i> #kubernetes-users </a>
<a class="widget-link" href="http://stackoverflow.com/questions/tagged/kubernetes"><i class="fab fa-stack-overflow"></i>Stack Overflow</a>
<a class="widget-link" href="http://get.k8s.io/"><i class="fab fa-stack-overflow"></i>Download Kubernetes</a>
</div>

<!-- Begin Sidebar Loop -->
{% for post in site.posts %}
{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
{% capture this_month %}{{ post.date | date: "%B" }}{% endcapture %}
{% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %}
{% capture next_month %}{{ post.previous.date | date: "%B" }}{% endcapture %}

{% if forloop.first %}
<div class="sidebar-current-year">
<h2 id="{{ this_year }}-ref">{{this_year}}</h2>
<h4 id="{{ this_year }}-ref">{{this_year}}</h4>
<!-- Here we open a div and ul that are conditionally closed in the lower blocks -->
<div>
<h3 id="{{ this_year }}-{{ this_month }}-ref">{{ this_month }}</h3>
<h4 id="{{ this_year }}-{{ this_month }}-ref">{{ this_month }}</h4>
<ul>
{% endif %}

<li><a href="{{ post.url }}">{{ post.title }}</a></li>

{% if forloop.last %}
{% if forloop.last %} <!-- This section closes the entire div and ul at the final iteration-->
</ul>
</div>
</div>
</div> <!-- end of final conditional -->
{% else %}
{% if this_year != next_year %}
</ul>
<!-- this closes the collapsible year body -->
</div>
<!-- this closes the sidebar-previous-year opened below -->
</div>
<div class="sidebar-previous-year">
<input type="checkbox" id="{{ next_year }}-ref-checkbox" class="heading-year-toggle-checkbox"/>
<label class="collapsible-year-heading-label" for="{{ next_year }}-ref-checkbox">
<span class="collapsible-year-body-caret">►&nbsp;</span><h2 class="collapsible-year-header" id="{{ next_year }}-ref">{{next_year}}</h2>
<span class="collapsible-year-body-caret">►&nbsp;</span>
<h4 class="collapsible-year-header" id="{{ next_year }}-ref">{{next_year}}</h4>
</label>
<div class="collapsible-year-body">
<input type="checkbox" id="{{ next_year }}-{{ next_month }}-ref-checkbox" class="heading-month-toggle-checkbox"/>
<label class="collapsible-month-heading-label" for="{{ next_year }}-{{ next_month }}-ref-checkbox">
<span class="collapsible-posts-list-caret">►&nbsp;</span><h3 class="collapsible-month-header" id="{{ next_year }}-{{ next_month }}-ref">{{ next_month }}</h3>
<span class="collapsible-posts-list-caret">►&nbsp;</span>
<h5 class="collapsible-month-header" id="{{ next_year }}-{{ next_month }}-ref">{{ next_month }}</h5>
</label>
<ul class="collapsible-posts-list">
{% else %}
{% if this_month != next_month %}
</ul>
</div>
<div class="current-year">


<input type="checkbox" id="{{ this_year }}-{{ next_month }}-ref-checkbox" class="heading-month-toggle-checkbox"/>
<label class="collapsible-month-heading-label" for="{{ this_year }}-{{ next_month }}-ref-checkbox">
<span class="collapsible-posts-list-caret">►&nbsp;</span><h3 class="collapsible-month-header" id="{{ this_year }}-{{ next_month }}-ref">{{ next_month }}</h3>
<span class="collapsible-posts-list-caret">►&nbsp;</span>
<h5 class="collapsible-month-header" id="{{ this_year }}-{{ next_month }}-ref">{{ next_month }}</h5>
</label>

<ul class="collapsible-posts-list">
{% endif %}
{% endif %}
Expand Down
5 changes: 3 additions & 2 deletions _posts/2015-03-20-Welcome-to-the-Kubernetes-Blog!.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
layout: blog
title: " Welcome to the Kubernetes Blog! "
date: Saturday, March 20, 2015

pagination:
enabled: true
---
Welcome to the new Kubernetes blog. Follow this blog to learn about the Kubernetes Open Source project. We plan to post release notes, how-to articles, events, and maybe even some off topic fun here from time to time.

Expand All @@ -21,7 +22,7 @@ To start things off, here's a roundup of recent Kubernetes posts from other site
- [An introduction to containers, Kubernetes, and the trajectory of modern cloud computing](http://googlecloudplatform.blogspot.com/2015/01/in-coming-weeks-we-will-be-publishing.html)
- [What is Kubernetes and how to use it?](http://www.centurylinklabs.com/what-is-kubernetes-and-how-to-use-it/)
- [OpenShift V3, Docker and Kubernetes Strategy](https://blog.openshift.com/v3-docker-kubernetes-interview/)
- [An Introduction to Kubernetes](https://www.digitalocean.com/community/tutorials/an-introduction-to-kubernetes)
- [An Introduction to Kubernetes](https://www.digitalocean.com/community/tutorials/an-introduction-to-kubernetes)


Happy cloud computing!
Expand Down
8 changes: 4 additions & 4 deletions _posts/2015-03-23-Kubernetes-Gathering-Videos.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
layout: blog
title: " Kubernetes Gathering Videos "
date: Tuesday, March 23, 2015
pagination:
enabled: true
---
If you missed the Kubernetes Gathering in SF last month, fear not!
If you missed the Kubernetes Gathering in SF last month, fear not! Here are the videos from the evening presentations organized into a playlist on YouTube

{% youtube "https://www.youtube.com/embed/q8lGZCKktYo" %}

[Here are the videos from the evening presentations organized into a playlist on YouTube](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe).
[![Kubernetes Gathering](https://img.youtube.com/vi/q8lGZCKktYo/0.jpg)](https://www.youtube.com/playlist?list=PL69nYSiGNLP2FBVvSLHpJE8_6hRHW8Kxe)
Loading

0 comments on commit 1b166de

Please sign in to comment.