Skip to content

Commit

Permalink
upgrade to jekyll 4.0.0
Browse files Browse the repository at this point in the history 
Signed-off-by: leecalcote <[email protected]>
  • Loading branch information
@leecalcote
leecalcote committed Jan 5, 2020
1 parent c51d60c commit 8b141bd
Show file tree
Hide file tree
Showing 8 changed files with 157 additions and 170 deletions.
1 change: 0 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ end

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gemspec
178 changes: 81 additions & 97 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
PATH
remote: .
specs:
jekyll-material-theme (0.6.0)
jekyll (~> 3.5)
jekyll-assets (~> 3.0)
jekyll-feed (~> 0.9)
jekyll-minifier (~> 0.1)
kramdown (~> 1.16)

GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
autoprefixer-rails (9.6.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
autoprefixer-rails (9.7.3)
execjs
capybara (3.26.0)
capybara (3.30.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.10.4)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (1.0.1)
rake (< 13.0)
childprocess (3.0.0)
coderay (1.1.2)
colorator (1.1.0)
concurrent-ruby (1.1.5)
Expand All @@ -41,40 +24,39 @@ GEM
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
extras (0.3.0)
forwardable-extended (~> 2.5)
fastimage (2.1.5)
ffi (1.11.1)
fastimage (1.8.1)
addressable (~> 2.3, >= 2.3.5)
ffi (1.11.3)
forwardable-extended (2.6.0)
hike (1.2.3)
htmlcompressor (0.4.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
jekyll (3.8.6)
jekyll (4.0.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
i18n (>= 0.9.5, < 2)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (~> 3.0)
safe_yaml (~> 1.0)
jekyll-assets (3.0.12)
activesupport (~> 5.0)
execjs (~> 2.7)
extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
jekyll (>= 3.5, < 4.0)
jekyll-sanity (~> 1.2)
liquid-tag-parser (~> 1.0)
nokogiri (~> 1.8)
pathutil (~> 0.16)
sprockets (>= 3.3, < 4.1.beta)
jekyll-feed (0.12.1)
terminal-table (~> 1.8)
jekyll-assets (1.0.0)
fastimage (~> 1.6)
jekyll (>= 2)
mini_magick (~> 4.1)
sass (~> 3.2)
sprockets (~> 2.10)
sprockets-helpers
sprockets-sass
jekyll-feed (0.13.0)
jekyll (>= 3.7, < 5.0)
jekyll-minifier (0.1.10)
cssminify2 (~> 2.0)
Expand All @@ -84,108 +66,111 @@ GEM
uglifier (~> 4.1)
jekyll-redirect-from (0.15.0)
jekyll (>= 3.3, < 5.0)
jekyll-sanity (1.2.0)
jekyll (~> 3.1)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-sass-converter (2.0.1)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.3.1)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.2.0)
json (2.3.0)
json-minify (0.0.3)
json (> 0)
kramdown (1.17.0)
kramdown (2.1.0)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
liquid-tag-parser (1.9.0)
extras (~> 0.3)
liquid (>= 3.0, < 5.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
materialize-sass (1.0.0)
autoprefixer-rails (>= 6.0.3)
mercenary (0.3.6)
method_source (0.9.2)
mini_magick (4.9.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minima (2.5.0)
jekyll (~> 3.5)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.11.3)
nio4r (2.4.0)
nokogiri (1.10.4)
multi_json (1.14.1)
nio4r (2.5.2)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.1.1)
puma (4.0.1)
public_suffix (4.0.2)
puma (4.3.1)
nio4r (~> 2.0)
rack (1.6.11)
rack (1.6.12)
rack-jekyll (0.5.0)
jekyll (>= 1.3)
listen (>= 1.3)
rack (~> 1.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rake (10.5.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.6.0)
rouge (3.6.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
rouge (3.14.0)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.1)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
ruby_dep (1.5.0)
rubyzip (1.3.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rubyzip (2.0.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.20)
sassc (2.2.1)
ffi (~> 1.9)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.2.1)
sprockets (>= 2.2)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tilt (1.4.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.6.0)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
bundler (~> 1.12)
capybara
jekyll (~> 3.8.5)
jekyll (~> 4.0.0)
jekyll-assets
jekyll-feed (~> 0.6)
jekyll-material-theme!
jekyll-minifier
jekyll-redirect-from
jekyll-sitemap
Expand All @@ -194,7 +179,6 @@ DEPENDENCIES
pry
puma
rack-jekyll
rake (~> 10.0)
rspec
selenium-webdriver
tzinfo-data
Expand All @@ -203,4 +187,4 @@ RUBY VERSION
ruby 2.6.5p114

BUNDLED WITH
1.17.3
2.1.2
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ site-admin:
ADMIN=on $(jekyll) serve --drafts --livereload

build:
$(jekyll) build --drafts --livereload
$(jekyll) build --drafts

setup:
ADMIN=on bundle install
Expand Down
44 changes: 23 additions & 21 deletions _includes/ecosystem.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ <h5 style="text-align:center;color:aliceblue;">

<div style="flex-grow: .25;"></div>

<!-- Meshery -->
<div style="flex-grow: .25;"></div>

<div id="meshery" class="card-content" style="position:relative;" >
<h5 style="text-align:center;color:aliceblue;">
<a style="font-size:.9em;padding-top:5px;padding-bottom:45px;
min-width:240px;max-width:300px; width:100%"
class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
href="/meshery"><img style="height:inherit;vertical-align: middle;"
src="/assets/images/meshery/meshery-logo-white.svg" />
<span style="position: relative;bottom:-5px;padding-left:.3em;">Meshery</span></a> </h5>
</div>
<h5 style="text-align:center;color:aliceblue;font-size:1.25em;">
Meshery is a multi-service mesh management plane for performance benchmarking and lifecycle management of service meshes.</h5>

<!-- Landscape -->
<div id="landscape" class="card-content" style="position:relative;">
<h5 style="text-align:center;color:aliceblue;">
Expand All @@ -35,30 +50,17 @@ <h5 style="text-align:center;color:aliceblue;">
</div>
<h5 style="text-align:center;color:aliceblue;font-size:1.25em;">
The service mesh landscape characterizes and contrasts service meshes and related technologies.</h5>

<!-- Meshery -->
<div style="flex-grow: .25;"></div>

<div id="meshery" class="card-content" style="position:relative;float:center;vertical-align: center;" >
<h5 style="text-align:center;color:aliceblue;">
<a style="font-size:.9em;padding-top:5px;padding-bottom:45px;
min-width:240px;max-width:300px; width:100%"
class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
href="/meshery"><img style="height:inherit;vertical-align: middle;"
src="/assets/images/meshery/meshery-logo-white.svg" />
<span style="position: relative;bottom:-5px;padding-left:.3em;">Meshery</span></a> </h5>
</div>
<h5 style="text-align:center;color:aliceblue;font-size:1.25em;">
Meshery is a multi-service mesh management plane for performance benchmarking and lifecycle management of service meshes.</h5>

<!-- GSOC 2019 -->
<div style="flex-grow: .25;"></div>
<div id="gsoc-2019" class="card-content" style="position:relative;float:center;vertical-align: bottom;" >
<h5 style="text-align:center;color:aliceblue;">
<a style="font-size:.9em;padding-bottom:40px;padding-top:10px;
min-width:240px;max-width:300px; width:100%"
class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
href="/gsoc/2019">Google SOC 2019</a> </h5>
<div id="gsoc-2019" class="card-content" style="position:relative;" >
<h5 style="text-align:center;color:aliceblue;">
<a style="font-size:.9em;padding-top:5px;padding-bottom:45px;
min-width:240px;max-width:300px; width:100%"
class="waves-effect waves-dark btn white-text darken-2 l5-light-blue z-depth-4"
href="/gsoc/2019"><img style="height:inherit;vertical-align: middle;"
src="/assets/images/buttons/gsoc.svg" />
<span style="position: relative;bottom:-5px;padding-left:.3em;">Google SOC</span></a> </h5>
</div>
<h5 style="text-align:center;color:aliceblue;font-size:1.25em;">
Layer5 community participation in Google Summer of Code 2019.</h5>
Expand Down
18 changes: 18 additions & 0 deletions assets/images/buttons/gsoc.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8b141bd

Please sign in to comment.