From 476b6f508328204fc7233b801818fddb25acea91 Mon Sep 17 00:00:00 2001 From: pangdaxing23 Date: Sun, 4 Jun 2017 04:41:56 -0400 Subject: [PATCH 1/4] change brand color to green, add border radii to images and header links --- _sass/_page.scss | 4 ++++ _sass/_site.scss | 2 ++ _sass/_variables.scss | 10 +++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/_sass/_page.scss b/_sass/_page.scss index d1aea9f6..5ba38f37 100644 --- a/_sass/_page.scss +++ b/_sass/_page.scss @@ -171,6 +171,10 @@ p.post-desc { width: 96px; height: 96px; margin: -.4rem 1rem 0 $spacer; + + img { + border-radius: 150px; + } } @include mq-up(md) { diff --git a/_sass/_site.scss b/_sass/_site.scss index c63cf0f8..9f98d0b4 100644 --- a/_sass/_site.scss +++ b/_sass/_site.scss @@ -22,6 +22,7 @@ .site-logo { width: 3rem; height: 3rem; + border-radius: 100px; } .site-nav { @@ -40,6 +41,7 @@ padding: 0 .25rem; margin-right: $spacer0; transition: background 0.1s ease-out; + border-radius: 5px; &:hover { text-decoration: none; diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 23e06598..0f6837fd 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -11,13 +11,17 @@ $blue: #4072AF; $light-blue: lighten($blue, 45%); $dark-blue: darken($blue, 20%); +$green: #40AF72; +$light-green: lighten($green, 45%); +$dark-green: darken($green, 20%); + $ligt-yellow: #fcf8e3; $red: #bd4147; // COLORS - BRAND ------------------ -$brand-color: $blue; -$brand-light-color: $light-blue; +$brand-color: $green; +$brand-light-color: $light-green; $brand-secondary: $gray-dark; $text-muted: $gray-light; @@ -29,7 +33,7 @@ $body-color: $gray-dark; // GLOBALS - LINKS ------------------ $link-color: $brand-color; $link-decoration: none; -$link-hover-color: $dark-blue; +$link-hover-color: $dark-green; $link-hover-decoration: underline; // GLOBALS - SPACERS ------------------ From 629ad46f540fc725524c6d682381ee58f5e81259 Mon Sep 17 00:00:00 2001 From: pangdaxing23 Date: Sun, 4 Jun 2017 04:46:21 -0400 Subject: [PATCH 2/4] correct ligt-yellow typo --- _sass/_text.scss | 2 +- _sass/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_sass/_text.scss b/_sass/_text.scss index 269418e2..78ac77fd 100644 --- a/_sass/_text.scss +++ b/_sass/_text.scss @@ -56,7 +56,7 @@ small, mark, .mark { padding: .2em; - background-color: $ligt-yellow; + background-color: $light-yellow; } code, kbd, diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 0f6837fd..995918ec 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -15,7 +15,7 @@ $green: #40AF72; $light-green: lighten($green, 45%); $dark-green: darken($green, 20%); -$ligt-yellow: #fcf8e3; +$light-yellow: #fcf8e3; $red: #bd4147; From 180a96d27e851a9a4d09604e9bfb6856b005df4b Mon Sep 17 00:00:00 2001 From: pangdaxing23 Date: Sun, 4 Jun 2017 15:40:00 -0400 Subject: [PATCH 3/4] add 404 page --- 404.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 404.md diff --git a/404.md b/404.md new file mode 100644 index 00000000..404ec351 --- /dev/null +++ b/404.md @@ -0,0 +1,6 @@ +--- +layout: default +permalink: /404.html +--- +# 404! +#### I have no idea what you're looking for, but it's not here. From 1a3ff4c99fa451502df5ceccccdd6425442eb64b Mon Sep 17 00:00:00 2001 From: pangdaxing23 Date: Fri, 14 Jul 2017 17:53:55 -0400 Subject: [PATCH 4/4] align variables --- _sass/_variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 995918ec..b6d1c6ff 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -12,10 +12,10 @@ $light-blue: lighten($blue, 45%); $dark-blue: darken($blue, 20%); $green: #40AF72; -$light-green: lighten($green, 45%); -$dark-green: darken($green, 20%); +$light-green: lighten($green, 45%); +$dark-green: darken($green, 20%); -$light-yellow: #fcf8e3; +$light-yellow: #fcf8e3; $red: #bd4147;