Skip to content

Commit

Permalink
Merge pull request TryGhost#188 from PaulAdamDavis/menu-icon
Browse files Browse the repository at this point in the history
Add menu icon to icon font
  • Loading branch information
novaugust committed Mar 23, 2015
2 parents acc6896 + b071548 commit e587980
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 9 deletions.
19 changes: 15 additions & 4 deletions assets/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ table { border-collapse: collapse; border-spacing: 0; }
.icon-link:before {
content: "\f608";
}
.icon-menu:before {
content: "\f609";
}


/* ==========================================================================
Expand Down Expand Up @@ -792,12 +795,17 @@ body.nav-opened .nav {
background: rgba(0,0,0,0.1);
transition: all 0.5s ease;
}
.menu-button:focus {
outline: 0;
}
.menu-button .burger {
.menu-button:before {
font-size: 12px;
font-weight: bold;
margin-right: 6px;
color: #fff !important;
position: relative;
top: 1px;
transition: all 0.5s ease;
}
.menu-button:focus {
outline: 0;
}

body.nav-opened .menu-button {
Expand Down Expand Up @@ -843,6 +851,9 @@ body.nav-opened .menu-button .word {
border-color: #fff;
background: #fff;
}
.main-nav.overlay a:hover:before {
color: #222;
}

/* Add a border to the buttons on hover */
.menu-button:hover {
Expand Down
Binary file modified assets/fonts/casper-icons.eot
Binary file not shown.
1 change: 1 addition & 0 deletions assets/fonts/casper-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/fonts/casper-icons.ttf
Binary file not shown.
Binary file modified assets/fonts/casper-icons.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion author.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<nav class="main-nav overlay clearfix">
{{#if @blog.logo}}<a class="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
{{#if @blog.navigation}}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
<a class="menu-button icon-menu" href="#"><span class="word">Menu</span></a>
{{/if}}
</nav>
</header>
Expand Down
2 changes: 1 addition & 1 deletion index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<nav class="main-nav overlay clearfix">
{{#if @blog.logo}}<a class="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
{{#if @blog.navigation}}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
<a class="menu-button icon-menu" href="#"><span class="word">Menu</span></a>
{{/if}}
</nav>
<div class="vertical">
Expand Down
2 changes: 1 addition & 1 deletion page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nav class="main-nav {{#if image}}overlay{{/if}} clearfix">
{{#if @blog.logo}}<a class="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
{{#if @blog.navigation}}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
<a class="menu-button icon-menu" href="#"><span class="word">Menu</span></a>
{{/if}}
</nav>
</header>
Expand Down
2 changes: 1 addition & 1 deletion post.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<nav class="main-nav {{#if image}}overlay{{/if}} clearfix">
{{#if @blog.logo}}<a class="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
{{#if @blog.navigation}}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
<a class="menu-button icon-menu" href="#"><span class="word">Menu</span></a>
{{/if}}
</nav>
</header>
Expand Down
2 changes: 1 addition & 1 deletion tag.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<nav class="main-nav overlay clearfix">
{{#if @blog.logo}}<a class="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
{{#if @blog.navigation}}
<a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
<a class="menu-button icon-menu" href="#"><span class="word">Menu</span></a>
{{/if}}
</nav>
<div class="vertical">
Expand Down

0 comments on commit e587980

Please sign in to comment.