From d083c1c651d02cd080a321f5ce2a934063a54905 Mon Sep 17 00:00:00 2001 From: captainill Date: Fri, 6 Nov 2015 23:38:43 -0800 Subject: [PATCH] most styles --- .../assets/images/logo-header-gradient@2x.png | 3 +++ ...consul-header-logo.png => logo-header.png} | 0 ...-header-logo@2x.png => logo-header@2x.png} | 0 website/source/assets/images/wordtype@2x.png | 3 +++ .../source/assets/stylesheets/_header.scss | 25 ++++++------------- .../assets/stylesheets/application.scss | 2 +- .../hashicorp-shared/_project-utility.scss | 4 +-- website/source/layouts/_header.erb | 2 +- website/source/layouts/_sidebar.erb | 2 +- 9 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 website/source/assets/images/logo-header-gradient@2x.png rename website/source/assets/images/{consul-header-logo.png => logo-header.png} (100%) rename website/source/assets/images/{consul-header-logo@2x.png => logo-header@2x.png} (100%) create mode 100644 website/source/assets/images/wordtype@2x.png diff --git a/website/source/assets/images/logo-header-gradient@2x.png b/website/source/assets/images/logo-header-gradient@2x.png new file mode 100644 index 000000000..d6851ed91 --- /dev/null +++ b/website/source/assets/images/logo-header-gradient@2x.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eba8da49f52ceabafe49d8ca3b40ddfbdcd1d0b69572e0cc8351be95d9ae8fb +size 3994 diff --git a/website/source/assets/images/consul-header-logo.png b/website/source/assets/images/logo-header.png similarity index 100% rename from website/source/assets/images/consul-header-logo.png rename to website/source/assets/images/logo-header.png diff --git a/website/source/assets/images/consul-header-logo@2x.png b/website/source/assets/images/logo-header@2x.png similarity index 100% rename from website/source/assets/images/consul-header-logo@2x.png rename to website/source/assets/images/logo-header@2x.png diff --git a/website/source/assets/images/wordtype@2x.png b/website/source/assets/images/wordtype@2x.png new file mode 100644 index 000000000..f40b9fdfd --- /dev/null +++ b/website/source/assets/images/wordtype@2x.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:053291a8f50011e743f18b9aefc76fd876809ec4b182a4e34f70027a194a0065 +size 2141 diff --git a/website/source/assets/stylesheets/_header.scss b/website/source/assets/stylesheets/_header.scss index 6c60e2a9a..13860a090 100755 --- a/website/source/assets/stylesheets/_header.scss +++ b/website/source/assets/stylesheets/_header.scss @@ -14,15 +14,6 @@ body.page-sub{ color: $black; } } - .by{ - &:hover{ - svg{ - line{ - stroke: $black; - } - } - } - } } } } @@ -30,14 +21,14 @@ body.page-sub{ #header { .navbar-brand { .logo{ - font-size: 20px; + font-size: 0; text-transform: uppercase; - background: image-url('../images/logo-header.png') 0 0 no-repeat; - @include img-retina("../images/logo-header.png", "../images/logo-header@2x.png", $project-logo-width, $project-logo-height); - background-position: 0 45%; + background: image-url('../images/consul-hero-logo.png') 0 0 no-repeat; + @include img-retina("../images/consul-hero-logo.png", "../images/consul-hero-logo@2x.png", $project-logo-width, $project-logo-height); + background-position: 0 center; &:hover{ - color: $purple; + opacity: .4; } } @@ -46,7 +37,7 @@ body.page-sub{ &:hover{ svg{ line{ - stroke: $purple; + opacity: .4; } } } @@ -84,7 +75,7 @@ body.page-sub{ .navbar-brand { .logo{ padding-left: 37px; - font-size: 18px; + //font-size: 18px; @include img-retina("../images/logo-header.png", "../images/logo-header@2x.png", $project-logo-width * .75, $project-logo-height * .75); //background-position: 0 45%; } @@ -97,7 +88,7 @@ body.page-sub{ #header { .navbar-brand { .logo{ - font-size: 0 !important; //hide terraform text + } } } diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index de09ab0b6..ab3c41d99 100644 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -18,8 +18,8 @@ @import "_global"; // Hashicorp Shared Project Styles -@import 'hashicorp-shared/_project-utility'; @import 'hashicorp-shared/_hashicorp-utility'; +@import 'hashicorp-shared/_project-utility'; @import 'hashicorp-shared/_hashicorp-header'; @import 'hashicorp-shared/_hashicorp-sidebar'; diff --git a/website/source/assets/stylesheets/hashicorp-shared/_project-utility.scss b/website/source/assets/stylesheets/hashicorp-shared/_project-utility.scss index 163552369..f475f518a 100755 --- a/website/source/assets/stylesheets/hashicorp-shared/_project-utility.scss +++ b/website/source/assets/stylesheets/hashicorp-shared/_project-utility.scss @@ -4,8 +4,8 @@ // -------------------------------------------------- // Variables -$project-logo-width: 40px; -$project-logo-height: $project-logo-width; +$project-logo-width: 50px; +$project-logo-height: 50px; $project-logo-pad-left: 8px; // Mixins diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index b07505bf8..080473f17 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -31,7 +31,7 @@
- + by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp