luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #1589 from hashicorp/header-fonts 

Header fonts
This commit is contained in:
James Phillips 2016-01-12 13:53:08 -08:00
parent d7e4437645 b161727711
commit 6a31d9d63d
8 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
website/source/assets/images/consul-header-lockup.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
website/source/assets/images/consul-header-lockup@2x.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
website/source/assets/images/wordtype@2x.png (Stored with Git LFS)
View File

Binary file not shown.

17
website/source/assets/stylesheets/_header.scss
View File

@ -21,11 +21,13 @@ body.page-sub{
#header {
.navbar-brand {
.logo{
padding-left: 50px;
width: $project-logo-width;
padding: 0;
line-height: $header-height;
background-position: 0 center;
font-size: 0;
text-transform: uppercase;
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);
@include img-retina("../images/consul-header-lockup.png", "../images/consul-header-lockup@2x.png", $project-logo-width, $project-logo-height);
background-position: 0 center;
&:hover{
@ -53,13 +55,8 @@ body.page-sub{
#header {
.navbar-brand {
.logo{
padding-left: 37px;
@include img-retina("../images/consul-hero-logo.png", "../images/consul-hero-logo@2x.png", $project-logo-width * .75, $project-logo-height * .75);
img{
width: 72px;
height: 14px;
}
width: $project-logo-width * .75;
@include img-retina("../images/consul-header-lockup.png", "../images/consul-header-lockup@2x.png", $project-logo-width * .75, $project-logo-height * .75);
}
}
}

2
website/source/assets/stylesheets/application.scss
View File

@ -3,7 +3,7 @@
@import "bootstrap";
// Remote fonts
@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Open+Sans:300,600");
@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Open+Sans:300,400,600");
// Core variables and mixins
@import "_variables";

4
website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss
View File

@ -92,7 +92,7 @@
}
li > a {
@include hashi-a-style();
margin: 0 10px;
margin: 0 8px;
padding-top: 1px;
line-height: $header-height;
@include project-a-style();
@ -193,7 +193,7 @@
&:hover{
@include transition(all 300ms ease-in);
}
}
}
.svg-bg-line{
@include transition(all 300ms ease-in);

6
website/source/assets/stylesheets/hashicorp-shared/_project-utility.scss
View File

@ -4,14 +4,16 @@
// --------------------------------------------------
// Variables
$project-logo-width: 40px;
$project-logo-width: 147px;
$project-logo-height: 40px;
$project-logo-pad-left: 0px;
$header-height: 80px;
// Mixins
@mixin project-a-style{
font-weight: 300;
font-weight: 400;
opacity: .75;
@include anti-alias();
&:hover{
color: $white;

2
website/source/layouts/_header.erb
View File

@ -31,7 +31,7 @@
<div class="col-xs-12">
<div class="navbar-header">
<div class="navbar-brand">
<a class="logo" href="/"><img src="<%= image_path('wordtype@2x.png') %>" width="96px" height="18px">Consul</a>
<a class="logo" href="/">Consul</a>
<a class="by-hashicorp white" href="https://hashicorp.com/"><span class="svg-wrap">by</span><%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp</a>
</div>
<button class="navbar-toggle white" type="button">