iorrah · iorrah · Oct 16, 2017 · Oct 16, 2017 · Oct 16, 2017 · Oct 16, 2017
diff --git a/app/components/yr-templates/yr-template-1.js b/app/components/yr-templates/yr-template-1.js
@@ -1,10 +1,4 @@
 import Ember from 'ember';
-import ConstantsMixin from 'you-rockstar/mixins/constants';
-import TemplateStateMixin from 'you-rockstar/mixins/template/state';
-import UserMixin from 'you-rockstar/mixins/data/user';
+import DependenciesMixin from 'you-rockstar/mixins/template/dependencies';
 
-export default Ember.Component.extend(
-  ConstantsMixin,
-  TemplateStateMixin,
-  UserMixin
-);
+export default Ember.Component.extend(DependenciesMixin);
diff --git a/app/components/yr-templates/yr-template-2.js b/app/components/yr-templates/yr-template-2.js
@@ -1,10 +1,4 @@
 import Ember from 'ember';
-import ConstantsMixin from 'you-rockstar/mixins/constants';
-import TemplateStateMixin from 'you-rockstar/mixins/template/state';
-import UserMixin from 'you-rockstar/mixins/data/user';
+import DependenciesMixin from 'you-rockstar/mixins/template/dependencies';
 
-export default Ember.Component.extend(
-  ConstantsMixin,
-  TemplateStateMixin,
-  UserMixin
-);
+export default Ember.Component.extend(DependenciesMixin);
diff --git a/app/mixins/template/dependencies.js b/app/mixins/template/dependencies.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+import ConstantsMixin from 'you-rockstar/mixins/constants';
+import TemplateStateMixin from 'you-rockstar/mixins/template/state';
+import UserMixin from 'you-rockstar/mixins/data/user';
+
+export default Ember.Mixin.create(
+  ConstantsMixin,
+  TemplateStateMixin,
+  UserMixin
+);
diff --git a/app/styles/_buttons.scss b/app/styles/_buttons.scss
@@ -11,9 +11,9 @@
   &.btn-not-rounded { border-radius: 0; }
 
   &.btn-transparent {
-    border: 1px solid #fff;
+    border: 1px solid $white;
     background-color: transparent;
-    color: #fff !important;
+    color: $white !important;
 
     &:hover {
       background-color: rgba(255, 255, 255, 0.14);
@@ -22,7 +22,7 @@
 
   &.btn-meteor {
     border: 1px solid transparent;
-    color: #fff !important;
+    color: $white !important;
 
     &,
     &:hover {
@@ -32,7 +32,7 @@
 
   &.btn-h20 {
     border: 1px solid transparent;
-    color: #fff !important;
+    color: $white !important;
 
     &,
     &:hover {
@@ -42,7 +42,7 @@
 
   &.btn-antares {
     border: 1px solid transparent;
-    color: #fff !important;
+    color: $white !important;
 
     &,
     &:hover {
@@ -64,19 +64,19 @@
 
   &.btn-black {
     border: 0;
-    color: #fff !important;
-    background-color: #000;
+    color: $white !important;
+    background-color: $black;
 
     &,
     &:hover {
-      color: #fff !important;
+      color: $white !important;
     }
   }
 
   &.btn-white {
     border: 0;
     color: inherit !important;
-    background-color: #fff;
+    background-color: $white;
 
     &,
     &:hover {

diff --git a/app/styles/_checkboxes.scss b/app/styles/_checkboxes.scss
@@ -8,7 +8,7 @@ $md-checkbox-top: .23rem;
 
 // Checkmark
 $md-checkmark-width: .13rem;
-$md-checkmark-color: #fff;
+$md-checkmark-color: $white;
 $md-checkmark-size: $md-checkbox-size - (2 * $md-checkbox-padding);
 
 .md-checkbox {
@@ -31,7 +31,7 @@ $md-checkmark-size: $md-checkbox-size - (2 * $md-checkbox-padding);
     &:before {
       width: $md-checkbox-size;
       height: $md-checkbox-size;
-      background-color: #fff;
+      background-color: $white;
       border: $md-checkbox-border-width solid $md-checkbox-border-color;
       border-radius: .09rem;
       cursor: pointer;

diff --git a/app/styles/_colours.scss b/app/styles/_colours.scss
@@ -1,3 +1,5 @@
 $caribe:            #03a9f4;
 $orlando:           #673ab7;
 $cinder:            #212529;
+$white:             #fff;
+$black:             #000;
diff --git a/app/styles/_fonts-utilities.scss b/app/styles/_fonts-utilities.scss
diff --git a/app/styles/_fonts.scss b/app/styles/_fonts.scss
@@ -1,14 +1,7 @@
-@import url('https://fonts.googleapis.com/css?family=Amatic+SC|Amatica+SC:700|Covered+By+Your+Grace|Croissant+One|Delius+Unicase:700|Ewert|Merienda+One|Patrick+Hand+SC|Shadows+Into+Light|Sue+Ellen+Francisco|Trade+Winds|Waiting+for+the+Sunrise|Monoton');
+@import url('https://fonts.googleapis.com/css?family=Merienda+One|Crimson+Text|Nunito|Lato');
 
-    // font-family: 'Shadows Into Light', cursive;
-    // font-family: 'Amatic SC', cursive;
-    // font-family: 'Patrick Hand SC', cursive;
-    // font-family: 'Covered By Your Grace', cursive;
-    // font-family: 'Sue Ellen Francisco', cursive;
-    // font-family: 'Merienda One', cursive; // **
-    // font-family: 'Waiting for the Sunrise', cursive;
-    // font-family: 'Delius Unicase', cursive;
-    // font-family: 'Amatica SC', cursive;
-    // font-family: 'Trade Winds', cursive; // *
-    // font-family: 'Croissant One', cursive;
-    // font-family: 'Ewert', cursive; // **
+$merienda-one: 'Merienda One', cursive;
+$roboto: 'Roboto', sans-serif;
+$crimson-text: 'Crimson Text', serif;
+$nunito: 'Nunito', sans-serif;
+$lato: 'Lato', sans-serif;
diff --git a/app/styles/_get-started.scss b/app/styles/_get-started.scss
@@ -40,7 +40,7 @@
     overflow: hidden;
     position: relative;
     top: 4.5%;
-    background-color: #fff;
+    background-color: $white;
   }
 
   img {

diff --git a/app/styles/_header.scss b/app/styles/_header.scss
@@ -1,5 +1,5 @@
 header.homepage-header {
-  color: #fff;
+  color: $white;
   position: relative;
 
   .rocket-glass {
@@ -21,7 +21,7 @@ header.homepage-header {
     display: inline-block;
     -webkit-transform: translate(0, -50%);
     transform: translate(0, -50%);
-    color: #fff;
+    color: $white;
     text-decoration: none;
     transition: opacity .3s;
     padding-top: 70px;
@@ -36,8 +36,8 @@ header.homepage-header {
     width: 24px;
     height: 24px;
     margin-left: -12px;
-    border-left: 1px solid #fff;
-    border-bottom: 1px solid #fff;
+    border-left: 1px solid $white;
+    border-bottom: 1px solid $white;
     -webkit-transform: rotate(-45deg);
     transform: rotate(-45deg);
     -webkit-animation: sdb05 1.5s infinite;

diff --git a/app/styles/_logo.scss b/app/styles/_logo.scss
@@ -1,14 +1,14 @@
 .logo {
-  font-family: 'Merienda One', cursive;
+  font-family: $merienda-one;
   font-weight: 400;
   font-style: inherit;
   color: inherit;
   white-space: nowrap;
 
   &.white {
-    color: #fff !important;
+    color: $white !important;
     background: none !important;
-    -webkit-text-fill-color: #fff;
+    -webkit-text-fill-color: $white;
   }
 
   i {

diff --git a/app/styles/_navbar.scss b/app/styles/_navbar.scss
@@ -1,5 +1,5 @@
 .navbar {
-  background-color: #fff;
+  background-color: $white;
 
   &.affix-top {
     display: none;

diff --git a/app/styles/_our-approach.scss b/app/styles/_our-approach.scss
@@ -1,9 +1,9 @@
 .our-approach {
-  h1 { color: #fff; }
+  h1 { color: $white; }
   .fa-stack { font-size: 3rem; }
 
   .fa-inverse {
     color: #212529 !important;
     top: .1rem;
   }
-}
+}
diff --git a/app/styles/_sidebar.scss b/app/styles/_sidebar.scss
@@ -16,10 +16,10 @@ $offset: 40rem;
 
 #wrapper {
     padding-right: 0;
-    -webkit-transition: all 0.5s ease;
-    -moz-transition: all 0.5s ease;
-    -o-transition: all 0.5s ease;
-    transition: all 0.5s ease;
+    -webkit-transition: all .5s ease;
+    -moz-transition: all .5s ease;
+    -o-transition: all .5s ease;
+    transition: all .5s ease;
     height: 100%;
     position: relative;
 }
@@ -33,15 +33,15 @@ $offset: 40rem;
     position: absolute;
     right: 0;
     height: 100%;
-    background: #000;
-    -webkit-transition: all 0.5s ease;
-    -moz-transition: all 0.5s ease;
-    -o-transition: all 0.5s ease;
-    transition: all 0.5s ease;
+    background: $black;
+    -webkit-transition: all .5s ease;
+    -moz-transition: all .5s ease;
+    -o-transition: all .5s ease;
+    transition: all .5s ease;
     overflow: hidden;
 
-    box-shadow: -2px 0 5px 0 rgba(0, 0, 0, 0.16),
-                -2px 0 10px 0 rgba(0, 0, 0, 0.12);
+    box-shadow: -2px 0 5px 0 rgba(0, 0, 0, .16),
+                -2px 0 10px 0 rgba(0, 0, 0, .12);
 
 }
 
@@ -141,8 +141,8 @@ $offset: 40rem;
         &:last-child  { border-bottom-left-radius: .25rem; }
         &:last-child  { border-bottom-right-radius: .25rem; }
 
-        &.light p { color: rgba(0, 0, 0, 0.37) }
-        &.dark p  { color: rgba(255, 255, 255, 0.1); }
+        &.light p { color: rgba(0, 0, 0, .37) }
+        &.dark p  { color: rgba(255, 255, 255, .1); }
       }
     }
   }
@@ -151,15 +151,15 @@ $offset: 40rem;
 .sidebar-nav li a.active,
 .sidebar-nav li a:hover {
     text-decoration: none;
-    color: #fff;
+    color: $white;
 }
 
 .sidebar-nav li a.active {
-    background: rgba(255, 255, 255, 0.2);
+    background: rgba(255, 255, 255, .2);
 }
 
 .sidebar-nav li a:hover {
-    background: rgba(255, 255, 255, 0.04);
+    background: rgba(255, 255, 255, .04);
 }
 
 .sidebar-nav li a.active {
@@ -175,7 +175,7 @@ $offset: 40rem;
 }
 
 .sidebar-nav .sidebar-close {
-  a { color: #fff !important; }
+  a { color: $white !important; }
 
   span {
     font-weight: 300;
@@ -201,7 +201,7 @@ $offset: 40rem;
     color: #999999;
 
     &:hover {
-      color: #fff;
+      color: $white;
       background: none;
     }
   }