CSS Changes (istio#39)

* clean up mistaken merge with istio code repo

* delete HEAD indicator left in scss files by mistake

* more fixes for bad merge

* more undo-ing

Author: davetropeano

.gitignore

@@ -0,0 +1,7 @@
+_site
+
+# Eclipse artifacts
+.project
+.pydevproject
+*.iml
+.idea/

Gemfile.lock

@@ -1,129 +1,203 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.1)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    blankslate (2.1.2.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    colorator (0.1)
-    execjs (2.5.2)
-    fast-stemmer (1.0.2)
-    ffi (1.9.8)
-    gemoji (2.1.0)
-    github-pages (34)
-      RedCloth (= 4.2.9)
-      github-pages-health-check (~> 0.2)
-      jekyll (= 2.4.0)
+    coffee-script-source (1.12.2)
+    colorator (1.1.0)
+    ethon (0.10.1)
+      ffi (>= 1.3.0)
+    execjs (2.7.0)
+    faraday (0.12.0.1)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    gemoji (3.0.0)
+    github-pages (134)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.3.3)
+      jekyll (= 3.4.3)
+      jekyll-avatar (= 0.4.2)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-mentions (= 0.2.1)
-      jekyll-redirect-from (= 0.6.2)
-      jekyll-sass-converter (= 1.2.0)
-      jekyll-sitemap (= 0.8.1)
-      jemoji (= 0.4.0)
-      kramdown (= 1.5.0)
-      liquid (= 2.6.1)
-      maruku (= 0.7.0)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.9.2)
+      jekyll-gist (= 1.4.0)
+      jekyll-github-metadata (= 2.3.1)
+      jekyll-mentions (= 1.2.0)
+      jekyll-optional-front-matter (= 0.1.2)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.1.0)
+      jekyll-redirect-from (= 0.12.1)
+      jekyll-relative-links (= 0.4.0)
+      jekyll-sass-converter (= 1.5.0)
+      jekyll-seo-tag (= 2.2.0)
+      jekyll-sitemap (= 1.0.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.0.4)
+      jekyll-theme-cayman (= 0.0.4)
+      jekyll-theme-dinky (= 0.0.4)
+      jekyll-theme-hacker (= 0.0.4)
+      jekyll-theme-leap-day (= 0.0.4)
+      jekyll-theme-merlot (= 0.0.4)
+      jekyll-theme-midnight (= 0.0.4)
+      jekyll-theme-minimal (= 0.0.4)
+      jekyll-theme-modernist (= 0.0.4)
+      jekyll-theme-primer (= 0.1.8)
+      jekyll-theme-slate (= 0.0.4)
+      jekyll-theme-tactile (= 0.0.4)
+      jekyll-theme-time-machine (= 0.0.4)
+      jekyll-titles-from-headings (= 0.1.5)
+      jemoji (= 0.8.0)
+      kramdown (= 1.13.2)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
       mercenary (~> 0.3)
-      pygments.rb (= 0.6.1)
-      rdiscount (= 2.1.7)
-      redcarpet (= 3.1.2)
+      minima (= 2.0.0)
+      rouge (= 1.11.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (0.3.0)
-      net-dns (~> 0.6)
-      public_suffix (~> 1.4)
-    hitimes (1.2.2)
-    html-pipeline (1.9.0)
+    github-pages-health-check (1.3.3)
+      addressable (~> 2.3)
+      net-dns (~> 0.8)
+      octokit (~> 4.0)
+      public_suffix (~> 2.0)
+      typhoeus (~> 0.7)
+    html-pipeline (2.5.0)
       activesupport (>= 2)
-      nokogiri (~> 1.4)
-    i18n (0.7.0)
-    jekyll (2.4.0)
-      classifier-reborn (~> 2.0)
-      colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
+      nokogiri (>= 1.4)
+    i18n (0.8.1)
+    jekyll (3.4.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
+    jekyll-avatar (0.4.2)
+      jekyll (~> 3.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-gist (1.2.1)
-    jekyll-mentions (0.2.1)
-      html-pipeline (~> 1.9.0)
-      jekyll (~> 2.0)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.9.2)
+      jekyll (~> 3.3)
+    jekyll-gist (1.4.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.3.1)
+      jekyll (~> 3.1)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.1.0)
+      jekyll (~> 3.3)
+    jekyll-mentions (1.2.0)
+      activesupport (~> 4.0)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.1.2)
+      jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.6.2)
-      jekyll (~> 2.0)
-    jekyll-sass-converter (1.2.0)
-      sass (~> 3.2)
-    jekyll-sitemap (0.8.1)
-    jekyll-watch (1.2.1)
-      listen (~> 2.7)
-    jemoji (0.4.0)
-      gemoji (~> 2.0)
-      html-pipeline (~> 1.9)
-      jekyll (~> 2.0)
-    json (1.8.2)
-    kramdown (1.5.0)
-    liquid (2.6.1)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    jekyll-readme-index (0.1.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.12.1)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.4.0)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.2.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.0.0)
+      jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-cayman (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-dinky (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-hacker (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-leap-day (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-merlot (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-midnight (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-minimal (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-modernist (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-primer (0.1.8)
+      jekyll (~> 3.3)
+    jekyll-theme-slate (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-tactile (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-theme-time-machine (0.0.4)
+      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.1.5)
+      jekyll (~> 3.3)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.8.0)
+      activesupport (~> 4.0)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
+    json (1.8.6)
+    kramdown (1.13.2)
+    liquid (3.0.6)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    maruku (0.7.0)
-    mercenary (0.3.5)
-    mini_portile (0.6.2)
-    minitest (5.6.1)
+      rb-inotify (>= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minima (2.0.0)
+    minitest (5.10.1)
+    multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    public_suffix (1.5.1)
-    pygments.rb (0.6.1)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7)
-    redcarpet (3.1.2)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.4.13)
-    terminal-table (1.4.5)
-    thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    tzinfo (1.2.2)
+    sass (3.4.23)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    yajl-ruby (1.2.1)
+    unicode-display_width (1.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   github-pages
+  jekyll-include-cache (~> 0.1)
 
 BUNDLED WITH
-   1.10.5
+   1.14.6

README.md

@@ -9,3 +9,9 @@ see the Istio [contribution guidelines](https://github.com/istio/istio/blob/mast
 
 The website uses [Jekyll](http://jekyllrb.com/) templates and is hosted on GitHub Pages. Please make sure you are
 familiar with these before editing.
+
+To run the site locally with Docker, use the following command:
+
+```bash
+docker run --rm --label=jekyll --volume=$(pwd):/srv/jekyll  -it -p 127.0.0.1:4000:4000 jekyll/jekyll jekyll serve
+```

_includes/doc-nav.html

@@ -1,18 +1,13 @@
 <div class="container">
 	<div class="row">
-		<div class="col-md-11 nofloat center-block">
-			<ul class="col-sm-10 doc-nav">
-				{% assign current = page.url | downcase | split: '/' %}
-				<li class="tab docs-tab"><a href="{{ site.baseurl }}/docs/">Docs</a></li>
-				<span class="doc-caret">></span>
-				<li class="tab"><a href="{{ site.baseurl }}/docs/" {% if page.url == '/docs/' %}class='current'{% endif %}>Home</a></li>
-				<li class="tab"><a href="{{ site.baseurl }}/docs/concepts" {% if current[2] == 'concepts' %}class='current'{% endif %}>Concepts</a></li>
-				<li class="tab"><a href="{{ site.baseurl }}/docs/tasks" {% if current[2] == 'tasks' %}class='current'{% endif %}>Tasks</a></li>
-				<!--
-				<li class="tab"><a href="{{ site.baseurl }}/docs/tutorials" {% if current[2] == 'tutorials' %}class='current'{% endif %}>Tutorials</a></li>
-				-->
-				<li class="tab"><a href="{{ site.baseurl }}/docs/samples" {% if current[2] == 'samples' %}class='current'{% endif %}>Samples</a></li>
-				<li class="tab"><a href="{{ site.baseurl }}/docs/reference" {% if current[2] == 'reference' %}class='current'{% endif %}>Reference</a></li>
+		<div class="col-md-11 nofloat center-block" style="margin-top: 3px;">
+			<ul class="col-sm-10 nav nav-tabs">
+				{% assign active = page.url | downcase | split: '/' %}
+				<li role="presentation" {% if page.url == '/docs/' %}class='active'{% endif %}><a href="{{ site.baseurl }}/docs/">Welcome</a></li>
+				<li role="presentation" {% if active[2] == 'concepts' %}class='active'{% endif %}><a href="{{ site.baseurl }}/docs/concepts">Concepts</a></li>
+				<li role="presentation" {% if active[2] == 'tasks' %}class='active'{% endif %}><a href="{{ site.baseurl }}/docs/tasks">Tasks</a></li>
+				<li role="presentation" {% if active[2] == 'samples' %}class='active'{% endif %}><a href="{{ site.baseurl }}/docs/samples">Samples</a></li>
+				<li role="presentation" {% if active[2] == 'reference' %}class='active'{% endif %}><a href="{{ site.baseurl }}/docs/reference">Reference</a></li>
 			 </ul>
 			 {% include contribute-links.html %}
 		</div>

_includes/doc-side-home-nav.html

@@ -1,3 +1,4 @@
 <ul class="doc-side-nav doc-side-nav-home">
 	{% assign current = page.url | downcase | split: '/' %}
+	<li><h5 class="doc-side-nav-title">Welcome</h5></li>
 </ul>

_includes/sticky-nav.html

@@ -4,6 +4,7 @@
       <div class="col-md-11 nofloat center-block">
         <a class="col-xs-2" href="{{ site.baseurl }}/">
           <img class="nav-logo" src="{{ site.baseurl }}/img/logo.png" alt="Istio">
+          <span class="page-headline">Istio</span>
         </a>
 
         <div class="col-xs-2 col-xs-offset-8">

_layouts/docs.html

@@ -18,7 +18,7 @@
                         {{ content }}
                     </div>
 
-                    <div id="toc" class="toc col-sm-2">
+                    <div id="toc" class="toc">
                     </div>
                 </div>
             </div>

_sass/base/_common.scss

@@ -33,20 +33,24 @@
   border-left: 2px solid $light-gray;
   display: none !important;
   padding: 0;
+  position: absolute;
+  right: 45px;
+  margin-top: 10px;
 
   @media (min-width: 768px) {
       display: block !important;
+      margin-left: 20px;
   }
 
   ul {
     list-style-type: none !important;
     padding-left: 10px;
-    font-size: 12px;
-    font-weight: 500;
+    font-size: 90%; //12px;
+    //font-weight: 500;
 
     ul {
-        font-weight: 400;
-        font-size: 11px;
+        //font-weight: 400;
+        font-size: 90%; //11px;
     }
 
     a {