Commit 32b3331d87ba6f2244c6e1e0c4aacd957c0b1c85
1 parent
654be5de06
Exists in
master
and in
1 other branch
Fixed fancy buttons, hidden flashcard maker
Showing 3 changed files with 57 additions and 6 deletions Side-by-side Diff
config.js
View file @
32b3331
scripts/FeedController.js
View file @
32b3331
| ... | ... | @@ -15,6 +15,22 @@ |
| 15 | 15 | console.log('go to deck'); |
| 16 | 16 | }; |
| 17 | 17 | |
| 18 | + $scope.pullCard = function() { | |
| 19 | + console.log('card clicked'); | |
| 20 | + }; | |
| 21 | + | |
| 22 | + $scope.pushCard = function() { | |
| 23 | + var inBox = document.getElementById('newCard'); | |
| 24 | + var inLabel = document.getElementById('newCardSign'); | |
| 25 | + if (inBox.style.visibility == "hidden") { | |
| 26 | + inBox.style.visibility = "visible"; | |
| 27 | + inLabel.style.visibility = "visible"; | |
| 28 | + } else { | |
| 29 | + inBox.style.visibility = "hidden"; | |
| 30 | + inLabel.style.visibility = "hidden"; | |
| 31 | + } | |
| 32 | + }; | |
| 33 | + | |
| 18 | 34 | $scope.flashcard = "hi i am a flashcard"; |
| 19 | 35 | |
| 20 | 36 | }]); |
templates/feed.html
View file @
32b3331
| 1 | - <div class="row" align="right"> | |
| 2 | - <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 25px">View Deck</a> | |
| 1 | + <div class="col s9"> | |
| 2 | + <div class="row"> | |
| 3 | + <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 15px">View Deck</a> | |
| 3 | 4 | </div> |
| 4 | 5 | |
| 5 | - <div class="col s15 m5"> | |
| 6 | - <div class="card-panel"> | |
| 6 | + <!--random dummy cards--> | |
| 7 | + <div class="row"> | |
| 8 | + <div class="col s1 m2 l4"> | |
| 9 | + <div class="card-panel" ng-click="pullCard()"> | |
| 7 | 10 | <span>{{ flashcard }}</span> |
| 8 | 11 | </div> |
| 9 | 12 | </div> |
| 10 | 13 | |
| 11 | - <div class="fixed-action-btn" style="bottom: 45px; right: 24px;"> | |
| 14 | + <div class="col s1 m2 l4"> | |
| 15 | + <div class="card" ng-click="pullCard()"> | |
| 16 | + <div class="card-content"> | |
| 17 | + <span class="card-title activator grey-text text-darken-4">{{ flashcard }} <i class="mdi-navigation-more-vert right"></i></span> | |
| 18 | + </div> | |
| 19 | + <div class="card-reveal"> | |
| 20 | + <span class="card-title grey-text text-darken-4">{{ flashcard }}<i class="mdi-navigation-close right"></i></span> | |
| 21 | + <p>Herro der. I see you have found me.</p> | |
| 22 | + </div> | |
| 23 | + </div> | |
| 24 | + </div> | |
| 25 | + | |
| 26 | + <div class="col s1 m2 l4"> | |
| 27 | + <div class="card-panel" ng-click="pullCard()"> | |
| 28 | + <span>{{ flashcard }}</span> | |
| 29 | + </div> | |
| 30 | + </div> | |
| 31 | + | |
| 32 | + <!--New flashcard (still working on placement)--> | |
| 33 | + <div class="row"> | |
| 34 | + <form class="col s12"> | |
| 35 | + <div class="row"> | |
| 36 | + <div class="input-field col s12"> | |
| 37 | + <textarea class="materialize-textarea" id="newCard" style="visibility: hidden"></textarea> | |
| 38 | + <label id="newCardSign" for="newCard" style="visibility: hidden">New Flashcard</label> | |
| 39 | + </div> | |
| 40 | + </div> | |
| 41 | + </form> | |
| 42 | + </div> | |
| 43 | + | |
| 44 | + <!--Lil plus button in corner--> | |
| 45 | + <div class="fixed-action-btn" ng-click="pushCard()" style="bottom: 45px; right: 24px;"> | |
| 12 | 46 | <a class="btn-floating btn-large purple"> |
| 13 | 47 | <i class="large mdi-content-add"></i> |
| 14 | 48 | </a> |
| 49 | + <!--Maybe this will come in handy later? Floating bubbles on mouseover--> | |
| 15 | 50 | <ul> |
| 16 | 51 | <li><a class="btn-floating red"><i class="large mdi-editor-insert-chart"></i></a></li> |
| 17 | 52 | <li><a class="btn-floating yellow darken-1"><i class="large mdi-editor-format-quote"></i></a></li> |
| ... | ... | @@ -19,4 +54,5 @@ |
| 19 | 54 | <li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li> |
| 20 | 55 | </ul> |
| 21 | 56 | </div> |
| 57 | +</div> |