From f3d9271b825e812002411bd542c3f352f0c245c2 Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Tue, 19 May 2015 15:17:49 -0700
Subject: [PATCH] more attempts at card sizing

---
 scripts/FlashcardDirective.js | 2 +-
 scripts/RootController.js     | 9 +++++----
 styles/flashy.css             | 1 -
 templates/flashcard.html      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js
index a03dc0b..2e5edc2 100644
--- a/scripts/FlashcardDirective.js
+++ b/scripts/FlashcardDirective.js
@@ -11,7 +11,7 @@ directive('flashcard', ['$http', function($http) {
             console.log('HELLO FROM FLASHCARD DIRECTIVE');
             console.log(scope.flashcard);
             console.log(element);
-
+            scope.card_width = '300px';
             // Put flashcard-specific functions here.
             // This will probably include add/hide/modals/etc.
             scope.pullCard = function(flashcard) {
diff --git a/scripts/RootController.js b/scripts/RootController.js
index 8d28499..c42c232 100644
--- a/scripts/RootController.js
+++ b/scripts/RootController.js
@@ -14,9 +14,10 @@ angular.module('flashy.RootController', ['ui.router']).
         });
 
         $('.button-collapse').sideNav({
-            menuWidth: 300, // Default is 240
-            edge: 'right', // Choose the horizontal origin
-            closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
-          }
+                menuWidth: 300, // Default is 240
+                edge: 'right', // Choose the horizontal origin
+                closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
+            }
         );
+
     }]);
diff --git a/styles/flashy.css b/styles/flashy.css
index 4b20c35..94146b2 100644
--- a/styles/flashy.css
+++ b/styles/flashy.css
@@ -61,7 +61,6 @@ ul.side-nav.fixed li a {
     max-width: calc(5 * 60px);
     min-height: calc((992px / 4 - 6px * 2) * 3 / 5);
     /*min-width: calc(992px / 4 - 6px * 2);*/
-    width: calc(992px / 4 - 6px * 2);
 }
 
 .card-overlay {
diff --git a/templates/flashcard.html b/templates/flashcard.html
index 997a6d5..14d1d96 100644
--- a/templates/flashcard.html
+++ b/templates/flashcard.html
@@ -1,4 +1,4 @@
-    <div class="card flashy">
+    <div class="card flashy" ng-style="{'width':card_width}">
       <div class="card-content">
         <p>{{flashcard.text}}</p>
       </div>
-- 
1.9.1