diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-15 11:11:20 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-15 11:11:20 +0200 |
| commit | 8553c92dd9746d4c6d4390544bcb4c66167173ce (patch) | |
| tree | ba5ab92f844b43555920749f6bd8d345e399dfd8 | |
| parent | 516063c1e1d1d8a85dca7b670e279f71c5685848 (diff) | |
remove opacity for feedcounter, fix #57
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 13 | ||||
| -rw-r--r-- | js/public/app.js | 13 | ||||
| -rw-r--r-- | templates/part.feed.unread.php | 3 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 3 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 3 |
5 files changed, 3 insertions, 32 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 15f784a69..8f9f4e7b6 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -102,19 +102,6 @@ angular.module('News').factory '_FeedController', @_$scope.addNewFolder = true - @_$scope.getOpacity = (number) => - number = parseInt(number, 10) - - # the higher the number, the lower the opacity - opacity = (number / 180) - - if opacity < 0.3 - opacity = 0.3 - if opacity > 1 - opacity = 1 - return opacity - - @_$scope.$on 'moveFeedToFolder', (scope, data) => @_feedBl.move(data.feedId, data.folderId) diff --git a/js/public/app.js b/js/public/app.js index 826ed2891..ea1974247 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -342,19 +342,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. return _this._$scope.addNewFolder = true; } }; - this._$scope.getOpacity = function(number) { - var opacity; - - number = parseInt(number, 10); - opacity = number / 180; - if (opacity < 0.3) { - opacity = 0.3; - } - if (opacity > 1) { - opacity = 1; - } - return opacity; - }; this._$scope.$on('moveFeedToFolder', function(scope, data) { return _this._feedBl.move(data.feedId, data.folderId); }); diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index cf130228c..67c57e369 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -16,8 +16,7 @@ <?php p($l->t('All articles'))?> </a> <span class="utils"> - <span class="unread-counter" - ng-style="{opacity: getOpacity(subscriptionsBl.getUnreadCount()) }"> + <span class="unread-counter"> {{ subscriptionsBl.getUnreadCount() }} </span> <button class="svg action mark-read-icon" diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 064092de5..4ad3fc73c 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -29,8 +29,7 @@ <span class="utils"> <span class="unread-counter" - ng-show="feed.id" - ng-style="{opacity: getOpacity(feedBl.getUnreadCount(feed.id)) }"> + ng-show="feed.id"> {{ feedBl.getUnreadCount(feed.id) }} </span> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 9d0cfe6ac..4e43bf579 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -30,8 +30,7 @@ class="svg action delete-icon" title="<?php p($l->t('Delete folder')); ?>"></button> - <span class="unread-counter" - ng-style="{ opacity: getOpacity(folderBl.getUnreadCount(folder.id)) }"> + <span class="unread-counter"> {{ folderBl.getUnreadCount(folder.id) }} </span> |