Skip to content

Commit

Permalink
Add blog logo
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Dec 29, 2015
1 parent ac9f21b commit 944b534
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 90 deletions.
26 changes: 0 additions & 26 deletions assets/scss/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -920,32 +920,6 @@ pre[class*="language-"] {
}
}

a.ghost-logo.animated-logo {
background: url('/assets/images/logo.png');
left: 7px;
top: 7px;
width: 30px;
background-size: 30px, cover;
background-repeat: no-repeat;
display: none;

@include breakpoint(660px) {
display: inline;
}
}

.ghost-logo {
&:before {
content: '';
}

&:after {
content: $blog-name;
font-size: 1.6rem;
margin-left: 10px;
}
}

#global-footer .poweredby a {
text-decoration: underline;
}
Expand Down
4 changes: 2 additions & 2 deletions assets/scss/itch.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

/* Basic */
@import 'reset';
@import 'variables';
@import 'mixins';
@import 'theme';
@import 'reset';
@import 'mixins';
@import 'global';

/* Customize */
Expand Down
70 changes: 14 additions & 56 deletions assets/scss/reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ nav li a:before {
margin-right: 1em;
}

.ghost-logo {
.blog-logo {
box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
Expand All @@ -506,84 +506,42 @@ nav li a:before {
height: 30px;
width: 30px;
background: #242628;
color: rgba(220, 240, 240, 0.7);
color: $blog-logo-color;
text-align: center;
transition: all 0.15s ease;
-moz-transition: all 0.15s ease;
transition: all 0.15s ease;
border-radius: 2px;
}

.ghost-logo:before {
font-family: "Icons";
font-weight: normal;
font-style: normal;
vertical-align: -7%;
text-transform: none;
speak: none;
line-height: 1;
font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
content: "\e01d";
position: absolute;
top: 10px;
left: 10px;
}

.ghost-logo:hover {
text-decoration: none;
}

.ghost-logo:after {
font-family: "Icons";
font-weight: normal;
font-style: normal;
.blog-logo img {
vertical-align: -7%;
text-transform: none;
speak: none;
line-height: 1;
font-smoothing: antialiased;
content: "\e01e";
font-size: 20px;
color: white;
position: absolute;
top: 5px;
left: 26px;
opacity: 0;
top: 4px;
left: 4px;
max-width: 22px;
}

.ghost-logo:hover {
text-decoration: none;
}

.ghost-logo span {
display: none;
}

.ghost-logo:hover {
width: 81px;
text-decoration: none;
transition: width 0.25s ease 0.1s;
-moz-transition: width 0.25s ease 0.1s;
transition: width 0.25s ease 0.1s;
}

.ghost-logo:hover:after {
opacity: 1;
}

.global-header {
position: relative;
min-height: 80px;
}

.nav-current {
font-weight: bold;
}

@media (max-width: 800px), (max-width: 800px) {
.global-header {
min-height: 44px;
}
}

.global-header .ghost-logo {
.global-header .blog-logo {
position: absolute;
top: 15px;
left: 15px;
Expand All @@ -593,14 +551,14 @@ nav li a:before {
}

@media (max-width: 800px), (max-width: 800px) {
.global-header .ghost-logo {
.global-header .blog-logo {
top: 7px;
left: 7px;
}
}

@media (max-width: 660px), (max-width: 660px) {
.global-header .ghost-logo {
.global-header .blog-logo {
width: 81px;
background: transparent;
color: rgba(60, 80, 90, 0.7);
Expand All @@ -613,7 +571,7 @@ nav li a:before {
border-radius: 0;
}

.global-header .ghost-logo:after {
.global-header .blog-logo:after {
color: #242628;
opacity: 1;
}
Expand Down
6 changes: 3 additions & 3 deletions assets/scss/theme.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

$blog-name : 'Zombeats';

$subscribe-banner-color : $green;
$selection-color : lighten($orange, 36%);
$tag-color : rgba($orange, .7);

$feature-one-color : $green;
$feature-two-color : $blue;

$link-hover-color : $blue;
$link-hover-color : $blue;

$blog-logo-color : rgba(220, 240, 240, 0.7);

$header-color : #303538;

Expand Down
4 changes: 1 addition & 3 deletions partials/navigation.hbs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<nav role="navigation">
<div class="wrapper">
<a class="ghost-logo animated-logo" href="/" >
<span>CWMarMenor</span>
</a>
<a class="blog-logo" href="/"><img src="assets/images/favicon-32x32.png" alt="placeholder+image"></a>
<button type="button" class="mobile-menu" data-toggle="collapse" data-target=".navbar-collapse">
<span class="hidden">Menu</span>
</button>
Expand Down

0 comments on commit 944b534

Please sign in to comment.