Skip to content

Commit

Permalink
Merge pull request #33 from niklaas/fix/font-link-styles
Browse files Browse the repository at this point in the history
fix(style): decorate titles and nav properly
  • Loading branch information
Keats authored Aug 12, 2019
2 parents 26ac855 + 62d7584 commit f7ec4ab
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
2 changes: 1 addition & 1 deletion sass/_base.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html {
font-size: 18px;
font-size: 16px;
box-sizing: border-box;
}

Expand Down
6 changes: 6 additions & 0 deletions sass/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@
justify-content: space-between;

.logo {
font-family: Chancery, cursive, LiSu, sans-serif;
font-weight: 400;

a {
color: #34495e;
font-size: 48px;
}
}

.menu {
align-self: flex-start;
font-family: $decoration-font-family;

ul {
display: inline-block;
Expand All @@ -22,6 +27,7 @@
@include underline-from-center;

a {
color: #34495e;
font-size: 18px;
}
}
Expand Down
20 changes: 17 additions & 3 deletions sass/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ main {
}

.read-more a {
font-size: 1.1rem;
color: $main-colour;
font-family: $decoration-font-family;
font-size: 1.1rem;

&:hover {
text-decoration: underline;
Expand All @@ -23,6 +24,14 @@ main {
.post {
padding: 1.5rem 0;

.post__title {
font-family: $decoration-font-family;

a {
color: #34495e;
}
}

h2, h3, h4, h5, h6 {
font-weight: 400;
}
Expand Down Expand Up @@ -106,7 +115,7 @@ main {

&__title {
margin: 0;
font-size: 30px;
font-size: 26px;
font-weight: 400;

@include underline-from-center;
Expand Down Expand Up @@ -171,8 +180,13 @@ main {
}

.pagination {
margin: 2rem 0;
clear: both;
font-family: $decoration-font-family;
margin: 2rem 0;

a {
color: #34495e;
}
}
}

Expand Down
1 change: 1 addition & 0 deletions sass/site.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ $body-width: 800px;
$mobile-navbar-height: 50px !default;
$code-colour: #c7254e;
$code-font-family: Consolas, Monaco, Menlo, Consolas, monospace !default;
$decoration-font-family: Athelas, STHeiti, Microsoft Yahei, serif;

@mixin min-screen($min-width: $body-width) {
@media screen and (min-width: $min-width) {
Expand Down

0 comments on commit f7ec4ab

Please sign in to comment.