diff options
| -rw-r--r-- | css/content.css | 24 | ||||
| -rw-r--r-- | templates/part.content.expand.php | 15 |
2 files changed, 23 insertions, 16 deletions
diff --git a/css/content.css b/css/content.css index 9be4c4600..a51b6037b 100644 --- a/css/content.css +++ b/css/content.css @@ -39,6 +39,7 @@ height: 100%; } + #app-content-wrapper.autopaging:after { content: ''; background-image: url('../img/loading.gif') no-repeat; @@ -55,10 +56,6 @@ border-top: 1px solid #eee; } -#app-content .item:first-child { - border-top: 0; -} - /** * Utils panel */ @@ -84,7 +81,7 @@ } #app-content .utils .util { - padding: 5px 15px 5px 0; + padding: 5px 20px 5px 0; } #app-content .utils button, @@ -131,7 +128,6 @@ } #app-content .utils .title a { - display: block; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -154,6 +150,22 @@ } /** + * Source + */ + #app-content .utils .source { + width: 200px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + padding: 0 15px; + font-size: 15px; + } + + #app-content .utils .source a { + color: #aaa; + } + + /** * Timestamp */ #app-content .date { diff --git a/templates/part.content.expand.php b/templates/part.content.expand.php index a995b3daa..0414ead62 100644 --- a/templates/part.content.expand.php +++ b/templates/part.content.expand.php @@ -26,6 +26,9 @@ </a> </h1> </li> + <li class="source"> + <a ng-href="#/items/feeds/{{ item.feedId }}">{{ Content.getFeed(item.feedId).title }}</a> + </li> <li class="date"> <time title="{{ item.pubDate*1000|date:'yyyy-MM-dd HH:mm:ss' }}" datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}"> @@ -36,16 +39,8 @@ </div> <div class="article" ng-hide="item.hide"> - <h2 class="author"> - <span> - <?php p($l->t('from')) ?> - <a ng-href="#/items/feeds/{{ item.feedId }}" - class="from_feed">{{ Content.getFeed(item.feedId).title }}</a> - </span> - <span ng-show="item.author"> - <?php p($l->t('by')) ?> - {{ item.author }} - </span> + <h2 class="author" ng-show="item.author"> + <?php p($l->t('by')) ?> {{ item.author }} </h2> <div class="enclosure" ng-if="item.enclosureLink"> |