110swag / flashy-frontend

Download as
Browse Code ยป

Commit b81f6487ca70322819c1b5bdd36d7a005fa43cc3

Authored by Melody
1 parent 362cfb056d
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

Yay for eyes, also don't really remember what I did

Showing 3 changed files with 12 additions and 19 deletions Side-by-side Diff

scripts/CardListController.js View file @ b81f648
... ... @@ -105,7 +105,6 @@
105 105 $(document).off('keydown');
106 106 });
107 107  
108   - // Tooltips!
109 108 $(document).ready(function(){
110 109 $('.tooltipped').tooltip({delay: 50});
111 110  
styles/flashy.css View file @ b81f648
... ... @@ -314,13 +314,13 @@
314 314 height: 100%;
315 315 }
316 316  
317   -.toast {
  317 +/*.toast {
318 318 height: 100px;
319 319 width: 300px;
320 320 line-height: 20px;
321 321 max-height: 100px;
322 322 word-wrap: normal;
323   -}
  323 +}*/
324 324  
325 325 [ng-cloak] {
326 326 display: none !important;
templates/cardlist.html View file @ b81f648
... ... @@ -66,22 +66,16 @@
66 66 <div>{{card.text}}
67 67 <span class="badge">{{dayofweek(card)}}</span>
68 68 <p class="right-align" ng-show="expand">
69   - <a href="" class="tooltipped" data-position="bottom" data-delay="50" data-tooltip="Add to Deck" ng-click="pull(card)" ng-show="!card.is_in_deck">
70   - <i class="mdi-content-add-circle-outline small"></i></a>
71   - <a href="" ng-click="unpull(card)" ng-show="card.is_in_deck"><i
72   - class="mdi-content-remove-circle-outline small tooltipped"
73   - data-position="bottom" data-delay="50"
74   - data-tooltip="Remove from Deck"></i></a>
75   - <a href="" ng-click="hide(card)" ng-show="!card.is_hidden"><i
76   - class="mdi-action-delete small tooltipped"
77   - data-position="bottom" data-delay="50"
78   - data-tooltip="Hide"></i></a>
79   - <a href="" ng-click="unhide(card)" ng-show="card.is_hidden"><i
80   - class="mdi-image-remove-red-eye small tooltipped"
81   - data-position="bottom" data-delay="50"
82   - data-tooltip="Unhide"></i></a>
83   - <a href="" ng-click="flag(card)"><i
84   - class="mdi-content-flag small"></i></a>
  69 + <a href="" class="tooltipped" ng-click="pull(card)" ng-show="!card.is_in_deck" data-position="bottom" data-delay="50" data-tooltip="Add to Deck">
  70 + <i class="mdi-content-add-circle-outline small"></i></a>
  71 + <a href="" class="tooltipped" ng-click="unpull(card)" ng-show="card.is_in_deck" data-position="bottom" data-delay="50" data-tooltip="Add to Deck">
  72 + <i class="mdi-content-remove-circle-outline small"></i></a>
  73 + <a href="" class="tooltipped" ng-click="hide(card)" ng-show="!card.is_hidden" data-position="bottom" data-delay="50" data-tooltip="Hide">
  74 + <i class="mdi-action-visibility-off small"></i></a>
  75 + <a href="" class="tooltipped" ng-click="unhide(card)" ng-show="card.is_hidden" data-position="bottom" data-delay="50" data-tooltip="Unhide">
  76 + <i class="mdi-action-visibility small"></i></a>
  77 + <a href="" ng-click="flag(card)">
  78 + <i class="mdi-content-flag small"></i></a>
85 79 </p>
86 80 </div>
87 81 </li>