diff options
| -rw-r--r-- | css/news.css | 32 | ||||
| -rw-r--r-- | templates/main.php | 9 | ||||
| -rw-r--r-- | templates/part.feeds.php | 2 |
3 files changed, 34 insertions, 9 deletions
diff --git a/css/news.css b/css/news.css index 677c79361..65b50b022 100644 --- a/css/news.css +++ b/css/news.css @@ -114,23 +114,45 @@ div.feed_controls { /* feed/folder list */ #leftcontent { width: 21.5em; - top: 3.5em !important; - padding: 0 0 3em 0; margin: 0; z-index: 0; + position: relative; overflow: hidden; + top: 0; + bottom: 0; } + #leftcontent h3 { + background-color: #DBDBDB; + border-bottom: 1px solid #CCCCCC; + border-top: 1px solid #D4D4D4; + color: #333333; + font-weight: bold; + display: block; + font-size: 1.2em; + max-width: 100%; + padding: 0 0.8em; + text-shadow: 0 1px 0 #F8F8F8; + line-height: 2.6em; + } + #feeds { clear: both; background-color: #f8f8f8; - position: relative; - overflow: auto; - height: 100%; + position: absolute; + top: 3.3em; + bottom: 2.8em; + left: 0; + right: 0; box-sizing: border-box; -moz-box-sizing: border-box; } + #feeds ul { + height: 100%; + overflow: auto; + } + #feeds li { padding: 0px !important; } diff --git a/templates/main.php b/templates/main.php index f9c359ca4..1f84520db 100644 --- a/templates/main.php +++ b/templates/main.php @@ -10,9 +10,12 @@ echo $this->inc("part.items.header"); ?> <div id="leftcontent" class="leftcontent"> - <ul id="feeds"> - <?php echo $this->inc("part.feeds"); ?> - </ul> + <h3><?php echo $l->t('Subscriptions'); ?></h3> + <div id="feeds"> + <ul> + <?php echo $this->inc("part.feeds"); ?> + </ul> + </div> </div> <div id="feed_settings"> diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 044d954ab..683d535cd 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -21,7 +21,7 @@ } $tmpl_feed = new OCP\Template("news", "part.listfeed"); $tmpl_feed->assign('feed', $collection); - $tmpl_feed->assign('unreadItems',$counter); + $tmpl_feed->assign('unreadItemsCount',$counter); $tmpl_feed->printpage(); } else { |