Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

link to external link next to the entry date

Browse Source
This commit is contained in:
Athou
2013-06-29 17:50:30 +02:00
parent f6e5f8f2e9
commit 99286d6c60
3 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/webapp/sass/components/_entry-list.scss
View File

@@ -35,11 +35,10 @@
} }
#feed-accordion .entry-heading { #feed-accordion .entry-heading {
height: 20px; background-color: #ebebeb;
display: block; }
color: black;
cursor: pointer; #feed-accordion .unread .entry-heading:hover {
padding: 6px 0px;
background-color: #ebebeb; background-color: #ebebeb;
} }
@@ -47,14 +46,18 @@
background-color: #fff; background-color: #fff;
} }
#feed-accordion .unread .entry-heading:hover {
background-color: #ebebeb;
}
#feed-accordion .current.closed .entry-heading { #feed-accordion .current.closed .entry-heading {
background-color: #ffc; background-color: #ffc;
} }
#feed-accordion .entry-heading-link {
color: inherit;
height: 20px;
display: block;
cursor: pointer;
padding: 6px 0px;
}
#feed-accordion .entry-heading .feed-name { #feed-accordion .entry-heading .feed-name {
color: #555; color: #555;
display: block; display: block;
@@ -70,7 +73,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
margin-right: 125px; margin-right: 110px;
} }
#feed-accordion .unread .entry-heading .entry-name { #feed-accordion .unread .entry-heading .entry-name {
@@ -84,10 +87,21 @@
#feed-accordion .entry-heading .entry-date { #feed-accordion .entry-heading .entry-date {
display: block; display: block;
position: absolute; position: absolute;
right: 30px; right: 45px;
} }
#feed-accordion a.entry-heading:hover { #feed-accordion a.entry-heading-link:hover {
text-decoration: none;
}
#feed-accordion .entry-external-link {
position: absolute;
right: 25px;
margin-top: -25px;
color: inherit;
}
#feed-accordion .entry-external-link:hover {
text-decoration: none; text-decoration: none;
} }

2
src/main/webapp/sass/mobile/_mobile.scss
View File

@@ -23,7 +23,7 @@
margin-left: 0; margin-left: 0;
} }
#feed-accordion .entry-heading .entry-name { #feed-accordion .entry-heading .entry-name {
margin-right: 0; margin-right: 40px;
} }
body.left-menu-active .left-menu { body.left-menu-active .left-menu {
display: block !important; display: block !important;

8
src/main/webapp/templates/feeds.view.html
View File

@@ -18,7 +18,8 @@
scroll-to="navigationMode != 'scroll' && current == entry" scroll-to-force="navigationMode == 'keyboard'" scroll-to-offset="-50" scroll-to="navigationMode != 'scroll' && current == entry" scroll-to-force="navigationMode == 'keyboard'" scroll-to-offset="-50"
on-scroll-middle="onScroll(entry)" on-scroll-middle-offset="50" on-scroll-middle="onScroll(entry)" on-scroll-middle-offset="50"
ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen }"> ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen }">
<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)"> <div class="entry-heading">
<a href="{{entry.url}}" target="_blank" class="entry-heading-link" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)">
<span class="feed-name visible-desktop"> <span class="feed-name visible-desktop">
<span class="star" ng-mouseup="star(entry, !entry.starred, $event)"> <span class="star" ng-mouseup="star(entry, !entry.starred, $event)">
<i ng-class="{'icon-star icon-star-yellow': entry.starred, 'icon-star-empty': !entry.starred}" <i ng-class="{'icon-star icon-star-yellow': entry.starred, 'icon-star-empty': !entry.starred}"
@@ -29,8 +30,11 @@
</span> </span>
<span class="entry-date visible-desktop">{{entry.date | entryDate}}</span> <span class="entry-date visible-desktop">{{entry.date | entryDate}}</span>
<span class="entry-name" ng-class="{shrink: true, rtl: entry.rtl}" ng-bind-html-unsafe="entry.title"></span> <span class="entry-name" ng-class="{shrink: true, rtl: entry.rtl}" ng-bind-html-unsafe="entry.title"></span>
</a> </a>
<a href="{{entry.url}}" target="_blank" class="entry-external-link" ng-click="mark(entry, true)">
<i class="icon-external-link"></i>
</a>
</div>
<div class="entry-body" ui-if="settingsService.settings.viewMode == 'expanded' || (isOpen && current == entry)" ng-mouseup="bodyClicked(entry, $event)" <div class="entry-body" ui-if="settingsService.settings.viewMode == 'expanded' || (isOpen && current == entry)" ng-mouseup="bodyClicked(entry, $event)"
ng-class="{rtl: entry.rtl}"> ng-class="{rtl: entry.rtl}">
<div class="entry-header"> <div class="entry-header">