diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 01:14:13 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-23 01:14:13 +0200 |
commit | 85f076385e7a76558732646010ae6c563aec106f (patch) | |
tree | f0647439c165ecd1223620f4987031af29ae4beb | |
parent | 8f833877eebd93f1c938833dd28255c63037588f (diff) |
put the showall into the settings slideup
-rw-r--r-- | css/owncloud6.css | 4 | ||||
-rw-r--r-- | css/showall.css | 41 | ||||
-rw-r--r-- | templates/main.php | 1 | ||||
-rw-r--r-- | templates/part.showall.php | 12 |
4 files changed, 0 insertions, 58 deletions
diff --git a/css/owncloud6.css b/css/owncloud6.css index 1dbab96c5..8f24d4f0f 100644 --- a/css/owncloud6.css +++ b/css/owncloud6.css @@ -26,10 +26,6 @@ padding-right: 80px; } -.show-all { - line-height: 44px; -} - #app-navigation .unread > a, #app-navigation .active > a { padding-right: 60px; diff --git a/css/showall.css b/css/showall.css deleted file mode 100644 index 5e1879baa..000000000 --- a/css/showall.css +++ /dev/null @@ -1,41 +0,0 @@ -/** - * ownCloud - News - * - * @author Bernhard Posselt - * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - * - */ - - -.show-all { - background-color: transparent !important; - border: 0 !important; -} - -.show-all:hover { - box-shadow: none !important; - border: 0 !important; -} - -.show-all > a { - padding: 5px 0 5px 0 !important; - text-align: center; - opacity: .5; -} - -.show-all > a:hover { - background-color: transparent !important; -}
\ No newline at end of file diff --git a/templates/main.php b/templates/main.php index aedf0bc36..d0fd59f3e 100644 --- a/templates/main.php +++ b/templates/main.php @@ -39,7 +39,6 @@ <?php //print_unescaped($this->inc('part.feed.starred')) ?> <?php //print_unescaped($this->inc('part.listfeed', ['folderId' => '0'])) ?> <?php //print_unescaped($this->inc('part.listfolder')) ?> - <?php //print_unescaped($this->inc('part.showall')); ?> </ul> <div id="app-settings" ng-controller="SettingsController as Settings"> diff --git a/templates/part.showall.php b/templates/part.showall.php deleted file mode 100644 index 374303358..000000000 --- a/templates/part.showall.php +++ /dev/null @@ -1,12 +0,0 @@ -<li ui-if="!feedBusinessLayer.isShowAll() && feedBusinessLayer.getNumberOfFeeds() > 0" - class="show-all"> - <a ng-click="feedBusinessLayer.setShowAll(true)" - href="#" - news-click-scroll="{direction: 'down', scrollArea: '#app-navigation > ul'}"><?php p($l->t('Show read articles')); ?></a> -</li> - -<li ui-if="feedBusinessLayer.isShowAll() && feedBusinessLayer.getNumberOfFeeds() > 0" - class="show-all"> - <a ng-click="feedBusinessLayer.setShowAll(false)" - href="#"><?php p($l->t('Hide read articles')); ?></a> -</li> |