From e96a22bd6d407ff2c898d08eee0186adad500654 Mon Sep 17 00:00:00 2001 From: Fintan Ryan Date: Fri, 29 May 2015 15:16:50 +0100 Subject: [PATCH] Docs look and feel update --- site/Gemfile.lock | 70 +++++ site/_config.yml | 3 + site/_includes/footer.html | 58 ++++ site/_includes/header-navbaronly.html | 23 ++ site/_includes/tracking.html | 12 + site/_layouts/default.html | 59 ++-- site/images/blacktocat.png | Bin 1428 -> 0 bytes site/javascripts/main.js | 1 - site/stylesheets/pygment_trac.css | 70 ----- site/stylesheets/stylesheet.css | 431 -------------------------- 10 files changed, 196 insertions(+), 531 deletions(-) create mode 100644 site/Gemfile.lock create mode 100644 site/_includes/footer.html create mode 100644 site/_includes/header-navbaronly.html create mode 100644 site/_includes/tracking.html delete mode 100644 site/images/blacktocat.png delete mode 100644 site/javascripts/main.js delete mode 100644 site/stylesheets/pygment_trac.css delete mode 100644 site/stylesheets/stylesheet.css diff --git a/site/Gemfile.lock b/site/Gemfile.lock new file mode 100644 index 00000000..631ca428 --- /dev/null +++ b/site/Gemfile.lock @@ -0,0 +1,70 @@ +GEM + remote: https://rubygems.org/ + specs: + blankslate (2.1.2.4) + celluloid (0.16.0) + timers (~> 4.0.0) + classifier-reborn (2.0.3) + fast-stemmer (~> 1.0) + coffee-script (2.3.0) + coffee-script-source + execjs + coffee-script-source (1.9.1) + colorator (0.1) + execjs (2.3.0) + fast-stemmer (1.0.2) + ffi (1.9.6) + hitimes (1.2.2) + jekyll (2.5.3) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-gist (1.1.0) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-watch (1.2.1) + listen (~> 2.7) + kramdown (1.5.0) + liquid (2.6.2) + listen (2.8.5) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + mercenary (0.3.5) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.10) + pygments.rb (0.6.2) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + redcarpet (3.2.2) + safe_yaml (1.0.4) + sass (3.4.13) + timers (4.0.1) + hitimes + toml (0.1.2) + parslet (~> 1.5.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll diff --git a/site/_config.yml b/site/_config.yml index 1d373602..50f2974d 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -8,3 +8,6 @@ exclude: - 'Gemfile.lock' - 'params.json' - 'build-and-publish.sh' + +google: + analytics: "UA-57286487-1" diff --git a/site/_includes/footer.html b/site/_includes/footer.html new file mode 100644 index 00000000..ad664672 --- /dev/null +++ b/site/_includes/footer.html @@ -0,0 +1,58 @@ + + +
+
+
+ Company
+ About Weave
+ + + Blog
+
+ Community
+ Partners
+ Code
+
+
+ Documentation
+ Docs
+ Getting Started Guides
+ Help and Support
+ Blog
+
+
+ Get in Touch
+ help@weave.works
+ Twitter
+ Github
+ Linkedin
+ GooglePlus
+
+
+
+
+
+
+

© Weaveworks 2014 ‐ 2015

+
+
+
+ + + + + diff --git a/site/_includes/header-navbaronly.html b/site/_includes/header-navbaronly.html new file mode 100644 index 00000000..cd9b4c60 --- /dev/null +++ b/site/_includes/header-navbaronly.html @@ -0,0 +1,23 @@ +
+ +
diff --git a/site/_includes/tracking.html b/site/_includes/tracking.html new file mode 100644 index 00000000..eaeac412 --- /dev/null +++ b/site/_includes/tracking.html @@ -0,0 +1,12 @@ +{% if site.google.analytics %} + +{% endif %} diff --git a/site/_layouts/default.html b/site/_layouts/default.html index 67ee8d50..2071fd1b 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -1,43 +1,44 @@ - - - - weave {% if page.title %} | {{ page.title }} {% endif %} - + + + + + + + + + + + + + + + + + + {% include tracking.html %} + + - -
-
- View on GitHub + {% include header-navbaronly.html %} -

weave

-

The Docker Network

- -
-
- - -
-
+
+
{{ content }} -
+ +

+ {% include footer.html %} - -

- - - - + diff --git a/site/images/blacktocat.png b/site/images/blacktocat.png deleted file mode 100644 index 6e264fe57a2e35a2855405ac7d4102c3f6ddcdae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1428 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=eg`=5?o13Glvx}*rp{t>#shg3DvyriZv5}jZ ztD`wguSMv>2~2MaLa!4}y`ZF!TL84#CABECEH%ZgC_h&L>}9J=EN(GzcCm0X zaRr%YgxxI=y(w7S0@dq`Q?EYIG5Vm0MT%&c5HR(CnDAr^T6f1avxRvmvnsN+?-j}Z~1)Zr#rqzrt`edmo44*B<0=C4>mrxHF6$p zVws~UocMfeI`gB8pYMLYTzA87`NOI2w2B*JM5L`^AkN4AFQu&S+6ULTPjv;vzl4& z-eaK_F|D4~l3hzBSF~icNT@MID=v+_X`vpuvf=8+S(|^vlRdHe0<)v-^wiVR3w=TQ)uFA9F z>vmq