From 844baaadfa11a2f47e181d2aa060752e3b4777f5 Mon Sep 17 00:00:00 2001 From: Brandon Rosage Date: Tue, 29 Jan 2019 11:53:31 -0600 Subject: [PATCH] stable "style" site variable --- _config.yml | 3 --- _includes/header.html | 2 +- _includes/interests.html | 9 +++++++ _includes/projects.html | 6 ++--- _includes/repo-card.html | 2 +- _layouts/sidebar.html | 39 +++++++++++++-------------- _layouts/stacked.html | 34 +++++++++++++++++++----- _sass/dark.scss | 3 --- _sass/light.scss | 0 _site/assets/styles.css | 2 -- _site/index.html | 57 ++++++++++++++++++++++------------------ assets/styles.scss | 1 - index.html | 1 + 13 files changed, 94 insertions(+), 65 deletions(-) create mode 100644 _includes/interests.html delete mode 100644 _sass/dark.scss delete mode 100644 _sass/light.scss diff --git a/_config.yml b/_config.yml index 3564f4b329..b3d00563d9 100644 --- a/_config.yml +++ b/_config.yml @@ -1,10 +1,7 @@ repository: sophshep/manager-resources -style: dark - sass: load_paths: - - _sass - node_modules plugins: diff --git a/_includes/header.html b/_includes/header.html index f6f812d18a..f48dd0b9d6 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,4 +5,4 @@ {{ site.github.owner.name }} - + diff --git a/_includes/interests.html b/_includes/interests.html new file mode 100644 index 0000000000..80bb45f6fb --- /dev/null +++ b/_includes/interests.html @@ -0,0 +1,9 @@ +

My Interests

+

Topics that I want to learn more about.

+
+ {% for topic in site.topics limit: 4 %} +
+ {% include topic-card.html %} +
+ {% endfor %} +
diff --git a/_includes/projects.html b/_includes/projects.html index 6d102c740e..0bd7c049e5 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -1,6 +1,6 @@ -

My Projects

-

GitHub repositories that I've built.

-
+

My Projects

+

GitHub repositories that I've built.

+
{% for repository in site.github.public_repositories limit: 4 %}
{% include repo-card.html %} diff --git a/_includes/repo-card.html b/_includes/repo-card.html index 3a58ee6728..c35ce3797b 100644 --- a/_includes/repo-card.html +++ b/_includes/repo-card.html @@ -1,4 +1,4 @@ -
+

diff --git a/_layouts/sidebar.html b/_layouts/sidebar.html index 65b3def0f4..ebf5db5785 100644 --- a/_layouts/sidebar.html +++ b/_layouts/sidebar.html @@ -1,34 +1,40 @@ {% include header.html %} +{% if site.style == 'dark' %} + {% assign icon_color = "#ffffff" %} +{% else %} + {% assign icon_color = "#24292e" %} +{% endif %} + {% assign user = site.github.owner %}
-
+
-

{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}

-

+

{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}

+

{{ user.bio }}

{% if user.name %}
- {% octicon mark-github height:20 class:"mr-2 v-align-middle" aria-label:GitHub %} - + {% octicon mark-github height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:GitHub %} + @{{ user.login }}
{% endif %} {% if user.email %}
- {% octicon mail height:20 class:"mr-2 v-align-middle" aria-label:email %} - + {% octicon mail height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:email %} + {{ user.email }}
{% endif %} {% if user.location %} -
- {% octicon location height:20 class:"mr-2 v-align-middle" aria-label:Location %} +
+ {% octicon location height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:Location %} {{ user.location }}
{% endif %} @@ -40,18 +46,13 @@

{% if user.name %}{{ user.name }}{% else %}{{ user
- {% include projects.html %} - -

My Interests

-

Topics that I want to learn more about.

-
- {% for topic in site.topics limit: 4 %} -
- {% include topic-card.html %} -
- {% endfor %} +
+ {{ content }}
+ {% include projects.html %} + + {% include interests.html %}
diff --git a/_layouts/stacked.html b/_layouts/stacked.html index 528d183f93..c211d74786 100644 --- a/_layouts/stacked.html +++ b/_layouts/stacked.html @@ -1,36 +1,56 @@ {% include header.html %} +{% if site.style == 'dark' %} + {% assign icon_color = "#ffffff" %} +{% else %} + {% assign icon_color = "#24292e" %} +{% endif %} + {% assign user = site.github.owner %}
-

{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}

-

+

{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}

+

{{ user.bio }}

{% if user.name %}
- {% octicon mark-github height:20 class:"mr-1 v-align-middle" aria-label:GitHub %} - + {% octicon mark-github height:20 class:"mr-1 v-align-middle" fill:{{ icon_color }} aria-label:GitHub %} + @{{ user.login }}
{% endif %} + {% if user.email %} +
+ {% octicon mail height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:email %} + + {{ user.email }} + +
+ {% endif %} {% if user.location %} -
- {% octicon location height:20 class:"mr-1 v-align-middle" aria-label:Location %} +
+ {% octicon location height:20 class:"mr-1 v-align-middle" fill:{{ icon_color }} aria-label:Location %} {{ user.location }}
{% endif %}
- {{ content }} +
+ {{ content }} +
{% include projects.html %}
+
+ {% include interests.html %} +
+
diff --git a/_sass/dark.scss b/_sass/dark.scss deleted file mode 100644 index ef8eb9422f..0000000000 --- a/_sass/dark.scss +++ /dev/null @@ -1,3 +0,0 @@ -body { - color: #ffffff; -} diff --git a/_sass/light.scss b/_sass/light.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/_site/assets/styles.css b/_site/assets/styles.css index a08630dbe9..971b034b03 100644 --- a/_site/assets/styles.css +++ b/_site/assets/styles.css @@ -3769,8 +3769,6 @@ a.tabnav-extra:hover { color: #0366d6; text-decoration: none; } .pb-xl-12 { padding-bottom: 128px !important; } /* Set a 128px padding to the top & bottom at the xl breakpoint */ .py-xl-12 { padding-top: 128px !important; padding-bottom: 128px !important; } } -body { color: #ffffff; } - body { font-family: 'Rubik', sans-serif; } .github-component { font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; } diff --git a/_site/index.html b/_site/index.html index 3ab77d4114..650957d473 100644 --- a/_site/index.html +++ b/_site/index.html @@ -5,7 +5,9 @@ Sophie Shepherd - + + + @@ -13,23 +15,23 @@
-

Sophie Shepherd

+

Sophie Shepherd

✏ Design manager at @github

- - + + @sophshep
-
- +
+ Austin TX
@@ -39,9 +41,14 @@

Sophie Shepherd

-

My Projects

+
+ I have stuff to say here. + +
+ +

My Projects

GitHub repositories that I've built.

-
+
@@ -158,12 +165,12 @@

-

My Interests

-

Topics that I want to learn more about.

-
- -
- +

My Interests

+

Topics that I want to learn more about.

+
+ +
+
My Interests

-
- -
- +
+ +
+ CSS @@ -191,10 +198,10 @@

My Interests

 -
- -
- +
+ +
+ Sass @@ -204,9 +211,9 @@

My Interests

 -
- -
+
+ +

diff --git a/assets/styles.scss b/assets/styles.scss index 85a466c910..b6e3e47ff5 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -3,7 +3,6 @@ @import "primer-core/index"; @import "primer-marketing/index"; @import url('https://fonts.googleapis.com/css?family=Rubik:400,500,700,900'); -@import "{{ site.style }}"; body { font-family: 'Rubik', sans-serif; diff --git a/index.html b/index.html index 23a032585a..9f78190452 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,4 @@ --- layout: sidebar --- +I have stuff to say here.