From 119c80fe43130be8fb9b05587af28fba19e41632 Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Sun, 19 Sep 2021 13:31:16 -0500
Subject: [PATCH] Update secondary color

---
 _includes/blog-card.html |  8 ++++----
 _sass/brand.scss         |  4 ++--
 assets/css/app.scss      | 16 +++++++++++++++-
 assets/css/dark.scss     | 20 +++++++++++++++++---
 index.html               | 10 +++++-----
 5 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/_includes/blog-card.html b/_includes/blog-card.html
index 98b6e22d..277548b0 100644
--- a/_includes/blog-card.html
+++ b/_includes/blog-card.html
@@ -1,10 +1,10 @@
 <div class="col-6 my-3">
   <a href="{{ post.url | prepend: site.baseurl }}" class="text-decoration-none">
-    <div class="card bg-secondary" {% if post.cover %} style="background-image: {{ post.color | default: "linear-gradient(to bottom, rgba(40, 50, 63, 0.3), rgba(40, 50, 63, 0.9))" }}, url(/assets/img/blog/{{ post.cover }}); background-size: cover; background-position: center;"{% endif %}>
+    <div class="card bg-secondary {% if post.cover %}text-100" style="background-image: {{ post.color | default: "linear-gradient(to bottom, rgba(40, 50, 63, 0.3), rgba(40, 50, 63, 0.9))" }}, url(/assets/img/blog/{{ post.cover }}); background-size: cover; background-position: center;"{% else %}text-dm-100"{% endif %}>
       <div class="card-body d-flex flex-column align-self-end" style="min-height: 300px;">
-        <h2 class="card-title mt-auto text-light">{{ post.title }}</h2>
-        <p class="card-text text-light">{{ post.excerpt }} <strong>Continue Reading...</strong></p>
-        <p class="card-text"><small class="text-light">{% for author in page.author %}{{ author }}{% unless forloop.last %}, {% endunless %}{% endfor %} - {{ post.date | date: "%b %-d, %Y" }}</small></p>
+        <h2 class="card-title mt-auto">{{ post.title }}</h2>
+        <p class="card-text">{{ post.excerpt }} <strong>Continue Reading...</strong></p>
+        <p class="card-text"><small class="">{% for author in page.author %}{{ author }}{% unless forloop.last %}, {% endunless %}{% endfor %} - {{ post.date | date: "%b %-d, %Y" }}</small></p>
       </div>
     </div>
   </a>
diff --git a/_sass/brand.scss b/_sass/brand.scss
index 68fc059f..813b1990 100644
--- a/_sass/brand.scss
+++ b/_sass/brand.scss
@@ -1,6 +1,6 @@
 // Fancy new Privacy Guides Color Scheme
 $primary:       #FFD06F;
-$secondary:     #3913B8;
+$secondary:     #2B589C;
 $success:       #03CEA4;
 $info:          #AA78A6;
 $warning:       #FB4D3D;
@@ -20,4 +20,4 @@ $diaspora:            #FFD06F;
 $tor:                 #7d4698;
 
 $body-color: #28323F;
-$link-color: #3913B8;
+$link-color: $secondary;
diff --git a/assets/css/app.scss b/assets/css/app.scss
index 60427e17..0eff63b3 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -8,7 +8,21 @@
 @import "./node_modules/bootstrap/scss/mixins";
 @import "./node_modules/bootstrap/scss/utilities";
 
-$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $grays);
+$dm-grays: (
+  "dm-white": $white,
+  "dm-100": $gray-100,
+  "dm-200": $gray-200,
+  "dm-300": $gray-300,
+  "dm-400": $gray-400,
+  "dm-500": $gray-500,
+  "dm-600": $gray-600,
+  "dm-700": $gray-700,
+  "dm-800": $gray-800,
+  "dm-900": $gray-900,
+  "dm-black": $black
+);
+
+$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $grays, $dm-grays);
 
 $utilities: map-merge(
   $utilities,
diff --git a/assets/css/dark.scss b/assets/css/dark.scss
index d14a324b..c9148bd1 100644
--- a/assets/css/dark.scss
+++ b/assets/css/dark.scss
@@ -4,7 +4,7 @@
 @import "brand";
 
 $primary: #EAB448;
-//$secondary: lighten( $secondary, 10% );
+$secondary: lighten( $secondary, 30% );
 $success: darken( $success, 10% );
 $info: darken( $info, 5% );
 $danger: lighten( $warning, 20% );
@@ -13,7 +13,7 @@ $warning: darken( $warning, 30% );
 $body-bg: $dark;
 $card-bg: lighten( $dark, 5% );
 $body-color: $light;
-$link-color: lighten( $secondary, 30% );
+$link-color: lighten( $link-color, 30% );
 $mark-bg: darken( $primary, 60% );
 $breadcrumb-bg: lighten( $dark, 5% );
 $hr-border-color: $body-color;
@@ -21,6 +21,20 @@ $hr-border-color: $body-color;
 @import "./node_modules/bootstrap/scss/variables";
 @import "variables";
 
+$dm-grays: (
+  "dm-white": $black,
+  "dm-100": $gray-900,
+  "dm-200": $gray-800,
+  "dm-300": $gray-700,
+  "dm-400": $gray-600,
+  "dm-500": $gray-500,
+  "dm-600": $gray-400,
+  "dm-700": $gray-300,
+  "dm-800": $gray-200,
+  "dm-900": $gray-100,
+  "dm-black": $white
+);
+
 $card-shadow: 0 3px 10px 0 $dark;
 $list-group-color: $body-color;
 $list-group-bg: $card-bg;
@@ -52,7 +66,7 @@ $dropdown-link-hover-bg: lighten( $dropdown-bg, 10% );
 @import "./node_modules/bootstrap/scss/mixins";
 @import "./node_modules/bootstrap/scss/utilities";
 
-$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $grays);
+$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $grays, $dm-grays);
 
 $utilities: map-merge(
   $utilities,
diff --git a/index.html b/index.html
index d2b640c9..4a6cafea 100644
--- a/index.html
+++ b/index.html
@@ -50,7 +50,7 @@ layout: default
 
 </div>
 
-<div class="p-5 bg-secondary text-light">
+<div class="p-5 bg-secondary text-dm-100">
   <div class="container">
     <div class="row mt-3">
       <div class="col text-center">
@@ -113,22 +113,22 @@ layout: default
   </div>
   <div class="row">
     <div class="col text-center py-2">
-      <a href="https://www.reddit.com/r/privacyguides" class="btn btn-dark btn-lg"><i class="fab fa-reddit-alien fa-fw"></i> Join r/PrivacyGuides on Reddit</a>
+      <a href="https://www.reddit.com/r/privacyguides" class="btn btn-secondary btn-lg"><i class="fab fa-reddit-alien fa-fw"></i> Join r/PrivacyGuides on Reddit</a>
     </div>
   </div>
   <div class="row">
     <div class="col text-center py-2">
-      <a href="https://twitter.com/privacy_guides" class="btn btn-dark btn-lg"><i class="fa-brands fa-twitter fa-fw"></i> Follow @privacy_guides on Twitter</a>
+      <a href="https://twitter.com/privacy_guides" class="btn btn-secondary btn-lg"><i class="fa-brands fa-twitter fa-fw"></i> Follow @privacy_guides on Twitter</a>
     </div>
   </div>
   <div class="row">
     <div class="col text-center py-2">
-      <a href="https://github.com/privacyguides/privacyguides.org" class="btn btn-dark btn-lg"><i class="fa-brands fa-github fa-fw"></i> Edit This Site on GitHub</a>
+      <a href="https://github.com/privacyguides/privacyguides.org" class="btn btn-secondary btn-lg"><i class="fa-brands fa-github fa-fw"></i> Edit This Site on GitHub</a>
     </div>
   </div>
   <div class="row">
     <div class="col text-center py-2">
-      <a href="https://matrix.to/#/#privacyguides:aragon.sh" class="btn btn-dark btn-lg"><i class="fa-solid fa-comments-question-check fa-fw"></i> Chat With Us on Matrix</a>
+      <a href="https://matrix.to/#/#privacyguides:aragon.sh" class="btn btn-secondary btn-lg"><i class="fa-solid fa-comments-question-check fa-fw"></i> Chat With Us on Matrix</a>
     </div>
   </div>
 </div>