From 79d857e46b8a67ab9c13cbb0089b7c206e825961 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 21 Aug 2013 14:12:14 +0200 Subject: Fix issue #119 : modif logo + corrections designs Modification du logo, merci Cypouz ! Petites modifications dans les designs "default" et "flat design" --- app/i18n/fr.php | 2 +- app/layout/header.phtml | 2 +- public/favicon.ico | Bin 1150 -> 1150 bytes public/favicon.png | Bin 685 -> 694 bytes public/icons/icon-128.png | Bin 0 -> 5753 bytes public/icons/icon-16.png | Bin 0 -> 694 bytes public/icons/icon-256.png | Bin 0 -> 11906 bytes public/icons/icon-32.png | Bin 0 -> 1534 bytes public/icons/icon-64.png | Bin 0 -> 2962 bytes public/icons/icon.svg | 213 +++++++++++++ public/logo.png | Bin 1743 -> 0 bytes public/logo.svg | 535 --------------------------------- public/themes/default/freshrss.css | 22 +- public/themes/flat-design/freshrss.css | 16 +- 14 files changed, 237 insertions(+), 553 deletions(-) create mode 100644 public/icons/icon-128.png create mode 100644 public/icons/icon-16.png create mode 100644 public/icons/icon-256.png create mode 100644 public/icons/icon-32.png create mode 100644 public/icons/icon-64.png create mode 100644 public/icons/icon.svg delete mode 100644 public/logo.png delete mode 100644 public/logo.svg diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 4273c0b75..71b3703cb 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -4,7 +4,7 @@ return array ( // LAYOUT 'login' => 'Connexion', 'logout' => 'Déconnexion', - 'search' => 'Rechercher un terme ou des #tags', + 'search' => 'Rechercher des mots ou des #tags', 'configuration' => 'Configuration', 'general_and_reading' => 'Général et lecture', diff --git a/app/layout/header.phtml b/app/layout/header.phtml index a46864482..eefa6af30 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -10,8 +10,8 @@
+

-
diff --git a/public/favicon.ico b/public/favicon.ico index 369a942bf..f7ae0a5b9 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon.png b/public/favicon.png index c88322930..3038dc3d1 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/icons/icon-128.png b/public/icons/icon-128.png new file mode 100644 index 000000000..41f8eaa0f Binary files /dev/null and b/public/icons/icon-128.png differ diff --git a/public/icons/icon-16.png b/public/icons/icon-16.png new file mode 100644 index 000000000..cc6efb54b Binary files /dev/null and b/public/icons/icon-16.png differ diff --git a/public/icons/icon-256.png b/public/icons/icon-256.png new file mode 100644 index 000000000..979581a75 Binary files /dev/null and b/public/icons/icon-256.png differ diff --git a/public/icons/icon-32.png b/public/icons/icon-32.png new file mode 100644 index 000000000..00c4ce2a9 Binary files /dev/null and b/public/icons/icon-32.png differ diff --git a/public/icons/icon-64.png b/public/icons/icon-64.png new file mode 100644 index 000000000..e2dad000d Binary files /dev/null and b/public/icons/icon-64.png differ diff --git a/public/icons/icon.svg b/public/icons/icon.svg new file mode 100644 index 000000000..8aefed2ad --- /dev/null +++ b/public/icons/icon.svg @@ -0,0 +1,213 @@ + + + + + Logo FreshRSS + + + + + + image/svg+xml + + Logo FreshRSS + 2013-08-20 + + + Cyprien POUZENC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/logo.png b/public/logo.png deleted file mode 100644 index 36a88e9c5..000000000 Binary files a/public/logo.png and /dev/null differ diff --git a/public/logo.svg b/public/logo.svg deleted file mode 100644 index 946a6553b..000000000 --- a/public/logo.svg +++ /dev/null @@ -1,535 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css index c0b6b78bd..cf32e9561 100644 --- a/public/themes/default/freshrss.css +++ b/public/themes/default/freshrss.css @@ -20,14 +20,13 @@ } .header > .item.title .logo { display: inline-block; - width: 32px; padding: 10px; } .header > .item.title h1 { display: inline-block; margin: 0; text-shadow: 1px -1px 0 #ccc; - vertical-align: bottom; + vertical-align: middle; } .header > .item.title a:hover { text-decoration: none; @@ -179,22 +178,22 @@ } .flux { - border-left: 10px solid #aaa; + border-left: 3px solid #aaa; background: #fafafa; } .flux:hover { background: #fff; } .flux.active { - border-left: 10px solid #0062BE; + border-left: 3px solid #0062BE; background: #fff; } .flux.not_read { - border-left: 10px solid #FF5300; + border-left: 3px solid #FF5300; background: #FFF3ED; } .flux.favorite { - border-left: 10px solid #FFC300; + border-left: 3px solid #FFC300; background: #FFF6DA; } @@ -467,13 +466,13 @@ /*** NOTIFICATION ***/ .notification { position: fixed; - bottom: 0; - left: 5%; right: 5%; + top: 10px; + left: 25%; right: 25%; min-height: 30px; padding: 10px; line-height: 30px; text-align: center; - border-radius: 5px 5px 0 0; + border-radius: 5px; box-shadow: 0 0 5px #666; background: #ddd; color: #666; @@ -504,14 +503,13 @@ .actualizeProgress { position: fixed; - top: 0; left: 25%; right: 25%; + top: 5px; left: 25%; right: 25%; width: 50%; padding: 5px; background: #fff; text-align: center; border: 1px solid #ddd; - border-top: none; - border-radius: 0 0 5px 5px; + border-radius: 5px; } .actualizeProgress progress { max-width: 100%; diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css index 245b97990..d3a51d05e 100644 --- a/public/themes/flat-design/freshrss.css +++ b/public/themes/flat-design/freshrss.css @@ -26,7 +26,7 @@ body { .header > .item.title h1 { display: inline-block; margin: 0; - vertical-align: bottom; + vertical-align: middle; } .header > .item.title a:hover { text-decoration: none; @@ -144,9 +144,18 @@ body { } .categories .notRead { position: absolute; - top: 5px; right: 3px; + top: 5px; right: 0px; + padding: 0 3px; color: #fff; font-size: 90%; + background: #3498DB; + border-left: 3px solid #2980B9; + border-radius: 5px 0 0 5px; + } + .categories .btn:hover .notRead, + .categories .btn.active .notRead { + background: #2980B9; + border-left: 3px solid #3498DB; } .post { @@ -457,8 +466,7 @@ body { /*** NOTIFICATION ***/ .notification { position: fixed; - top: 10px; - left: 10%; right: 10%; + top: 10px; left: 10%; right: 10%; min-height: 30px; padding: 10px; line-height: 30px; -- cgit v1.2.3