diff options
-rw-r--r-- | css/news.css | 12 | ||||
-rw-r--r-- | templates/part.feeds.php | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/css/news.css b/css/news.css index 04ce0d2e7..da1178c4a 100644 --- a/css/news.css +++ b/css/news.css @@ -1,12 +1,11 @@ -li { padding-right: 0px !important; } -.collapsable { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px;} +.collapsable { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding: 0.3em 0.8em 0.3em 20px; } .news_input { float:left; font-size:12px; padding:4px 2px; border:solid 1px #aacfe4; width:200px; } .svg { border: inherit; background: inherit; } #leftcontent { top: 3.5em !important; padding: 0; margin: 0; } #rightcontent { top: 3.5em !important; padding-top: 5px; } -#feeds { background: #fff; width: 20em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0; } +#feeds { background: #fff; width: 19.7em; left: 12.5em; top: 3.7em; bottom:3em; position: fixed; overflow: auto; padding: 0; margin: 0 0 0 0.3em;} /* #feeds a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; } */ #bottomcontrols { padding: 0; bottom:0px; overflow:visible; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;} #feeds_delete { position: absolute; right: 0px; background: url('%webroot%/core/img/actions/delete.svg') no-repeat center; display: inline; } @@ -14,8 +13,8 @@ li { padding-right: 0px !important; } #dropdownBtn { width: 9em; padding-left: 0; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; } -#addfolder { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px; } -#addfeed { background: url('%appswebroot%/apps/news/img/rss.svg') no-repeat left center; padding-left: 20px; } +#addfolder { background: url('%webroot%/core/img/places/folder.svg') no-repeat left center; padding-left: 20px !important; } +#addfeed { background: url('%appswebroot%/apps/news/img/rss.svg') no-repeat left center; padding-left: 20px !important; } ul.controls li { float: left; } @@ -41,10 +40,13 @@ ul#dropdownmenu { left: 0em; box-shadow: 0px 0px 10px rgb(0, 0, 0); } ul#feedfoldermenu { position:fixed; margin-left: 0; bottom: 2.8em; border-left:1px solid #ccc; border-top:1px solid #ccc; border-right:1px solid #ccc; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;} +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: 20px !important; } li.folder_list:hover { color: rgb(0, 0, 0) !important; background: none !important; } li.feeds_list:hover { background: none repeat scroll 0% 0% rgb(221, 221, 221) !important; } + div.collapsable:hover { background-color: rgb(221, 221, 221); } div.add_parentfolder { position: relative; } diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 587e73f36..f904822a3 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -4,7 +4,7 @@ echo '<ul style="margin-left:' . 10*$depth . 'px;"> <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>' . + ( ($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>': '' ) . '</div>'; echo '<ul>'; |