aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-28 19:38:11 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-11-28 19:38:11 +0100
commit10ce2d2c38b794ff5574b8205e11f240acf25ef7 (patch)
tree968bcf24bf2811541354df14e798f02985bd8069
parentdc2e1dc0817f0818943647d6b005ea35683c9c1b (diff)
Mise à jour designs
Les zones cliquables s'étaient rapetissées dans les en-têtes des articles (le lien n'occupait pas toute la place) La zone d'en-dessous était aussi ratatinnée
-rw-r--r--app/views/helpers/view/normal_view.phtml11
-rw-r--r--public/themes/default/freshrss.css31
-rw-r--r--public/themes/flat-design/freshrss.css31
3 files changed, 42 insertions, 31 deletions
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 99e4bedc7..ded34570f 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -84,6 +84,7 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
}
?>
</div>
+
<ul class="horizontal-list bottom"><?php
if (!login_is_conf ($this->conf) || is_logged ()) {
if ($this->conf->bottomlineRead ()) {
@@ -110,7 +111,10 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
?>
<div class="dropdown">
<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
- <?php echo RSSThemes::icon('share'); ?> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>"><?php echo Translate::t ('share'); ?></a>
+ <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
+ <?php echo RSSThemes::icon('share'); ?>
+ <?php echo Translate::t ('share'); ?>
+ </a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
@@ -168,7 +172,10 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
<li class="item">
<div class="dropdown">
<div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
- <?php echo RSSThemes::icon('tag'); ?> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php echo Translate::t ('related_tags'); ?></a>
+ <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>">
+ <?php echo RSSThemes::icon('tag'); ?>
+ <?php echo Translate::t ('related_tags'); ?>
+ </a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
<?php foreach($tags as $tag) { ?>
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index 288c87f7d..b82656751 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -248,45 +248,49 @@
.flux_header {
height: 25px;
font-size: 12px;
- line-height: 25px;
border-top: 1px solid #ddd;
+ cursor: pointer;
}
- .item.manage {
+ .flux .flux_header > .item > a,
+ .flux .bottom > .item > a {
+ display: inline-block;
+ height: 40px;
+ width: 100%;
+ line-height: 40px;
+ }
+ .flux .item.manage {
width: 40px;
white-space: nowrap;
text-align: center;
}
- .flux_header .item.website {
+ .flux .item.website {
width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
line-height: 40px;
}
- .flux_header .item.website .favicon {
+ .flux .item.website .favicon {
padding: 5px;
}
- .flux_header .item.website a {
+ .flux .item.website a {
display: block;
height: 40px;
}
- .flux_header .item.title {
+ .flux .item.title {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- cursor: pointer;
}
- .flux_header .item.title a {
+ .flux .item.title a {
color: #000;
outline: none;
}
- .flux.current .item.title a {
- font-weight: bold;
- }
- .flux.not_read .flux_header .item.title {
+ .flux.not_read .item.title,
+ .flux.current .item.title {
font-weight: bold;
}
- .item.date {
+ .flux .item.date {
width: 200px;
overflow: hidden;
padding:0 5px 0 0;
@@ -295,7 +299,6 @@
text-align: right;
font-size: 10px;
color: #666;
- cursor: pointer;
}
.link {
width: 40px;
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index 970ed8a25..b8ed950c2 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -231,41 +231,45 @@ body {
.flux_header {
height: 25px;
font-size: 12px;
- line-height: 25px;
border-top: 1px solid #ecf0f1;
+ cursor: pointer;
}
- .item.manage {
+ .flux .flux_header > .item > a,
+ .flux .bottom > .item > a {
+ display: inline-block;
+ height: 40px;
+ width: 100%;
+ line-height: 40px;
+ }
+ .flux .item.manage {
width: 40px;
white-space: nowrap;
text-align: center;
}
- .flux_header .item.website {
+ .flux .item.website {
width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
line-height: 40px;
}
- .flux_header .item.website .favicon {
+ .flux .item.website .favicon {
padding: 5px;
}
- .flux_header .item.title {
+ .flux .item.title {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- cursor: pointer;
}
- .flux_header .item.title a {
+ .flux .item.title a {
color: #333;
outline: none;
}
- .flux.current .item.title a {
+ .flux.current .item.title,
+ .flux.not_read .item.title {
font-weight: bold;
}
- .flux.not_read .flux_header .item.title {
- font-weight: bold;
- }
- .item.date {
+ .flux .item.date {
width: 200px;
overflow: hidden;
padding:0 5px 0 0;
@@ -274,7 +278,6 @@ body {
text-align: right;
font-size: 10px;
color: #666;
- cursor: pointer;
}
.link {
width: 40px;
@@ -289,8 +292,6 @@ body {
color: #34495e;
font-size: 120%;
}
- #stream.reader .flux a {
- }
#stream.reader .flux .author {
margin: 0 0 10px;
font-size: 90%;