status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix consul logo position in safari

This commit is contained in:
captainill 2016-01-12 11:58:30 -08:00
parent b3087808ab
commit 8bd56dd3be
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
website/source/assets/images/consul-header-lockup.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
website/source/assets/images/consul-header-lockup@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
website/source/assets/images/wordtype@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

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

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

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

@ -92,7 +92,7 @@
} }
li > a { li > a {
@include hashi-a-style(); @include hashi-a-style();
margin: 0 10px; margin: 0 8px;
padding-top: 1px; padding-top: 1px;
line-height: $header-height; line-height: $header-height;
@include project-a-style(); @include project-a-style();

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

@ -4,9 +4,10 @@
// -------------------------------------------------- // --------------------------------------------------
// Variables // Variables
$project-logo-width: 40px; $project-logo-width: 147px;
$project-logo-height: 40px; $project-logo-height: 40px;
$project-logo-pad-left: 0px; $project-logo-pad-left: 0px;
$header-height: 80px;
// Mixins // Mixins
@mixin project-a-style{ @mixin project-a-style{

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

@ -31,7 +31,7 @@
<div class="col-xs-12"> <div class="col-xs-12">
<div class="navbar-header"> <div class="navbar-header">
<div class="navbar-brand"> <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> <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> </div>
<button class="navbar-toggle white" type="button"> <button class="navbar-toggle white" type="button">