diff options
-rw-r--r-- | css/news.css | 116 | ||||
-rw-r--r-- | js/news.js | 3 | ||||
-rw-r--r-- | templates/main.php | 3 |
3 files changed, 61 insertions, 61 deletions
diff --git a/css/news.css b/css/news.css index 1a2f88413..8d07cfc36 100644 --- a/css/news.css +++ b/css/news.css @@ -236,53 +236,71 @@ div.feed_controls { /* feed settings */ -#addfeedfolder { - cursor: pointer; - outline: medium none; - width: 7em; - height: 2.8em; - background-size: 100%; - background: url('%appswebroot%/news/img/add.svg') no-repeat 1em center; +#feed_settings { + padding: 0; + bottom: 0px; + overflow:visible; + height:2.8em; + width: 21.5em; + margin:0; + background:#eee; + border-top:1px + solid #ccc; + position:fixed; } - - #addfeedfolder img { - + + #feed_settings .controls { + height: 100%; + width: 100%; } - #addfeedfolder:hover ul#feedfoldermenu{ - display: block; + #feed_settings #addfeedfolder { + margin: 0 .3em .3em .3em; + float: left; + } - 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; - } + #feed_settings #addfeedfolder #addfolder { + background: url('%webroot%/core/img/places/folder.svg') no-repeat 10px center; + } - li.menuItem { - padding: 0 1em 0 2.5em; - float: none !important; - text-align: left; - } + #feed_settings #addfeedfolder #addfeed { + background: url('%appswebroot%/news/img/rss.svg') no-repeat 10px center; + } - li.menuItem:hover { - background-color: #ccc !important; + /* + #feed_settings #addfeedfolder:hover ul#feedfoldermenu{ + display: block; + }*/ + + #feed_settings ul#feedfoldermenu { + display: none; + background:#EEEEEE; + background:-webkit-gradient(linear, 0 0, 0 100%, from(#DCDCDC), to(#EEEEEE)); + background:-moz-linear-gradient(#DCDCDC, #EEEEEE); + background:-o-linear-gradient(#DCDCDC, #EEEEEE); + background:linear-gradient(#DCDCDC, #EEEEEE); + 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; } + #feed_settings ul#feedfoldermenu li.menuItem { + padding: 0 1em 0 2.5em; + float: none !important; + text-align: left; + } -#addfolder { - background: url('%webroot%/core/img/places/folder.svg') no-repeat 10px center; -} + #feed_settings ul#feedfoldermenu li.menuItem:hover { + background-color: #ccc !important; + } -#addfeed { - background: url('%appswebroot%/news/img/rss.svg') no-repeat 10px center; -} #addfeedbtn { background: url('%appswebroot%/news/img/rss.svg') no-repeat left; @@ -294,22 +312,6 @@ div.feed_controls { padding-left: 20px; } -#feed_settings { - padding: 0; - bottom:0px; - overflow:visible; - height:2.8em; - width: 21.5em; - margin:0; - background:#eee; - border-top:1px - solid #ccc; - position:fixed; -} - -ul.controls li { - float: left; -} /* item view */ @@ -510,22 +512,18 @@ ul#dropdownmenu { box-shadow: 0px 0px 10px #000; } - +/* ul.menu { position: absolute; z-index:1; margin-left: 0.3em; display: none; - background:#EEEEEE; - background:-webkit-gradient(linear, 0 0, 0 100%, from(#DCDCDC), to(#EEEEEE)); - background:-moz-linear-gradient(#DCDCDC, #EEEEEE); - background:-o-linear-gradient(#DCDCDC, #EEEEEE); - background:linear-gradient(#DCDCDC, #EEEEEE); + } .popup.bottomleft { left: 34.8em; } - +*/ diff --git a/js/news.js b/js/news.js index 8a82ceb0c..e2f9b5396 100644 --- a/js/news.js +++ b/js/news.js @@ -649,7 +649,8 @@ $(document).ready(function(){ }); $('#addfeedfolder').click(function(event) { - event.stopPropagation(); + News.DropDownMenu.fade($(this).children('ul')); + event.stopPropagation(); }); $('#settingsbtn').on('click keydown', function() { diff --git a/templates/main.php b/templates/main.php index 38ef73e39..c32bb216a 100644 --- a/templates/main.php +++ b/templates/main.php @@ -17,7 +17,8 @@ echo $this->inc("part.items.header"); <div id="feed_settings"> <ul class="controls"> - <li id="addfeedfolder" title="<?php echo $l->t('Add feed or folder'); ?>" > + <li id="addfeedfolder"> + <button class="svg" title="$l->t('Add feed or folder');" onclic="return false;"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button> <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> |