From b81f6487ca70322819c1b5bdd36d7a005fa43cc3 Mon Sep 17 00:00:00 2001
From: Melody <Melody@Nupi-Talamoo.local>
Date: Thu, 28 May 2015 22:48:00 -0700
Subject: [PATCH] Yay for eyes, also don't really remember what I did
---
scripts/CardListController.js | 1 -
styles/flashy.css | 4 ++--
templates/cardlist.html | 26 ++++++++++----------------
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/scripts/CardListController.js b/scripts/CardListController.js
index f2ed02f..e30a4ae 100644
--- a/scripts/CardListController.js
+++ b/scripts/CardListController.js
@@ -105,7 +105,6 @@ angular.module('flashy.CardListController', ['ui.router', 'angular.filter']).
$(document).off('keydown');
});
- // Tooltips!
$(document).ready(function(){
$('.tooltipped').tooltip({delay: 50});
diff --git a/styles/flashy.css b/styles/flashy.css
index ff41a08..e4f01b8 100644
--- a/styles/flashy.css
+++ b/styles/flashy.css
@@ -314,13 +314,13 @@ md-content.md-default-theme {
height: 100%;
}
-.toast {
+/*.toast {
height: 100px;
width: 300px;
line-height: 20px;
max-height: 100px;
word-wrap: normal;
-}
+}*/
[ng-cloak] {
display: none !important;
diff --git a/templates/cardlist.html b/templates/cardlist.html
index ec10d2d..dfa72ba 100644
--- a/templates/cardlist.html
+++ b/templates/cardlist.html
@@ -66,22 +66,16 @@
<div>{{card.text}}
<span class="badge">{{dayofweek(card)}}</span>
<p class="right-align" ng-show="expand">
- <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">
- <i class="mdi-content-add-circle-outline small"></i></a>
- <a href="" ng-click="unpull(card)" ng-show="card.is_in_deck"><i
- class="mdi-content-remove-circle-outline small tooltipped"
- data-position="bottom" data-delay="50"
- data-tooltip="Remove from Deck"></i></a>
- <a href="" ng-click="hide(card)" ng-show="!card.is_hidden"><i
- class="mdi-action-delete small tooltipped"
- data-position="bottom" data-delay="50"
- data-tooltip="Hide"></i></a>
- <a href="" ng-click="unhide(card)" ng-show="card.is_hidden"><i
- class="mdi-image-remove-red-eye small tooltipped"
- data-position="bottom" data-delay="50"
- data-tooltip="Unhide"></i></a>
- <a href="" ng-click="flag(card)"><i
- class="mdi-content-flag small"></i></a>
+ <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">
+ <i class="mdi-content-add-circle-outline small"></i></a>
+ <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">
+ <i class="mdi-content-remove-circle-outline small"></i></a>
+ <a href="" class="tooltipped" ng-click="hide(card)" ng-show="!card.is_hidden" data-position="bottom" data-delay="50" data-tooltip="Hide">
+ <i class="mdi-action-visibility-off small"></i></a>
+ <a href="" class="tooltipped" ng-click="unhide(card)" ng-show="card.is_hidden" data-position="bottom" data-delay="50" data-tooltip="Unhide">
+ <i class="mdi-action-visibility small"></i></a>
+ <a href="" ng-click="flag(card)">
+ <i class="mdi-content-flag small"></i></a>
</p>
</div>
</li>
--
1.9.1