diff --git a/src/main/webapp/sass/components/_entry-list.scss b/src/main/webapp/sass/components/_entry-list.scss index 6c562cc7..294a25ec 100644 --- a/src/main/webapp/sass/components/_entry-list.scss +++ b/src/main/webapp/sass/components/_entry-list.scss @@ -35,11 +35,10 @@ } #feed-accordion .entry-heading { - height: 20px; - display: block; - color: black; - cursor: pointer; - padding: 6px 0px; + background-color: #ebebeb; +} + +#feed-accordion .unread .entry-heading:hover { background-color: #ebebeb; } @@ -47,14 +46,18 @@ background-color: #fff; } -#feed-accordion .unread .entry-heading:hover { - background-color: #ebebeb; -} - #feed-accordion .current.closed .entry-heading { 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 { color: #555; display: block; @@ -70,7 +73,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - margin-right: 125px; + margin-right: 110px; } #feed-accordion .unread .entry-heading .entry-name { @@ -84,10 +87,21 @@ #feed-accordion .entry-heading .entry-date { display: block; 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; } diff --git a/src/main/webapp/sass/mobile/_mobile.scss b/src/main/webapp/sass/mobile/_mobile.scss index e42c2a2b..4054861a 100644 --- a/src/main/webapp/sass/mobile/_mobile.scss +++ b/src/main/webapp/sass/mobile/_mobile.scss @@ -23,7 +23,7 @@ margin-left: 0; } #feed-accordion .entry-heading .entry-name { - margin-right: 0; + margin-right: 40px; } body.left-menu-active .left-menu { display: block !important; diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index 8ee429ac..0da8664a 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -18,19 +18,23 @@ 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" ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen }"> - - - - +
+ + + + + + + {{entry.feedName}} - - {{entry.feedName}} - - - - - + {{entry.date | entryDate}} + + + + + +