stable "style" site variable

windtagane · Jan 29, 2019 · 844baaa · 844baaa
1 parent 956ff4b
commit 844baaa
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 65 deletions.
diff --git 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
@@ -5,4 +5,4 @@
     <title>{{ site.github.owner.name }}</title>
     <link href="/assets/styles.css" rel="stylesheet" type="text/css">
   </head>
-  <body class="bg-gray-light">
+  <body class="bg-gray-light" {% if site.style == 'dark' %}style="background-color: #2f363d !important"{% endif %}>
diff --git a/_includes/interests.html b/_includes/interests.html
@@ -0,0 +1,9 @@
+<h2 {% if site.style == 'dark' %}class="text-white"{% endif %}>My Interests</h2>
+<p class="f4 mb-4 {% if site.style == 'dark' %}text-white{% else %}text-gray{% endif %}">Topics that I want to learn more about.</p>
+<div class="d-flex flex-wrap gutter-condensed mb-4">
+  {% for topic in site.topics limit: 4 %}
+    <div class="col-6 col-md-12 col-lg-6 col-xl-4 mb-3">
+      {% include topic-card.html %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/_includes/projects.html b/_includes/projects.html
@@ -1,6 +1,6 @@
-<h2>My Projects</h2>
-<p class="f4 mb-4 text-gray">GitHub repositories that I've built.</p>
-<div class="d-flex flex-wrap gutter-condensed mb-4">
+<h2 {% if site.style == 'dark' %}class="text-white"{% endif %}>My Projects</h2>
+<p class="f4 mb-4 {% if site.style == 'dark' %}text-white{% else %}text-gray{% endif %}">GitHub repositories that I've built.</p>
+<div class="d-sm-flex flex-wrap gutter-condensed mb-4">
   {% for repository in site.github.public_repositories limit: 4 %}
     <div class="col-sm-6 col-md-12 col-lg-6 col-xl-4 mb-3">
       {% include repo-card.html %}

diff --git a/_includes/repo-card.html b/_includes/repo-card.html
@@ -1,4 +1,4 @@
-<div class="github-component height-full text-left border border-gray-light bg-white rounded-1 p-3">
+<div class="github-component height-full text-left {% if site.style == 'dark' %}box-shadow{% else %}border border-gray-light{% endif %} bg-white rounded-1 p-3">
   <div class="d-flex flex-justify-between flex-items-start mb-1">
     <h1 class="f4 lh-condensed mb-1">
       <a href="{{ repository.html_url }}">

diff --git 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 %}
 
 <div class="d-md-flex" style="height: 100vh">
-  <div class="flex-self-stretch border-bottom border-md-none border-md-right border-gray-light bg-white col-md-5 col-lg-4 col-xl-3 px-4 px-md-6 px-lg-7 py-6">
+  <div class="flex-self-stretch {% if site.style == 'dark' %}bg-gray-dark{% else %}border-bottom border-md-none border-md-right border-gray-light bg-white{% endif %} col-md-5 col-lg-4 col-xl-3 px-4 px-md-6 px-lg-7 py-6">
     <img src="{{ user.avatar_url }}" class="circle mb-3" style="max-width: 150px;">
-    <h1 class="mb-2 lh-condensed">{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}</h1>
-    <p class="mb-3 f4 text-gray">
+    <h1 class="{% if site.style == 'dark' %}text-white{% endif %} mb-2 lh-condensed">{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}</h1>
+    <p class="mb-3 f4 {% if site.style == 'dark' %}text-white{% else %}text-gray{% endif %}">
       {{ user.bio }}
     </p>
     <div class="f4 mb-6">
       {% if user.name %}
         <div class="d-flex flex-items-center mb-3">
-          {% octicon mark-github height:20 class:"mr-2 v-align-middle" aria-label:GitHub %}
-          <a href="https://github.com/{{ user.login }}">
+          {% octicon mark-github height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:GitHub %}
+          <a href="https://github.com/{{ user.login }}" {% if site.style == 'dark' %}class="text-white"{% endif %}>
             @{{ user.login }}
           </a>
         </div>
       {% endif %}
       {% if user.email %}
         <div class="d-flex flex-items-center mb-3">
-          {% octicon mail height:20 class:"mr-2 v-align-middle" aria-label:email %}
-          <a href="mailto:{{ user.email }}">
+          {% octicon mail height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:email %}
+          <a href="mailto:{{ user.email }}" {% if site.style == 'dark' %}class="text-white"{% endif %}>
             {{ user.email }}
           </a>
         </div>
       {% endif %}
       {% if user.location %}
-        <div class="d-flex flex-items-center mb-3">
-          {% octicon location height:20 class:"mr-2 v-align-middle" aria-label:Location %}
+        <div class="d-flex flex-items-center {% if site.style == 'dark' %}text-white{% endif %} mb-3">
+          {% octicon location height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:Location %}
           {{ user.location }}
         </div>
       {% endif %}
@@ -40,18 +46,13 @@ <h1 class="mb-2 lh-condensed">{% if user.name %}{{ user.name }}{% else %}{{ user
 
   <div class="col-md-7 col-lg-8 col-xl-9 px-4 py-6 px-lg-7">
     <div class="mx-auto" style="max-width: 900px;">
-      {% include projects.html %}
-
-      <h2>My Interests</h2>
-      <p class="f4 mb-4 text-gray">Topics that I want to learn more about.</p>
-      <div class="d-flex flex-wrap gutter-condensed mb-4">
-        {% for topic in site.topics limit: 4 %}
-          <div class="col-sm-6 col-md-12 col-lg-6 col-xl-4 mb-3">
-            {% include topic-card.html %}
-          </div>
-        {% endfor %}
+      <div class="{% if site.style == 'dark' %}text-white{% endif %} mb-6">
+        {{ content }}
       </div>
 
+      {% include projects.html %}
+
+      {% include interests.html %}
     </div>
   </div>
 </div>

diff --git 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 %}
 
 <div class="container-lg py-6 p-responsive text-center">
   <img src="{{ user.avatar_url }}" class="circle mb-3" style="max-width: 150px;">
-  <h1 class="mb-2 lh-condensed">{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}</h1>
-  <p class="col-lg-8 mx-auto mb-3 f3 text-gray">
+  <h1 class="{% if site.style == 'dark' %}text-white{% endif %} mb-2 lh-condensed">{% if user.name %}{{ user.name }}{% else %}{{ user.login }}{% endif %}</h1>
+  <p class="col-lg-8 mx-auto mb-3 f3 {% if site.style == 'dark' %}text-white{% else %}text-gray{% endif %}">
     {{ user.bio }}
   </p>
   <div class="f4 mb-6">
     {% if user.name %}
       <div class="d-md-inline-block mr-3">
-        {% octicon mark-github height:20 class:"mr-1 v-align-middle" aria-label:GitHub %}
-        <a href="https://github.com/{{ user.login }}">
+        {% octicon mark-github height:20 class:"mr-1 v-align-middle" fill:{{ icon_color }} aria-label:GitHub %}
+        <a href="https://github.com/{{ user.login }}" {% if site.style == 'dark' %}class="text-white"{% endif %}>
           @{{ user.login }}
         </a>
       </div>
     {% endif %}
+    {% if user.email %}
+      <div class="d-md-inline-block mr-3">
+        {% octicon mail height:20 class:"mr-2 v-align-middle" fill:{{ icon_color }} aria-label:email %}
+        <a href="mailto:{{ user.email }}" {% if site.style == 'dark' %}class="text-white"{% endif %}>
+          {{ user.email }}
+        </a>
+      </div>
+    {% endif %}
     {% if user.location %}
-      <div class="d-md-inline-block">
-        {% octicon location height:20 class:"mr-1 v-align-middle" aria-label:Location %}
+      <div class="d-md-inline-block {% if site.style == 'dark' %}text-white{% endif %}">
+        {% octicon location height:20 class:"mr-1 v-align-middle" fill:{{ icon_color }} aria-label:Location %}
         {{ user.location }}
       </div>
     {% endif %}
   </div>
 
-  {{ content }}
+  <div {% if site.style == 'dark' %}class="text-white"{% endif %}>
+    {{ content }}
+  </div>
 
   <div class="my-6">
     {% include projects.html %}
   </div>
 
+  <div class="my-6">
+    {% include interests.html %}
+  </div>
+
 </div>
 
 

diff --git a/_sass/dark.scss b/_sass/dark.scss
diff --git a/_sass/light.scss b/_sass/light.scss
diff --git 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
@@ -5,31 +5,33 @@
     <title>Sophie Shepherd</title>
     <link href="/assets/styles.css" rel="stylesheet" type="text/css">
   </head>
-  <body class="bg-gray-light">
+  <body class="bg-gray-light" >
+
+
 
 
 
 
 <div class="d-md-flex" style="height: 100vh">
   <div class="flex-self-stretch border-bottom border-md-none border-md-right border-gray-light bg-white col-md-5 col-lg-4 col-xl-3 px-4 px-md-6 px-lg-7 py-6">
     <img src="https://avatars3.githubusercontent.com/u/527589?v=4" class="circle mb-3" style="max-width: 150px;">
-    <h1 class="mb-2 lh-condensed">Sophie Shepherd</h1>
+    <h1 class=" mb-2 lh-condensed">Sophie Shepherd</h1>
     <p class="mb-3 f4 text-gray">
       ✏  Design manager at @github
     </p>
     <div class="f4 mb-6">
 
         <div class="d-flex flex-items-center mb-3">
-          <svg height="20" class="octicon octicon-mark-github mr-2 v-align-middle" aria-label="GitHub" viewBox="0 0 16 16" version="1.1" width="20" role="img"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
-          <a href="https://github.com/sophshep">
+          <svg height="20" class="octicon octicon-mark-github mr-2 v-align-middle" fill="#24292e" aria-label="GitHub" viewBox="0 0 16 16" version="1.1" width="20" role="img"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
+          <a href="https://github.com/sophshep" >
             @sophshep
           </a>
         </div>
 
 
 
-        <div class="d-flex flex-items-center mb-3">
-          <svg height="20" class="octicon octicon-location mr-2 v-align-middle" aria-label="Location" viewBox="0 0 12 16" version="1.1" width="15" role="img"><path fill-rule="evenodd" d="M6 0C2.69 0 0 2.5 0 5.5 0 10.02 6 16 6 16s6-5.98 6-10.5C12 2.5 9.31 0 6 0zm0 14.55C4.14 12.52 1 8.44 1 5.5 1 3.02 3.25 1 6 1c1.34 0 2.61.48 3.56 1.36.92.86 1.44 1.97 1.44 3.14 0 2.94-3.14 7.02-5 9.05zM8 5.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
+        <div class="d-flex flex-items-center  mb-3">
+          <svg height="20" class="octicon octicon-location mr-2 v-align-middle" fill="#24292e" aria-label="Location" viewBox="0 0 12 16" version="1.1" width="15" role="img"><path fill-rule="evenodd" d="M6 0C2.69 0 0 2.5 0 5.5 0 10.02 6 16 6 16s6-5.98 6-10.5C12 2.5 9.31 0 6 0zm0 14.55C4.14 12.52 1 8.44 1 5.5 1 3.02 3.25 1 6 1c1.34 0 2.61.48 3.56 1.36.92.86 1.44 1.97 1.44 3.14 0 2.94-3.14 7.02-5 9.05zM8 5.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
           Austin TX
         </div>
 
@@ -39,9 +41,14 @@ <h1 class="mb-2 lh-condensed">Sophie Shepherd</h1>
 
   <div class="col-md-7 col-lg-8 col-xl-9 px-4 py-6 px-lg-7">
     <div class="mx-auto" style="max-width: 900px;">
-      <h2>My Projects</h2>
+      <div class=" mb-6">
+        I have stuff to say here.
+
+      </div>
+
+      <h2 >My Projects</h2>
 <p class="f4 mb-4 text-gray">GitHub repositories that I've built.</p>
-<div class="d-flex flex-wrap gutter-condensed mb-4">
+<div class="d-sm-flex flex-wrap gutter-condensed mb-4">
 
     <div class="col-sm-6 col-md-12 col-lg-6 col-xl-4 mb-3">
       <div class="github-component height-full text-left border border-gray-light bg-white rounded-1 p-3">
@@ -158,12 +165,12 @@ <h1 class="f4 lh-condensed mb-1">
 </div>
 
 
-      <h2>My Interests</h2>
-      <p class="f4 mb-4 text-gray">Topics that I want to learn more about.</p>
-      <div class="d-flex flex-wrap gutter-condensed mb-4">
-        
-          <div class="col-sm-6 col-md-12 col-lg-6 col-xl-4 mb-3">
-            
+      <h2 >My Interests</h2>
+<p class="f4 mb-4 text-gray">Topics that I want to learn more about.</p>
+<div class="d-flex flex-wrap gutter-condensed mb-4">
+
+    <div class="col-6 col-md-12 col-lg-6 col-xl-4 mb-3">
+
   <div class="github-component position-relative height-full text-center border border-gray-light rounded-1 bg-white p-5">
 
       <div
@@ -178,10 +185,10 @@ <h2>My Interests</h2>
   </div>
 
 
-          </div>
-        
-          <div class="col-sm-6 col-md-12 col-lg-6 col-xl-4 mb-3">
-            
+    </div>
+
+    <div class="col-6 col-md-12 col-lg-6 col-xl-4 mb-3">
+
   <a href="https://github.com/topics/css" class="github-component position-relative hover-grow height-full no-underline d-flex flex-column flex-justify-center text-center border border-gray-light rounded-1 bg-white p-5">
 
       <img src="https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/css/css.png" width="64" height="64" class="mx-auto rounded-1 mb-3" alt="CSS">
@@ -191,10 +198,10 @@ <h2>My Interests</h2>
   </a>
 
 
-          </div>
-        
-          <div class="col-sm-6 col-md-12 col-lg-6 col-xl-4 mb-3">
-            
+    </div>
+
+    <div class="col-6 col-md-12 col-lg-6 col-xl-4 mb-3">
+
   <a href="https://github.com/topics/sass" class="github-component position-relative hover-grow height-full no-underline d-flex flex-column flex-justify-center text-center border border-gray-light rounded-1 bg-white p-5">
 
       <img src="https://raw.githubusercontent.com/github/explore/6c6508f34230f0ac0d49e847a326429eefbfc030/topics/sass/sass.png" width="64" height="64" class="mx-auto rounded-1 mb-3" alt="Sass">
@@ -204,9 +211,9 @@ <h2>My Interests</h2>
   </a>
 
 
-          </div>
-        
-      </div>
+    </div>
+
+</div>
 
     </div>
   </div>

diff --git 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
@@ -1,3 +1,4 @@
 ---
 layout: sidebar
 ---
+I have stuff to say here.