From 89122a915e3f1e894a100ad2d7f17ea83acd6ca1 Mon Sep 17 00:00:00 2001
From: Hamcha <hamcha@crunchy.rocks>
Date: Tue, 10 Sep 2019 14:47:40 +0200
Subject: [PATCH] Add merriweather font for deck title

---
 src/assets/scss/_variables.scss |  5 ++-
 src/assets/scss/app.scss        |  3 +-
 src/views/DeckBuilder.vue       | 68 +++++++++++++++++++++------------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss
index 1968c57..3c1b805 100644
--- a/src/assets/scss/_variables.scss
+++ b/src/assets/scss/_variables.scss
@@ -168,4 +168,7 @@ $input-color: $white;
 $input-background-color: $black-ter;
 $input-border-color: $grey-darker;
 $input-focus-border-color: $turquoise;
-$input-hover-border-color: scale-color($turquoise, $lightness: -30%);
\ No newline at end of file
+$input-hover-border-color: scale-color($turquoise, $lightness: -30%);
+
+$fantasy: 'Merriweather';
+$primary-text: scale-color($primary, $saturation: -50%, $lightness: 20%);
\ No newline at end of file
diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss
index c0100c5..2829ad5 100644
--- a/src/assets/scss/app.scss
+++ b/src/assets/scss/app.scss
@@ -4,6 +4,7 @@
 @import "~bulma/sass/utilities/derived-variables";
 @import "~bulma";
 @import "~buefy/src/scss/buefy";
+@import url('https://fonts.googleapis.com/css?family=Merriweather:300,400,400i,700&display=swap');
 
 html {
     scrollbar-color: #404245 #2f3132;
@@ -12,5 +13,5 @@ html {
 }
 
 body {
-    color: white;
+    color: $white;
 }
\ No newline at end of file
diff --git a/src/views/DeckBuilder.vue b/src/views/DeckBuilder.vue
index c696227..480c55a 100644
--- a/src/views/DeckBuilder.vue
+++ b/src/views/DeckBuilder.vue
@@ -55,12 +55,17 @@
       </section>
     </section>
     <section class="decklist">
+      <header>
+        <h1>{{ deckname }}</h1>
+      </header>
       <DeckList :cards="decklist" />
     </section>
   </section>
 </template>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/_variables";
+
 .deckbuilder {
   background: url("../assets/images/backgrounds/deckbuilderbg.webp") center;
   background-repeat: no-repeat;
@@ -68,34 +73,45 @@
   height: 100vh;
   display: grid;
   grid-template-columns: 3fr minmax(250px, 1fr);
+}
 
-  .cardlist {
-    display: grid;
-    grid-column: 1;
-    grid-template-rows: 110px 1fr;
+.cardlist {
+  display: grid;
+  grid-column: 1;
+  grid-template-rows: 110px 1fr;
+}
 
-    .filters {
-      display: flex;
-      flex-direction: column;
-      padding: 5px;
-      .row {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        * {
-          margin: 5px;
-        }
-      }
-    }
-
-    .cards {
-      display: grid;
-      grid-template-columns: 5% 1fr 5%;
+.filters {
+  display: flex;
+  flex-direction: column;
+  padding: 5px;
+  .row {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    * {
+      margin: 5px;
     }
   }
-  .decklist {
-    grid-column: 2;
+}
+
+.cards {
+  display: grid;
+  grid-template-columns: 5% 1fr 5%;
+}
+
+.decklist {
+  header {
+    padding: 10px;
+    padding-top: 15px;
+    color: $primary-text;
+    font-family: $fantasy;
+    h1 {
+      font-size: 20pt;
+      font-weight: 700;
+    }
   }
+  grid-column: 2;
 }
 
 .colorfilter,
@@ -313,6 +329,9 @@ export default class DeckBuilder extends Vue {
   private elementFilters!: string[];
   private typeFilters!: string[];
 
+  // Decklist options
+  private deckname!: string;
+
   // Navigation
   private offset!: number;
 
@@ -330,7 +349,8 @@ export default class DeckBuilder extends Vue {
       typeFilters: [],
       colors: colorNames,
       sets: allSets.slice(0, -1),
-      types: typeNames
+      types: typeNames,
+      deckname: "Unnamed deck"
     };
   }