Commit 4c0f8d27 authored by Daniel Shumway's avatar Daniel Shumway

Merge branch 'develop' into 'master'

style: Fix site logo

See merge request !47
parents d4048b8f ede5acbc
Pipeline #35881690 (#129) passed with stages
in 2 minutes and 20 seconds
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -180,7 +180,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -45,7 +45,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -45,7 +45,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -45,7 +45,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -45,7 +45,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
......@@ -5,7 +5,7 @@
<link>https://danshumway.com</link>
<description>I build things on the Internet, and I post about them here.</description>
<atom:link href="https://danshumway.com/rss.xml" rel="self" type="application/rss+xml" />
<lastBuildDate>Thu, 08 Nov 2018 06:19:59 GMT</lastBuildDate><item>
<lastBuildDate>Thu, 08 Nov 2018 13:35:02 GMT</lastBuildDate><item>
<title>Disclosing Multiple Gamasutra Vulnerabilities</title>
<link>https://danshumway.com/blog/gamasutra-vulnerabilities</link>
<guid>https://danshumway.com/blog/gamasutra-vulnerabilities</guid>
......
......@@ -68,32 +68,34 @@ header {
padding: 0;
list-style: none;
padding-left: 0.5em; }
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto; }
header nav ul {
display: flex;
flex-direction: row;
align-items: baseline; }
header nav ul .site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal;
font-family: 'Stalemate'; }
header nav ul .site-logo img {
width: 4rem;
bottom: -0.75rem;
position: relative; }
header nav ul .site-logo::after {
/*content: ':';*/
/* For eventual nav */
/*margin-right: 0.25em;*/ }
header nav ul .resume {
margin-left: auto;
padding-right: 5em; }
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto; }
header nav ul {
display: flex;
flex-direction: row;
align-items: baseline;
padding-bottom: 0.75rem; }
header nav ul .site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal; }
header nav ul .site-logo img {
height: 5rem;
bottom: -0.75rem;
position: relative; }
header nav ul .site-logo .name {
font-size: 0;
color: transparent; }
header nav ul .site-logo::after {
/*content: ':';*/
/* For eventual nav */
/*margin-right: 0.25em;*/ }
header nav ul .resume {
margin-left: auto;
padding-right: 5em; }
main {
max-width: 80rem;
......
......@@ -110,32 +110,34 @@ header {
padding: 0;
list-style: none;
padding-left: 0.5em; }
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto; }
header nav ul {
display: flex;
flex-direction: row;
align-items: baseline; }
header nav ul .site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal;
font-family: 'Stalemate'; }
header nav ul .site-logo img {
width: 4rem;
bottom: -0.75rem;
position: relative; }
header nav ul .site-logo::after {
/*content: ':';*/
/* For eventual nav */
/*margin-right: 0.25em;*/ }
header nav ul .resume {
margin-left: auto;
padding-right: 5em; }
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto; }
header nav ul {
display: flex;
flex-direction: row;
align-items: baseline;
padding-bottom: 0.75rem; }
header nav ul .site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal; }
header nav ul .site-logo img {
height: 5rem;
bottom: -0.75rem;
position: relative; }
header nav ul .site-logo .name {
font-size: 0;
color: transparent; }
header nav ul .site-logo::after {
/*content: ':';*/
/* For eventual nav */
/*margin-right: 0.25em;*/ }
header nav ul .resume {
margin-left: auto;
padding-right: 5em; }
main {
max-width: 80rem;
......
......@@ -130,32 +130,34 @@ header {
padding: 0;
list-style: none;
padding-left: 0.5em; }
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto; }
header nav ul {
display: flex;
flex-direction: row;
align-items: baseline; }
header nav ul .site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal;
font-family: 'Stalemate'; }
header nav ul .site-logo img {
width: 4rem;
bottom: -0.75rem;
position: relative; }
header nav ul .site-logo::after {
/*content: ':';*/
/* For eventual nav */
/*margin-right: 0.25em;*/ }
header nav ul .resume {
margin-left: auto;
padding-right: 5em; }
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto; }
header nav ul {
display: flex;
flex-direction: row;
align-items: baseline;
padding-bottom: 0.75rem; }
header nav ul .site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal; }
header nav ul .site-logo img {
height: 5rem;
bottom: -0.75rem;
position: relative; }
header nav ul .site-logo .name {
font-size: 0;
color: transparent; }
header nav ul .site-logo::after {
/*content: ':';*/
/* For eventual nav */
/*margin-right: 0.25em;*/ }
header nav ul .resume {
margin-left: auto;
padding-right: 5em; }
main {
max-width: 80rem;
......
......@@ -35,39 +35,43 @@ header {
list-style: none;
padding-left: 0.5em;
}
}
header nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto;
ul {
display: flex;
flex-direction: row;
align-items: baseline;
.site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal;
font-family: 'Stalemate';
img { width: 4rem;
bottom: -0.75rem;
position: relative; }
}
.site-logo::after {
/*content: ':';*/ /* For eventual nav */
/*margin-right: 0.25em;*/
}
.resume {
margin-left: auto;
padding-right: 5em;
nav {
font-family: 'Heuristica', 'Georgia', serif;
box-sizing: border-box;
max-width: 80rem;
margin: 0 auto;
ul {
display: flex;
flex-direction: row;
align-items: baseline;
padding-bottom: 0.75rem;
.site-logo {
font-size: 2.5em;
font-weight: normal;
font-style: normal;
img { height: 5rem;
bottom: -0.75rem;
position: relative; }
.name { font-size: 0;
color: rgba(0,0,0,0);
max-width: 0; }
}
.site-logo::after {
/*content: ':';*/ /* For eventual nav */
/*margin-right: 0.25em;*/
}
.resume {
margin-left: auto;
padding-right: 5em;
}
}
}
}
......
......@@ -182,7 +182,7 @@
<nav>
<ul>
<li class="site-logo" ><a href="/">
<img src="/images/blog-outline-logo.svg" alt="site logo" />
<img src="/images/logo-text.svg" alt="site logo" />
<span class="name">Daniel Shumway</span>
</a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment