summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-23 22:51:35 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-01-23 22:51:35 +0100
commit451cae8d12920a0f5d4d178e3be92989426b6c29 (patch)
tree39780359d004d39c8b8c94faebbd170c7be160e3
parentc35c49df8868bccf924f39e6eebdc57da7811f19 (diff)
Réduit la place de la date
https://github.com/marienfressinaud/FreshRSS/issues/385 + oublie formLogin d'un patch précédent https://github.com/marienfressinaud/FreshRSS/commit/ae539f68395f9a09dbc04042fa281d97578f0d1e https://github.com/marienfressinaud/FreshRSS/issues/380
-rw-r--r--app/i18n/en.php2
-rw-r--r--app/i18n/fr.php2
-rw-r--r--app/views/index/formLogin.phtml24
-rw-r--r--p/themes/Dark/freshrss.css2
-rw-r--r--p/themes/Flat/freshrss.css2
-rw-r--r--p/themes/Origine/freshrss.css2
6 files changed, 7 insertions, 27 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php
index bb983d397..ae03af8d0 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -295,5 +295,5 @@ return array (
'Dec' => '\D\e\c\e\m\b\e\r',
// format for date() function, %s allows to indicate month in letter
'format_date' => '%s j\<\s\u\p\>S\<\/\s\u\p\> Y',
- 'format_date_hour' => '%s j\<\s\u\p\>S\<\/\s\u\p\> Y \a\t H\.i',
+ 'format_date_hour' => '%s j\<\s\u\p\>S\<\/\s\u\p\> Y \a\t H\:i',
);
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 2c44aa8d0..d927b3fbb 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -295,5 +295,5 @@ return array (
'Dec' => '\d\é\c\e\m\b\r\e',
// format pour la fonction date(), %s permet d'indiquer le mois en toutes lettres
'format_date' => 'j %s Y',
- 'format_date_hour' => '\l\e j %s Y \à H\:i',
+ 'format_date_hour' => 'j %s Y \à H\:i',
);
diff --git a/app/views/index/formLogin.phtml b/app/views/index/formLogin.phtml
index c92b5c187..e4560c1a0 100644
--- a/app/views/index/formLogin.phtml
+++ b/app/views/index/formLogin.phtml
@@ -1,25 +1,4 @@
-<style>
-h1, div > p {
- text-align:center;
-}
-p {
- margin:1em auto;
-}
-form {
- display:block;
- margin:1em auto 3em auto;
- padding:0;
- width:10em;
-}
-input, button.btn {
- display:block;
- margin:.5em auto;
-}
-input {
- width:99%;
-}
-</style>
-
+<div class="prompt">
<?php
if (Minz_Configuration::canLogIn()) {
?><h1><?php echo Minz_Translate::t('login'); ?></h1><?php
@@ -52,3 +31,4 @@ if (Minz_Configuration::canLogIn()) {
?>
<p><a href="<?php echo _url('index', 'about'); ?>"><?php echo Minz_Translate::t('about_freshrss'); ?></a></p>
+</div>
diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index 8f021e04a..9df540c04 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -282,7 +282,7 @@
font-weight: bold;
}
.flux .item.date {
- width: 200px;
+ width: 145px;
padding:0 5px 0 0;
text-align: right;
font-size: 10px;
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index 12a7d9bfb..6f2f75604 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -277,7 +277,7 @@ body {
font-weight: bold;
}
.flux .item.date {
- width: 200px;
+ width: 145px;
padding:0 5px 0 0;
text-align: right;
font-size: 10px;
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index ef86aa021..965980d11 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -291,7 +291,7 @@
font-weight: bold;
}
.flux .item.date {
- width: 200px;
+ width: 145px;
padding:0 5px 0 0;
text-align: right;
font-size: 10px;