From 3a7048d6362b3f4b1b42a745aef1214d2358af1c Mon Sep 17 00:00:00 2001
From: Melody <Melody@Nupi-Talamoo.local>
Date: Sun, 17 May 2015 01:27:18 -0700
Subject: [PATCH] official colors

---
 flashy.css          | 10 +++++++++-
 templates/feed.html | 19 +++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/flashy.css b/flashy.css
index 1611b49..324e010 100644
--- a/flashy.css
+++ b/flashy.css
@@ -88,5 +88,13 @@
 }
 
 body {
-	background-color: #3A263D;
+	background-color: #3e1944;
+}
+
+.btn {
+	background-color: #673ab7;
+}
+
+.btn-floating {
+	background-color: #673ab7;
 }
diff --git a/templates/feed.html b/templates/feed.html
index f936681..1408d34 100644
--- a/templates/feed.html
+++ b/templates/feed.html
@@ -1,7 +1,7 @@
 <body>
     <div class="col s12">
       <div class="row">
-        <a class="waves-effect waves-light btn purple" ng-click="viewDeck()" style="top: 15px">View Deck</a>
+        <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 15px">View Deck</a>
       </div>
 
       <!--cards-->
@@ -10,22 +10,17 @@
           <div class="col s6">
             <div class="card" ng-click="pullCard(card)">
               <div class="card-content">
-                <span class="card-title">{{card.title}}</span>
-                  <p> {{card.content}} </p>
+                <span> {{card.content}} </span>
               </div>
-
+            </div>
+          </div>
         </div>
-
       </div>
 
 
-    </div>
-  </div>
-
-
       <!--Lil plus button in corner-->
         <div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
-          <a data-target="modal1" class="btn-floating btn-large purple modal-trigger" href="#newCard">
+          <a data-target="newCard" class="btn-floating btn-large modal-trigger" href="#newCard">
             <i class="large mdi-content-add"></i>
           </a>
           <!--Maybe this will come in handy later? Floating bubbles on mouseover-->
@@ -38,7 +33,7 @@
         </div>
       </div>
 
-       <div id="newCard" class="modal bottom-sheet">
+      <div id="newCard" class="modal bottom-sheet">
         <div class="modal-content">
           <form>
             <div class="row">
@@ -50,7 +45,7 @@
             </div>
           </form>
         </div>
-        <div class="modal-footer">
+      <div class="modal-footer">
           <button class="btn waves-effect waves-light purple modal-close" type="submit" ng-click="pushCard()">Submit
             <i class="mdi-content-send right"></i>
           </button>
-- 
1.9.1

