From b06f64922ca11ad201840f141efa58a53d01664f Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Tue, 2 Jun 2015 19:00:36 -0700
Subject: [PATCH] fix pullUnpull for new flashcard magics

---
 scripts/FlashcardFactory.js | 2 +-
 styles/flashy.css           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/FlashcardFactory.js b/scripts/FlashcardFactory.js
index 19abb50..f62a98c 100644
--- a/scripts/FlashcardFactory.js
+++ b/scripts/FlashcardFactory.js
@@ -30,7 +30,7 @@ angular.module('flashy.FlashcardFactory', ['ui.router']).
             return !(typeof Deck.contains(this.id) === 'undefined');
         };
         Flashcard.prototype.pullUnpull = function() {
-            if (Deck[this.id]) this.unpull();
+            if (this.isInDeck()) this.unpull();
             else this.pull();
         };
         Flashcard.prototype.pull = function () {
diff --git a/styles/flashy.css b/styles/flashy.css
index 88bc878..734203a 100644
--- a/styles/flashy.css
+++ b/styles/flashy.css
@@ -48,7 +48,7 @@
 }
 
 .card.flashy.in-deck {
-    border: 3px solid rgba(0, 184, 76, 0.4);
+    /*border: 3px solid rgba(0, 184, 76, 0.4);*/
 }
 
 .card.flashy {
-- 
1.9.1