From 08a199d6d17009a85edc3aaa226845d91079fb36 Mon Sep 17 00:00:00 2001 From: Eric Baum Date: Fri, 9 Dec 2016 23:03:48 +0000 Subject: [PATCH 1/3] Update header Updates header to remove hamburger on desktop, set 100px margin, and adds 100px margin to body. --- _includes/head-header.html | 10 +++++- _sass/_base.sass | 71 ++++++++++++++++++++++++++++++++++++++ _sass/_desktop.sass | 20 +++++++++-- images/search-icon.svg | 13 +++++++ js/script.js | 18 ++++++++++ 5 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 images/search-icon.svg diff --git a/_includes/head-header.html b/_includes/head-header.html index 17a83fa31e..598f6e80fb 100644 --- a/_includes/head-header.html +++ b/_includes/head-header.html @@ -20,8 +20,16 @@
+
- View Documentation + + Try Kubernetes
diff --git a/_sass/_base.sass b/_sass/_base.sass index 635012a39b..7ef5103ff8 100644 --- a/_sass/_base.sass +++ b/_sass/_base.sass @@ -234,6 +234,40 @@ header color: $blue text-decoration: none +// Global Nav - 12/9/2016 Update + +ul.global-nav + display: none + + li + display: inline-block + margin-right: 14px + + a + color: #fff + font-weight: bold + padding: 0 + position: relative + + &.active:after + position: absolute + width: 100% + height: 2px + content: '' + bottom: -4px + left: 0 + background: #fff + + +.flip-nav ul.global-nav li a, +.open-nav ul.global-nav li a, + color: #333 + +.flip-nav ul.global-nav li a.active:after, +.open-nav ul.global-nav li a.active:after, + + background: $blue + // FLIP NAV .flip-nav header @@ -301,6 +335,26 @@ header padding-left: 0 padding-right: 0 margin-bottom: 0 + position: relative + + &.bot-bar:after + display: block + margin-bottom: -20px + height: 8px + width: 100% + background-color: transparentize(white, 0.9) + content: '' + + &.no-sub + + h5 + display: none + + h1 + margin-bottom: 20px + +#home #hero:after + display: none // VENDOR STRIP #vendorStrip @@ -482,6 +536,19 @@ section margin: 0 auto height: 44px line-height: 44px + position: relative + + &:before + position: absolute + width: 15px + height: 15px + content: '' + right: 8px + top: 7px + background-image: url(/images/search-icon.svg) + background-repeat: no-repeat + background-size: 100% 100% + z-index: 1 #search width: 100% @@ -490,6 +557,10 @@ section line-height: 30px font-size: 16px vertical-align: top + background: #fff + border: none + border-radius: 4px + position: relative #encyclopedia diff --git a/_sass/_desktop.sass b/_sass/_desktop.sass index 2e70b23e8a..27fbc46ae1 100644 --- a/_sass/_desktop.sass +++ b/_sass/_desktop.sass @@ -3,6 +3,15 @@ $vendor-strip-height: 44px $video-section-height: 550px @media screen and (min-width: 1025px) + #hamburger + display: none + + ul.global-nav + display: inline-block + + #docs #vendorStrip #searchBox:before + top: 15px + #vendorStrip height: $vendor-strip-height line-height: $vendor-strip-height @@ -40,7 +49,7 @@ $video-section-height: 550px #searchBox float: right - width: 30% + width: 320px #search vertical-align: middle @@ -65,7 +74,7 @@ $video-section-height: 550px #encyclopedia - padding: 50px 50px 20px 20px + padding: 50px 50px 100px 100px clear: both #docsToc @@ -88,6 +97,11 @@ $video-section-height: 550px section, header, footer main max-width: $main-max-width + + header, #vendorStrip, #encyclopedia, #hero h1, #hero h5, #docs #hero h1, #docs #hero h5, + #community #hero h1, .gridPage #hero h1, #community #hero h5, .gridPage #hero h5 + padding-left: 100px + padding-right: 100px #home section, header, footer @@ -276,7 +290,7 @@ $video-section-height: 550px text-align: left h1 - padding: 20px + padding: 20px 100px #tryKubernetes width: auto diff --git a/images/search-icon.svg b/images/search-icon.svg new file mode 100644 index 0000000000..285f57caff --- /dev/null +++ b/images/search-icon.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/js/script.js b/js/script.js index 22eff0a1b4..b944d91175 100755 --- a/js/script.js +++ b/js/script.js @@ -503,3 +503,21 @@ var pushmenu = (function(){ show: show }; })(); + +$(function() { + + // Make global nav be active based on pathname + if ((location.pathname.split("/")[1]) !== ""){ + $('.global-nav li a[href^="/' + location.pathname.split("/")[1] + '"]').addClass('active'); + } + + // If vendor strip doesn't exist add className + if ( !$('#vendorStrip').length > 0 ) { + $('#hero').addClass('bot-bar'); + } + + // If is not homepage add class to hero section + if (!$('#home').length > 0 ) { + $('#hero').addClass('no-sub'); + } +}); \ No newline at end of file From b43e72124ff656e54321d65ea18e3783c3800f82 Mon Sep 17 00:00:00 2001 From: Eric Baum Date: Tue, 13 Dec 2016 21:37:53 +0000 Subject: [PATCH 2/3] Updates logo --- images/nav_logo.svg | 111 ++++++++++++++++++++++++++++++++++++++++++- images/nav_logo2.svg | 109 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 218 insertions(+), 2 deletions(-) diff --git a/images/nav_logo.svg b/images/nav_logo.svg index 666997a143..982c04f4aa 100644 --- a/images/nav_logo.svg +++ b/images/nav_logo.svg @@ -1 +1,110 @@ - \ No newline at end of file + + + + +Kubernetes_Logo_Hrz_lockup_REV + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/nav_logo2.svg b/images/nav_logo2.svg index 1c88bd436a..92b8d19ac4 100644 --- a/images/nav_logo2.svg +++ b/images/nav_logo2.svg @@ -1 +1,108 @@ - \ No newline at end of file + + + + +Kubernetes_Logo_Hrz_lockup_POS + + + + + + + + + + + + + + + + + + + + + From 47a75ca01181fccaeeb1e4baefb8e39e88e964de Mon Sep 17 00:00:00 2001 From: Eric Baum Date: Wed, 14 Dec 2016 00:54:21 +0000 Subject: [PATCH 3/3] Minor header change Change "Try Kubernetes" link point to /docs/tutorials/kubernetes-basics/ instead of "Hello Node" Reduce font weight in links across the top. --- _includes/head-header.html | 2 +- _sass/_base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/head-header.html b/_includes/head-header.html index 598f6e80fb..bb8d1e7f77 100644 --- a/_includes/head-header.html +++ b/_includes/head-header.html @@ -30,7 +30,7 @@
  • Case Studies
    • - Try Kubernetes + Try Kubernetes diff --git a/_sass/_base.sass b/_sass/_base.sass index 7ef5103ff8..27d19a0fd3 100644 --- a/_sass/_base.sass +++ b/_sass/_base.sass @@ -245,7 +245,7 @@ ul.global-nav a color: #fff - font-weight: bold + font-weight: 400 padding: 0 position: relative