diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 20:37:18 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 20:37:18 +0200 |
| commit | 3a20c42239e48846542ef8f32e17fa0de67d2813 (patch) | |
| tree | 8ed70591712b16c894360a3e150fe0a815973e09 | |
| parent | 06236ba4463848b1f75fae58ee2ae4d995e273c9 (diff) | |
| parent | a9765af95cf512b76775750ca7e3e2163ca7b3f8 (diff) | |
Merge branch 'ControlClick' of https://github.com/Alkarex/FreshRSS into Alkarex-ControlClick
Conflicts:
app/views/javascript/main.phtml
+ Mise à jour thèmes
| -rw-r--r-- | app/views/helpers/view/normal_view.phtml | 2 | ||||
| -rw-r--r-- | public/themes/default/freshrss.css | 6 | ||||
| -rw-r--r-- | public/themes/flat-design/freshrss.css | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index fb4e60cf6..cca8e3a88 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -44,7 +44,7 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { <?php } ?> <?php $feed = $item->feed (true); ?> <li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="" /> <span><?php echo $feed->name (); ?></span></a></li> - <li class="item title"><?php echo $item->title (); ?></li> + <li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li> <li class="item date"><?php echo $item->date (); ?></li> <li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"> </a></li> </ul> diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index 92eaafaf0..e109e80ae 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -263,6 +263,12 @@ text-overflow: ellipsis; cursor: pointer; } + .flux_header .item.title a { + color: #000; + } + .flux_header .item.title a:hover { + text-decoration: none + } .flux.not_read .flux_header .item.title { font-weight: bold; } diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 7317fbe9f..3f8ad766b 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -257,6 +257,12 @@ body { text-overflow: ellipsis; cursor: pointer; } + .flux_header .item.title a { + color: #333; + } + .flux_header .item.title a:hover { + text-decoration: none + } .flux.not_read .flux_header .item.title { font-weight: bold; } |