diff options
| -rw-r--r-- | css/news.css | 4 | ||||
| -rw-r--r-- | templates/part.feeds.php | 2 | ||||
| -rw-r--r-- | templates/part.itemcounter.php | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/css/news.css b/css/news.css index 1795aaedf..064aa2fe0 100644 --- a/css/news.css +++ b/css/news.css @@ -54,9 +54,11 @@ ul#feedfoldermenu { position:fixed; margin-left: 0; bottom: 2.8em; border-left:1 li { padding: 0px !important; } li.menuItem { margin-left:0.7em; margin-right:0.7em; float: none !important; text-align: left; } -li.feeds_list { margin-left: 10px !important; text-align: right; } +li.feeds_list { margin-left: 16px !important; text-align: right; } li.feeds_list a { margin-left: 20px !important; overflow: hidden; text-overflow: ellipsis; width: 13em; text-align: left; } +ul.folders { margin-left: 16px !important; } + li.folder_list:hover { color: rgb(0, 0, 0) !important; background: none !important; } li.feeds_list:hover { background-color: rgb(221, 221, 221) !important; } diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 7d14afe45..3ddbcaab8 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -2,7 +2,7 @@ function print_folder(OC_News_Folder $folder, $depth){ $l = new OC_l10n('news'); - echo '<ul style="margin-left:' . 10*$depth . 'px;"> <li class="folder_list" >' . + echo '<ul class="folders"' . (($depth == 0) ? 'style="margin-left: 0px !important;"' : '') .'> <li class="folder_list" >' . '<div class="collapsable" >' . strtoupper($folder->getName()) . ( ($depth != 0) ? '<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' . '<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>': '' ) . diff --git a/templates/part.itemcounter.php b/templates/part.itemcounter.php index aea9a3b37..ad24a991b 100644 --- a/templates/part.itemcounter.php +++ b/templates/part.itemcounter.php @@ -9,7 +9,9 @@ function countUnreadItems($feedid) { if(!$item->isRead()) ++$counter; } - echo '<span id="unreaditemcounter">' . $counter . '</span>'; + if ($counter > 0) { + echo '<span id="unreaditemcounter">' . $counter . '</span>'; + } } ?>
\ No newline at end of file |