diff options
| -rw-r--r-- | css/news.css | 10 | ||||
| -rw-r--r-- | js/menu.js | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/css/news.css b/css/news.css index 96e48ac96..c88fe03de 100644 --- a/css/news.css +++ b/css/news.css @@ -243,15 +243,15 @@ div.add_parentfolder { } #feeds .folder.collapsable.open { - background-image: linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%), + background-image: linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%), url('%webroot%/core/img/places/folder.svg'); - background-image: -o-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%), + background-image: -o-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%), url('%webroot%/core/img/places/folder.svg'); - background-image: -moz-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%), + background-image: -moz-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%), url('%webroot%/core/img/places/folder.svg'); - background-image: -webkit-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%), + background-image: -webkit-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%), url('%webroot%/core/img/places/folder.svg'); - background-image: -ms-linear-gradient(top, rgb(210,210,210) 0%, rgb(220,220,220) 100%), + background-image: -ms-linear-gradient(top, rgb(213,213,213) 2px, rgb(223,223,223) 100%), url('%webroot%/core/img/places/folder.svg'); border-bottom: 1px solid #bbb; padding-bottom: .5em; diff --git a/js/menu.js b/js/menu.js index 0980e4ca1..026c06297 100644 --- a/js/menu.js +++ b/js/menu.js @@ -866,12 +866,23 @@ var News = News || {}; return; } + // adjust unreadcount for the old folder + var feedUnreadCount = self._unreadCount[feedId]; + if(fromFolderId !== 0){ + self._setUnreadCount(MenuNodeType.Feed, feedId, 0); + } + if($dropped.hasClass(self._menuNodeTypeToClass(MenuNodeType.Folder))){ $dropped.children('ul').append($dragged[0]); } else { $dropped.append($dragged[0]); } + // adjust unreadcount for the new folder + if(folderId !== 0){ + self._setUnreadCount(MenuNodeType.Feed, feedId, feedUnreadCount); + } + self._resetOpenFolders(); self._moveFeedToFolder(feedId, folderId); |