garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Remove duplicate entry title when entries are expanded

Browse Source 
On expanded entries, entry name is now hidden and feed name is shown entirely.
This commit is contained in:
Benoit Lecardonnel
2013-06-30 15:14:59 +01:00
parent d3dd084dd7
commit 9a7f1e368e
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,10 +78,13 @@
overflow: hidden;
white-space: nowrap;
position: absolute;
width: 145px;
text-overflow: ellipsis;
}
#feed-accordion .entry-heading .narrow {
width: 145px;
}
#feed-accordion .entry-heading .entry-name {
display: block;
overflow: hidden;

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

@@ -25,6 +25,9 @@
#feed-accordion .entry-heading .entry-name {
margin-right: 40px;
}
#feed-accordion .entry-heading .narrow {
display: none;
}
body.left-menu-active .left-menu {
display: block !important;
width: 100%;
@@ -42,4 +45,4 @@
body.right-menu-active .toolbar .actions .visible-desktop {
display: inherit !important;
}
}
}

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

@@ -20,7 +20,7 @@
ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen }">
<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" ng-class="{narrow: settingsService.settings.viewMode != 'expanded' && !(isOpen && current == entry)}">
<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}"
class="pointer"></i>
@@ -29,7 +29,7 @@
{{entry.feedName}}
</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" ui-if="settingsService.settings.viewMode != 'expanded' && !(isOpen && current == entry)" ng-class="{shrink: true, rtl: entry.rtl}" ng-bind-html-unsafe="entry.title"></span>
</a>
<a href="{{entry.url}}" target="_blank" class="entry-external-link" ng-click="mark(entry, true)">
<i class="icon-external-link"></i>
@@ -111,4 +111,4 @@
</div>
</div>
<div style="height: 1000px" ui-if="settingsService.settings.viewMode == 'expanded' && entries.length != 0"></div>
</div>
</div>