diff options
| -rw-r--r-- | css/news.css | 55 | ||||
| -rw-r--r-- | templates/part.items.php | 6 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 4 |
3 files changed, 42 insertions, 23 deletions
diff --git a/css/news.css b/css/news.css index 06358b437..ba880e685 100644 --- a/css/news.css +++ b/css/news.css @@ -182,6 +182,31 @@ div.feed_controls { transition: padding-bottom 500ms ease 0s; } + #feeds .folder { + box-sizing: border-box; + -moz-box-sizing: border-box; + padding: 0 0 0 2em !important; + background-color: #dfdfdf !important; + font-weight: bold ; + border-bottom: 1px solid #bbb !important; + position: relative; + z-index: 1; + } + + #feeds .folder a { + padding: .5em 0 .5em .5em; + line-height: 1.5em !important;; + float: none; + display: inline-block; + position: relative; + } + + #feeds .folder:hover { + background-color: #d0d0d0 !important; + -moz-transition: background-color 200ms ease 0s; + transition: background-color 200ms ease 0s; + } + #feeds .subscriptions, #feeds .subscriptions:hover { background-image: url('%appswebroot%/news/img/icon.svg'); background-repeat: no-repeat; @@ -197,37 +222,29 @@ div.feed_controls { } - #feeds .folder:hover { - background-color: #d0d0d0; - -moz-transition: background-color 200ms ease 0s; - transition: background-color 200ms ease 0s; - } - #feeds .subscriptions a, #feeds .starred a { - margin-left: 2em; display: inline-block; width: 75%; } #feeds li.feed { position: relative; - text-align: right; box-sizing: border-box; -moz-box-sizing: border-box; border-bottom: 1px solid #ccc; - padding: 0 0 0 5px; + line-height: 1.5em; + padding-left: 2.5em; -moz-transition: background-color 200ms ease 0s; transition: background-color 200ms ease 0s; background-color: #f1f1f1; z-index: 1; + background-size:16px 16px; + background-repeat: no-repeat; + background-position: .8em center; } #feeds li.feed a { - background-size:16px 16px; - background-repeat: no-repeat; - background-position: 3px center; - padding: 0 0 0 25px !important; - line-height: 2.2em; + display: inline-block; overflow: hidden; text-overflow: ellipsis; text-align: left; @@ -309,7 +326,7 @@ div.feed_controls { display: none !important; } - #feeds li.collapsable_container, #feeds .folder { + #feeds li.collapsable_container { background-color: #dfdfdf; font-weight: bold; padding: 0; @@ -366,7 +383,7 @@ div.feed_controls { #feeds .collapsable_trigger { border: none ; - margin: 0 0 0 1em; + margin: 0 0 0 .8em; padding: 0; border-radius: 0; box-shadow: none; @@ -388,7 +405,7 @@ div.feed_controls { transform: rotate(-90deg); } - #feeds .collapsable_title, #feeds .folder a { + #feeds .collapsable_title { padding: .5em 0 .5em .5em; line-height: 1.5em; float: none; @@ -629,7 +646,9 @@ div.feed_controls { .timeago { float: right; color: #aaa; - margin-right: 1em; + margin: .6em 1.2em 0 0; + line-height: 1.5em; + font-size: 1em; } /** diff --git a/templates/part.items.php b/templates/part.items.php index 3d9c366d6..efe37821a 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -30,6 +30,9 @@ foreach($items as $item) { echo '<li class="feed_item ' . $newsItemClass .'" data-id="' . $item->getId() . '" data-feedid="' . $feedId . '">'; + echo '<h2 class="item_date"><time class="timeago" datetime="' . + date('c', $item->getDate()) . '">' . date('F j, Y, g:i a', $item->getDate()) . '</time>' . '</h2>'; + echo '<div class="utils">'; echo '<ul class="primary_item_utils">'; echo '<li class="star ' . $starClass . '" title="' . $startTitle . '"></li>'; @@ -40,9 +43,6 @@ foreach($items as $item) { echo '</ul>'; echo '</div>'; - echo '<h2 class="item_date"><time class="timeago" datetime="' . - date('c', $item->getDate()) . '">' . date('F j, Y, g:i a', $item->getDate()) . '</time>' . '</h2>'; - echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>'; if(trim($item->getAuthor()) == ''){ diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index d3008bc91..e06dcd38c 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -16,8 +16,8 @@ if($unreadItemsCount == 0){ $allReadClass = ''; } -echo '<li class="feed" data-id="' . $feed->getId() . '">'; -echo '<a href="#" style="background-image: url(' . $favicon . '); " class="' . $allReadClass . '">' . $feed->getTitle() .'</a>'; +echo '<li class="feed" data-id="' . $feed->getId() . '" style="background-image: url(' . $favicon . ');">'; +echo '<a href="#" " class="' . $allReadClass . '">' . $feed->getTitle() .'</a>'; echo '<span class="unreaditemcounter ' . $allReadClass . '">' . $unreadItemsCount . '</span>'; echo '<button class="svg action feeds_edit" title="' . $l->t('Edit feed') . '"></button>'; echo '<button class="svg action feeds_delete" onClick="(News.Feed.delete(' . $feed->getId(). '))" title="' . $l->t('Delete feed') . '"></button>'; |