From 34a34281947f676a02854e14670c20869af80617 Mon Sep 17 00:00:00 2001 From: Melody Date: Sat, 16 May 2015 21:32:09 -0700 Subject: [PATCH] Nicer new flashcard modal, more purple --- flashy.css | 6 ++- scripts/FeedController.js | 15 ++++++- templates/feed.html | 102 +++++++++++++++++++++------------------------- 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/flashy.css b/flashy.css index 60cc72e..7379db9 100644 --- a/flashy.css +++ b/flashy.css @@ -63,4 +63,8 @@ .angucomplete-selected-row { background-color:#aaaaff; -} \ No newline at end of file +} + +.modal.bottom-sheet { + position: relative; +} diff --git a/scripts/FeedController.js b/scripts/FeedController.js index 5e36375..11abd9c 100644 --- a/scripts/FeedController.js +++ b/scripts/FeedController.js @@ -32,7 +32,20 @@ angular.module('flashy.FeedController', ['ui.router']). $scope.text = ''; }; - $scope.flashcard = 'hi i am a flashcard'; + $scope.flashcard = 'hi i am a flashcard. I need to be really long and awesome I ain\'t know how long I am right now. Is it good enough now?????????? Howz about now???'; $scope.text = ''; + + $(document).ready(function(){ + // the "href" attribute of .modal-trigger must specify the modal ID that wants to be triggered + $('.modal-trigger').leanModal({ + dismissible: true, // Modal can be dismissed by clicking outside of the modal + opacity: 0, // Opacity of modal background + in_duration: 300, // Transition in duration + out_duration: 200, // Transition out duration + /*ready: function() { alert('Ready'); }, // Callback for Modal open + complete: function() { alert('Closed'); } // Callback for Modal close*/ + } + ); + }); }]); diff --git a/templates/feed.html b/templates/feed.html index e077b09..a2b34ea 100644 --- a/templates/feed.html +++ b/templates/feed.html @@ -1,63 +1,55 @@ -
-
- View Deck -
- - -
-
-
- {{ flashcard }} + +
+
+ View Deck
-
-
-
-
- {{ flashcard }} -
-
- {{ flashcard }} -

Herro der. I see you have found me.

+ +
+
+
+ {{ flashcard }} +
-
-
-
-
- {{ flashcard }} -
-
- - -
-
-
-
- - - -
- +
+
+ {{ flashcard }}
+ + +
+ + + + +
    +
    • +
    • +
    • +
    • +
+
- -
- -
- - - - -
    -
    • -
    • -
    • -
    • -
-
-
+ +
+ -- 1.9.1