diff options
| -rw-r--r-- | css/news.css | 54 | ||||
| -rw-r--r-- | templates/main.php | 16 |
2 files changed, 44 insertions, 26 deletions
diff --git a/css/news.css b/css/news.css index 6da220470..e005c7584 100644 --- a/css/news.css +++ b/css/news.css @@ -236,28 +236,48 @@ div.feed_controls { /* feed settings */ -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; -} +#addfeedfolder { -li.menuItem { - padding: 0 1em 0 2.5em; - float: none !important; - text-align: left; } - li.menuItem:hover { - background-color: #ccc !important; + #addfeedfolder img { + border-radius: 0.5em 0.5em 0.5em 0.5em; + color: #555555; + cursor: pointer; + font-weight: bold; + padding: 0.7em 5em .7em 1em; + text-shadow: 0 1px 0 #FFFFFF; + font-size: 1em; + outline: medium none; + width: auto; } + #addfeedfolder:hover ul#feedfoldermenu{ + display: block; + } + + 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.menuItem { + padding: 0 1em 0 2.5em; + float: none !important; + text-align: left; + } + + li.menuItem:hover { + background-color: #ccc !important; + } + #addfolder { background: url('%webroot%/core/img/places/folder.svg') no-repeat 10px center; diff --git a/templates/main.php b/templates/main.php index 4fb588aeb..b8f95bbc4 100644 --- a/templates/main.php +++ b/templates/main.php @@ -17,11 +17,12 @@ echo $this->inc("part.items.header"); <div id="feed_settings"> <ul class="controls"> - <li> - <button class="svg" id="addfeedfolder" title="$l->t('Change View');" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button> - </li> - <li> - <button class="svg" title="$l->t('Change View');">Eye</button> + <li id="addfeedfolder" title="<?php echo $l->t('Add feed or folder'); ?>" > + <img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /> + <ul class="menu" id="feedfoldermenu"> + <li class="menuItem" id="addfeed"><?php echo $l->t('Feed'); ?></li> + <li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li> + </ul> </li> <li style="float: right"> <button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></button> @@ -29,10 +30,7 @@ echo $this->inc("part.items.header"); </ul> </div> -<ul class="menu" id="feedfoldermenu"> - <li class="menuItem" id="addfeed"><?php echo $l->t('Feed'); ?></li> - <li class="menuItem" id="addfolder"><?php echo $l->t('Folder'); ?></li> -</ul> + <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>"> |