diff options
| -rw-r--r-- | css/news.css | 4 | ||||
| -rw-r--r-- | js/news.js | 2 | ||||
| -rw-r--r-- | templates/part.feeds.php | 2 | ||||
| -rw-r--r-- | templates/part.folderlist.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/css/news.css b/css/news.css index 13eee72c0..fca758dc9 100644 --- a/css/news.css +++ b/css/news.css @@ -56,14 +56,14 @@ 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: 16px !important; text-align: right; border-radius: 5px; padding-left: 5px !important; } li.feeds_list a { padding: 0 0 0 20px !important; overflow: hidden; text-overflow: ellipsis; text-align: left; width: 13em; } -div.folder_container { padding-left: 5px !important; border-radius: 5px; } +div.collapsable_container { padding-left: 5px !important; border-radius: 5px; } 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; } -div.folder_container:hover { background-color: rgb(221, 221, 221); } +div.collapsable_container:hover { background-color: rgb(221, 221, 221); } div.add_parentfolder { position: relative; } div.dialog { overflow: visible; } diff --git a/js/news.js b/js/news.js index 0c5c3408e..8dbc09659 100644 --- a/js/news.js +++ b/js/news.js @@ -175,7 +175,7 @@ News={ } function setupFeedList() { - $('.collapsable').click(function(){ + $('.collapsable_container').click(function(){ $(this).parent().children().toggle(); $(this).toggle(); }); diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 1447fc5e1..db7852efc 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -3,7 +3,7 @@ $l = new OC_l10n('news'); echo '<ul class="folders"' . (($depth == 0) ? 'style="margin-left: 0px !important;"' : '') .'> <li class="folder_list" >' . - '<div class="folder_container">' . + '<div class="collapsable_container">' . '<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.folderlist.php b/templates/part.folderlist.php index 670684fd4..a5f9626c6 100644 --- a/templates/part.folderlist.php +++ b/templates/part.folderlist.php @@ -1,6 +1,6 @@ <?php function print_folder(OC_News_Folder $folder, $depth){ - echo '<li class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>'; + echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>'; $children = $folder->getChildren(); foreach($children as $child) { if ($child instanceOf OC_News_Folder){ |