diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb index 983504e8c..b6d014bac 100644 --- a/website/www/source/layouts/layout.erb +++ b/website/www/source/layouts/layout.erb @@ -52,7 +52,7 @@
diff --git a/website/www/source/stylesheets/_header.less b/website/www/source/stylesheets/_header.less index b83d9e6a6..e67f19c97 100644 --- a/website/www/source/stylesheets/_header.less +++ b/website/www/source/stylesheets/_header.less @@ -19,6 +19,10 @@ background: @gray-background; } + .navbar-toggle{ + margin-right: 15px; + } + .navbar-brand { float: left; .logo{ @@ -83,31 +87,54 @@ } .main-links { - li > a { - color: white; + margin-right: 0; - &:hover{ + li { + &.pill{ + background-color: #48b4fb; + border-radius: 25px; + padding: 5px 2px; + line-height: 26px; + margin-top: 22px; + a{ + color: #FFF; + line-height: 24px; + } + } + + > a { color: @project-link-color; + + &:hover{ + color: @black; + } } } } } @media (max-width: 768px) { - #header { - .navbar-brand { + .hidden-xs{ + display: none; + } - } + .navbar-header{ + margin-left: 15px; } } @media (max-width: 414px) { #header { + height: auto; + + .navbar-toggle{ + padding-top: 0; + } + .navbar-brand { .logo{ - padding-left: 37px; - font-size: 18px; - .img-retina('/images/logo-header.png', @project-logo-width * .75, @project-logo-height * .75, no-repeat); + width: @project-logo-width * .75; + background-size: (@project-logo-width * .75) (@project-logo-height * .75); //background-position: 0 45%; } } @@ -115,12 +142,12 @@ } -@media (max-width: 320px) { - #header { - .navbar-brand { - .logo{ - font-size: 0 !important; //hide terraform text - } - } - } -} +// @media (max-width: 320px) { +// #header { +// .navbar-brand { +// .logo{ +// font-size: 0 !important; //hide terraform text +// } +// } +// } +// } diff --git a/website/www/source/stylesheets/_media-queries.less b/website/www/source/stylesheets/_media-queries.less index c39b3cad5..df6891762 100644 --- a/website/www/source/stylesheets/_media-queries.less +++ b/website/www/source/stylesheets/_media-queries.less @@ -1,50 +1,50 @@ @media (max-width: 480px) { - nav { - height: auto; - font-size: 13px; - padding: 10px 0; - .drop-shadow; - - a.vagrant-docs-logo { - background: url(/images/logo_docs_small.png) no-repeat center center !important; - display: inline-block !important; - float: none !important; - position: relative; - width: 200px !important; - left: 50%; - padding: 10px 0; - .reset; - margin-left: -100px !important; - } - - a.vagrant-logo { - background: url(/images/logo_vagrant.png) no-repeat center center !important; - display: inline-block !important; - float: none !important; - position: relative; - width: 80% !important; - left: 50%; - padding: 10px 0; - .reset; - margin-left: -130px !important; - } - - ul { - position: relative; - margin: 0 auto; - width: 100%; - text-align: center; - padding: 10px 0 0; - } - } - - a.brand { - display: none !important; - position: static !important; - width: 200px !important; - margin: 0 0 0 0 !important; - background-position: center center !important; - } + // nav { + // height: auto; + // font-size: 13px; + // padding: 10px 0; + // .drop-shadow; + // + // a.vagrant-docs-logo { + // background: url(/images/logo_docs_small.png) no-repeat center center !important; + // display: inline-block !important; + // float: none !important; + // position: relative; + // width: 200px !important; + // left: 50%; + // padding: 10px 0; + // .reset; + // margin-left: -100px !important; + // } + // + // a.vagrant-logo { + // background: url(/images/logo_vagrant.png) no-repeat center center !important; + // display: inline-block !important; + // float: none !important; + // position: relative; + // width: 80% !important; + // left: 50%; + // padding: 10px 0; + // .reset; + // margin-left: -130px !important; + // } + // + // ul { + // position: relative; + // margin: 0 auto; + // width: 100%; + // text-align: center; + // padding: 10px 0 0; + // } + // } + // + // a.brand { + // display: none !important; + // position: static !important; + // width: 200px !important; + // margin: 0 0 0 0 !important; + // background-position: center center !important; + // } .search { input { diff --git a/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less b/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less index d43bfea73..3c75f5402 100755 --- a/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less +++ b/website/www/source/stylesheets/hashicorp-shared/_hashicorp-header.less @@ -2,6 +2,23 @@ // Hashicorp nav // -------------------------------------------------- +.nav{ + float: left; + margin: 0; + padding: 0; + list-style: none; + + li{ + display: block; + float: left; + + a{ + position: relative; + display: block; + } + } +} + .navigation { color: black; text-rendering: optimizeLegibility; @@ -334,3 +351,10 @@ } } } + + +@media (min-width: 768px){ + .navbar-toggle { + display: none; + } +} diff --git a/website/www/source/stylesheets/hashicorp-shared/_project-utility.less b/website/www/source/stylesheets/hashicorp-shared/_project-utility.less index 03d7eca54..6986d0d68 100755 --- a/website/www/source/stylesheets/hashicorp-shared/_project-utility.less +++ b/website/www/source/stylesheets/hashicorp-shared/_project-utility.less @@ -11,13 +11,15 @@ // Mixins .project-a-style{ - font-weight: 300; - opacity: .75; + font-weight: 600; + font-size: 14px; + letter-spacing: 0; + text-transform: none; color: @project-link-color; + .anti-alias(); &:hover{ - color: $white; - opacity: 1; + color: @black; } }