From f720d41cbfb18edc1b0a694a7213682b96befa1f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 13 Jan 2014 22:27:22 +0100 Subject: Mise à jour nom thèmes + chargement robuste des thèmes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renomme : default -> Origine En cas de thème introuvable, charge le thème par défaut, sinon le premier disponible. https://github.com/marienfressinaud/FreshRSS/issues/120 --- p/themes/Dark/global.css | 487 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 487 insertions(+) create mode 100644 p/themes/Dark/global.css (limited to 'p/themes/Dark/global.css') diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css new file mode 100644 index 000000000..04eb723f1 --- /dev/null +++ b/p/themes/Dark/global.css @@ -0,0 +1,487 @@ +@charset "UTF-8"; + +/* FONTS */ +@font-face { + font-family: "OpenSans"; + src: url("../fonts/openSans.woff") format("woff"); +} + + +* { + margin: 0; + padding: 0; +} +html, body { + height: 100%; + font-size: 95%; + font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif; + color: #888; +} + +/* LIENS */ +a { + color: #6986B2; + text-decoration: none; +} + a:hover { + text-decoration: underline; + } + +/* LISTES */ +ul, ol, dl { + margin: 10px 0 10px 30px; + line-height: 190%; +} + dd { + margin: 0 0 10px 30px; + } + +/* TITRES */ +h1, h2, h3 { + min-height: 40px; + margin: 15px 0 5px; + line-height: 40px; +} + +/* IMG */ +figure { + margin: 5px 0 10px; + text-align: center; +} + figcaption { + display: inline-block; + padding: 3px 20px; + color: #999; + font-style: italic; + border-bottom: 1px solid #ccc; + } +img { + height: auto; + max-width: 100%; + vertical-align: middle; +} + a img { + border: none; + } + +/* VIDEOS */ +iframe, embed, object, video { + max-width: 100%; +} + +/* FORMULAIRES */ +legend { + display: block; + width: 100%; + margin: 20px 0 5px; + padding: 5px 0; + border-bottom: 1px solid #2f2f2f; + font-size: 150%; + clear: both; +} +label { + display: block; + min-height: 25px; + padding: 5px 0; + font-size: 14px; + line-height: 25px; + cursor: pointer; +} +input, select, textarea { + display: inline-block; + max-width: 100%; + min-height: 25px; + padding: 5px; + background: #333; + border: 1px solid #000; + border-radius: 3px; + color: #999; + line-height: 25px; + vertical-align: middle; + box-shadow: 0 2px 2px #1d1d1d inset; +} + option { + padding:0 .5em 0 .5em; + } + input[type="radio"], + input[type="checkbox"] { + width: 15px !important; + min-height: 15px !important; + } + input:focus, select:focus, textarea:focus { + color: #6986b2; + border-color: #2f2f2f; + } + input:invalid, select:invalid { + border-color: red; + box-shadow: 0 0 2px 1px red; + } + +.form-group { + margin: 0; +} + .form-group:after { + content: ""; + display: block; + clear: both; + } + .form-group.form-actions { + min-width: 250px; + padding: 5px 0; + background: #1a1a1a; + border-top: 1px solid #2f2f2f; + } + .form-group.form-actions .btn { + margin: 0 10px; + } + .form-group .group-name { + display: block; + float: left; + width: 200px; + padding: 10px 0; + text-align: right; + } + .form-group .group-controls { + min-width: 250px; + min-height: 25px; + margin: 0 0 0 220px; + padding: 5px 0; + } + .form-group .group-controls .control { + display: block; + min-height: 30px; + padding: 5px 0; + line-height: 25px; + font-size: 14px; + } + +.stick { + display: inline-block; + white-space: nowrap; + font-size: 0px; + vertical-align: middle; +} + .stick input, + .stick .btn { + border-radius: 0; + font-size: 14px; + } + .stick .btn:first-child, + .stick input:first-child { + border-radius: 3px 0 0 3px; + } + .stick .btn-important:first-child { + border-right: 1px solid #000; + } + .stick .btn:last-child, + .stick input:last-child { + border-radius: 0 3px 3px 0; + } + .stick .btn + .btn, + .stick .btn + input, + .stick input + .btn, + .stick input + input { + border-left: none; + } + .stick .btn + .dropdown > .btn { + border-left: none; + border-radius: 0 3px 3px 0; + } + .stick .btn + .dropdown a { + font-size: 12px; + } + +.btn { + display: inline-block; + min-height: 37px; + min-width: 15px; + padding: 5px 10px; + background: linear-gradient(to bottom, #fff 0%, #eee 100%); + border-radius: 3px; + border: 1px solid #000; + color: #888; + line-height: 20px; + vertical-align: middle; + cursor: pointer; + overflow: hidden; +} + a.btn { + min-height: 25px; + line-height: 25px; + } + .btn:hover { + background: linear-gradient(to bottom, #4A5D7A, #26303F); + text-decoration: none; + } + .btn.active, + .btn:active, + .dropdown-target:target ~ .btn.dropdown-toggle { + background: #26303F; + } + + .btn-important { + background: linear-gradient(to bottom, #0084CC, #0045CC); + color: #888888; + border: 1px solid #000000; + } + .btn-important:hover { + background: linear-gradient(to bottom, #0066CC, #0045CC); + } + .btn-important:active { + background: #0044CB; + box-shadow: none; + } + + .btn-attention { + background: linear-gradient(to bottom, #E95B57, #BD362F); + color: #888888; + border: 1px solid #000000; + } + .btn-attention:hover { + background: linear-gradient(to bottom, #D14641, #BD362F); + } + .btn-attention:active { + background: #BD362F; + box-shadow: none; + } + +/* NAVIGATION */ +.nav-list .nav-header, +.nav-list .item { + display: block; + height: 35px; + line-height: 35px; +} + .nav-list .item:hover { + background: #1a1a1a; + } + .nav-list .item:hover a { + color: #26303F; + } + .nav-list .item.active { + background: #26303F; + color: #1a1a1a; + } + .nav-list .item.active a { + color: #888; + } + .nav-list .disable { + color: #aaa; + background: #fafafa; + text-align: center; + } + .nav-list .item > * { + display: block; + padding: 0 10px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .nav-list a:hover { + text-decoration: none; + } + .nav-list .item.error a { + color: #BD362F; + } + .nav-list .item.active.error a { + color: #fff; + background: #BD362F; + } + .nav-list .item.empty a { + color: #f39c12; + } + .nav-list .item.active.empty a { + color: #fff; + background: #f39c12; + } + + .nav-list .nav-header { + padding: 0 10px; + background: #1a1a1a; + border-bottom: 1px solid #2f2f2f; + font-weight: bold; + } + .nav-list .separator { + display: block; + height: 0; + margin: 5px 0; + border-bottom: 1px solid #ddd; + } + + .nav-list .nav-form { + padding: 3px; + text-align: center; + } + +.nav-head { + display: block; + margin: 0; + background: linear-gradient(to bottom, #fff, #f0f0f0); + border-bottom: 1px solid #ddd; + text-align: right; +} + .nav-head .item { + display: inline-block; + padding: 5px 10px; + } + +/* HORIZONTAL-LIST */ +.horizontal-list { + display: table; + table-layout: fixed; + margin: 0; + padding: 0; + width: 100%; +} + .horizontal-list .item { + display: table-cell; + vertical-align: middle; + } + +/* DROPDOWN */ +.dropdown { + position: relative; + display: inline-block; +} + .dropdown-target { + display: none; + } + + .dropdown-menu { + display: none; + min-width: 200px; + margin: 5px 0 0; + padding: 5px 0; + position: absolute; + right: 0px; + background: #1a1a1a; + border: 1px solid #888; + border-radius: 5px; + text-align: left; + } + .dropdown-menu:after { + content: ""; + position: absolute; + top: -6px; + right: 13px; + width: 10px; + height: 10px; + background: #1a1a1a; + border-top: 1px solid #888; + border-left: 1px solid #888; + z-index: -10; + transform: rotate(45deg); + } + .dropdown-header { + display: block; + padding: 0 5px; + color: #888; + font-weight: bold; + font-size: 14px; + line-height: 30px; + } + .dropdown-menu .item { + display: block; + height: 30px; + font-size: 90%; + line-height: 30px; + } + .dropdown-menu > .item > a { + display: block; + padding: 0 25px; + line-height: 30px; + } + .dropdown-menu > .item:hover { + background: #26303F; + color: #888; + } + .dropdown-menu > .item[aria-checked="true"] > a:before { + content: '✓ '; + font-weight: bold; + margin: 0 0 0 -1.2em; + padding: 0 0.2em 0 0; + } + .dropdown-menu > .item:hover > a { + color: #888; + text-decoration: none; + } + .dropdown-menu .input { + display: block; + height: 40px; + font-size: 90%; + line-height: 30px; + } + .dropdown-menu .input select, + .dropdown-menu .input input { + display: block; + height: 20px; + width: 95%; + margin: auto; + padding: 2px 5px; + border-radius: 3px; + } + .dropdown-menu .input select { + width: 70%; + height: auto; + } + .dropdown-menu .separator { + display: block; + height: 0; + margin: 5px 0; + border-bottom: 1px solid #888; + } + .dropdown-target:target ~ .dropdown-menu { + display: block; + z-index: 10; + } + .dropdown-close { + display: inline; + } + .dropdown-close a { + font-size: 0; + position: fixed; + top: 0; bottom: 0; + left: 0; right: 0; + display: block; + z-index: -10; + } + +/* ALERTS */ +.alert { + display: block; + width: 90%; + margin: 15px auto; + padding: 10px 15px; + background: #1a1a1a; + border: 1px solid #ccc; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + border-radius: 5px; + color: #aaa; +} + .alert-head { + margin: 0; + font-weight: bold; + font-size: 110%; + } + .alert-warn { + border: 1px solid #c95; + color: #c95; + } + .alert-success { + border: 1px solid #484; + color: #484; + } + .alert-error { + border: 1px solid #844; + color: #844; + } + +/* ICÔNES */ +.icon { + display: inline-block; + width: 16px; + height: 16px; + vertical-align: middle; + line-height: 16px; +} -- cgit v1.2.3 From fd26178d7ca8ef3258d15ca95d43af143b4cd440 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 13 Jan 2014 23:31:07 +0100 Subject: Lien pour ajouter des flux quand FreshRSS est vide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/marienfressinaud/FreshRSS/issues/355 + Correction bug cache thèmes du précédant patch --- app/FreshRSS.php | 2 +- app/i18n/en.php | 4 ++-- app/i18n/fr.php | 4 ++-- app/views/helpers/view/normal_view.phtml | 3 ++- app/views/helpers/view/reader_view.phtml | 3 ++- p/themes/Dark/global.css | 4 ++++ p/themes/Flat/global.css | 4 ++++ p/themes/Origine/global.css | 4 ++++ 8 files changed, 21 insertions(+), 7 deletions(-) (limited to 'p/themes/Dark/global.css') diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 52f34c6e2..40e1d23db 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -117,7 +117,7 @@ class FreshRSS extends Minz_FrontController { $theme = FreshRSS_Themes::load($this->conf->theme); if ($theme) { foreach($theme['files'] as $file) { - Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['id'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['path'] . '/' . $file))); + Minz_View::appendStyle (Minz_Url::display ('/themes/' . $theme['id'] . '/' . $file . '?' . @filemtime(PUBLIC_PATH . '/themes/' . $theme['id'] . '/' . $file))); } } diff --git a/app/i18n/en.php b/app/i18n/en.php index 71ca9538f..c90563036 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -157,7 +157,7 @@ return array ( 'not_yet_implemented' => 'Not yet implemented', 'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds', 'no_selected_feed' => 'No feed selected.', - 'think_to_add' => 'Think to add RSS feeds!', + 'think_to_add' => 'Remember to add some RSS feeds!', 'current_user' => 'Current user', 'default_user' => 'Username of the default user (maximum 16 alphanumeric characters)', @@ -242,7 +242,7 @@ return array ( 'before_yesterday' => 'Before yesterday', 'by_author' => 'By %s', 'related_tags' => 'Related tags', - 'no_feed_to_display' => 'No feed to show.', + 'no_feed_to_display' => 'There is no feed to show yet.', 'about_freshrss' => 'About FreshRSS', 'project_website' => 'Project website', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 8ffc5ec88..37f847f4d 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -157,7 +157,7 @@ return array ( 'not_yet_implemented' => 'Pas encore implémenté', 'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP', 'no_selected_feed' => 'Aucun flux sélectionné.', - 'think_to_add' => 'Pensez à en ajouter !', + 'think_to_add' => 'Pensez à en ajouter !', 'current_user' => 'Utilisateur actuel', 'password' =>'Mot de passe
(pour connexion par formulaire)', @@ -242,7 +242,7 @@ return array ( 'before_yesterday' => 'À partir d’avant-hier', 'by_author' => 'Par %s', 'related_tags' => 'Tags associés', - 'no_feed_to_display' => 'Il n’y a aucun flux à afficher.', + 'no_feed_to_display' => 'Il n’y a aucun flux à afficher pour l’instant.', 'about_freshrss' => 'À propos de FreshRSS', 'project_website' => 'Site du projet', diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index 7e4457ecc..40c840e5d 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -217,5 +217,6 @@ if (!empty($this->entries)) {
+
- \ No newline at end of file + diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml index 55d7bb99e..bda96e86d 100644 --- a/app/views/helpers/view/reader_view.phtml +++ b/app/views/helpers/view/reader_view.phtml @@ -44,5 +44,6 @@ if (!empty($this->entries)) {
+
- \ No newline at end of file + diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css index 04eb723f1..c76e3b1ba 100644 --- a/p/themes/Dark/global.css +++ b/p/themes/Dark/global.css @@ -464,6 +464,10 @@ input, select, textarea { font-weight: bold; font-size: 110%; } + .alert > a { + color: inherit; + text-decoration: underline; + } .alert-warn { border: 1px solid #c95; color: #c95; diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css index 5fd0a4dcf..df9c9f8c9 100644 --- a/p/themes/Flat/global.css +++ b/p/themes/Flat/global.css @@ -469,6 +469,10 @@ input, select, textarea { font-weight: bold; font-size: 110%; } + .alert > a { + color: inherit; + text-decoration: underline; + } .alert-warn { background: #ffe; border: 1px solid #eeb; diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css index 49f3aa4cd..23e190330 100644 --- a/p/themes/Origine/global.css +++ b/p/themes/Origine/global.css @@ -477,6 +477,10 @@ input, select, textarea { font-weight: bold; font-size: 110%; } + .alert > a { + color: inherit; + text-decoration: underline; + } .alert-warn { background: #ffe; border: 1px solid #eeb; -- cgit v1.2.3 From 0acbb8e92186a04b39e5e06f62cfc1eee42e13d8 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Wed, 22 Jan 2014 19:34:00 -0500 Subject: Changement de la couleur de fond de la barre de déconnexion La barre de déconnexion lors de la navigation mobile est blanche sur le thème Dark. Le fond a été modifié pour être cohérent avec le reste du thème. Voir #370 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- p/themes/Dark/freshrss.css | 6 +----- p/themes/Dark/global.css | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'p/themes/Dark/global.css') diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index 2e9ecee21..af2a7d455 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -807,11 +807,7 @@ select.number option { } .nav-head { - background: #fff; - background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%); - background: -webkit-linear-gradient(top, #fff 0%, #f0f0f0 100%); - background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%); - background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%); + background: #1c1c1c; } .header > .item.search input { diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css index c76e3b1ba..b982dd596 100644 --- a/p/themes/Dark/global.css +++ b/p/themes/Dark/global.css @@ -317,7 +317,7 @@ input, select, textarea { display: block; margin: 0; background: linear-gradient(to bottom, #fff, #f0f0f0); - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #2f2f2f; text-align: right; } .nav-head .item { -- cgit v1.2.3 From ae539f68395f9a09dbc04042fa281d97578f0d1e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 23 Jan 2014 20:38:33 +0100 Subject: Style formulaire connexion Termine https://github.com/marienfressinaud/FreshRSS/issues/380 --- p/themes/Dark/global.css | 17 +++++++++++++++++ p/themes/Flat/global.css | 17 +++++++++++++++++ p/themes/Origine/global.css | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) (limited to 'p/themes/Dark/global.css') diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css index b982dd596..4d71c43c5 100644 --- a/p/themes/Dark/global.css +++ b/p/themes/Dark/global.css @@ -489,3 +489,20 @@ input, select, textarea { vertical-align: middle; line-height: 16px; } + +/* Prompt (centré) */ +.prompt > h1, .prompt > p { + text-align:center; +} +.prompt > form { + margin:1em auto 2.5em auto; + width:10em; +} +.prompt .btn { + display:block; + margin:.5em auto; +} +.prompt input { + margin:.4em auto 1.1em auto; + width:99%; +} diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css index df9c9f8c9..af1d37549 100644 --- a/p/themes/Flat/global.css +++ b/p/themes/Flat/global.css @@ -497,3 +497,20 @@ input, select, textarea { vertical-align: middle; line-height: 16px; } + +/* Prompt (centré) */ +.prompt > h1, .prompt > p { + text-align:center; +} +.prompt > form { + margin:1em auto 2.5em auto; + width:10em; +} +.prompt .btn { + display:block; + margin:.5em auto; +} +.prompt input { + margin:.4em auto 1.1em auto; + width:99%; +} diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css index 23e190330..4a4418dea 100644 --- a/p/themes/Origine/global.css +++ b/p/themes/Origine/global.css @@ -505,3 +505,20 @@ input, select, textarea { vertical-align: middle; line-height: 16px; } + +/* Prompt (centré) */ +.prompt > h1, .prompt > p { + text-align:center; +} +.prompt > form { + margin:1em auto 2.5em auto; + width:10em; +} +.prompt .btn { + display:block; + margin:.5em auto; +} +.prompt input { + margin:.4em auto 1.1em auto; + width:99%; +} -- cgit v1.2.3 From 153742b6028cf3df4266151f94e50d667e60fd5b Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 25 Jan 2014 14:32:52 +0100 Subject: Mise à jour thème Dark et Origine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Certaines lignes étaient trop claires par rapport au reste du thème Le .stick était "buggué" avec la présence de .dropbox (une bordure de trop). Le problème était surtout visible sur le thème Dark mais a aussi été corrigé sur Origine (Flat Design n'a pas ce problème puisque pas de bordures par défaut) --- p/themes/Dark/freshrss.css | 6 +++--- p/themes/Dark/global.css | 9 +++++++-- p/themes/Origine/global.css | 7 ++++++- 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'p/themes/Dark/global.css') diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index 2ad30fab2..8e2efd383 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -201,8 +201,8 @@ font-weight: bold; line-height: 50px; background: #1c1c1c; - border-top: 1px solid #888; - border-bottom: 1px solid #888; + border-top: 1px solid #2f2f2f; + border-bottom: 1px solid #2f2f2f; } .day:first-child { border-top: none; @@ -244,7 +244,7 @@ } .flux { - border-left: 3px solid #aaa; + border-left: 3px solid #2f2f2f; background: #1c1c1c; } .flux.not_read { diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css index 4d71c43c5..b02f00526 100644 --- a/p/themes/Dark/global.css +++ b/p/themes/Dark/global.css @@ -179,8 +179,13 @@ input, select, textarea { } .stick .btn + .btn, .stick .btn + input, + .stick .btn + .dropdown > .btn, .stick input + .btn, - .stick input + input { + .stick input + input, + .stick input + .dropdown > .btn, + .stick .dropdown + .btn, + .stick .dropdown + input, + .stick .dropdown + .dropdown > .btn { border-left: none; } .stick .btn + .dropdown > .btn { @@ -305,7 +310,7 @@ input, select, textarea { display: block; height: 0; margin: 5px 0; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #2f2f2f; } .nav-list .nav-form { diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css index 4a4418dea..5209ad161 100644 --- a/p/themes/Origine/global.css +++ b/p/themes/Origine/global.css @@ -179,8 +179,13 @@ input, select, textarea { } .stick .btn + .btn, .stick .btn + input, + .stick .btn + .dropdown > .btn, .stick input + .btn, - .stick input + input { + .stick input + input, + .stick input + .dropdown > .btn, + .stick .dropdown + .btn, + .stick .dropdown + input, + .stick .dropdown + .dropdown > .btn { border-left: none; } .stick input + .btn { -- cgit v1.2.3 From 0aa0686b09ca2d18b217f960ab374e6a20d1c862 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 25 Jan 2014 16:34:13 +0100 Subject: Certains input s'agrandissent à la sélection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Désormais, les champs marqués d'un .extend s'étendront sur 300px (taille par défaut = 180px). Cela a été impliqué dans tous les thèmes. Le champs de recherche bénéficie de cette amélioration (mais ce dernier est un peu plus grand par défaut) Voir issue #375 --- app/layout/aside_feed.phtml | 4 ++-- app/layout/header.phtml | 2 +- app/layout/nav_menu.phtml | 2 +- app/views/configure/feed.phtml | 18 +++++++++--------- app/views/configure/sharing.phtml | 6 +++--- app/views/configure/users.phtml | 4 ++-- p/themes/Dark/freshrss.css | 5 ++--- p/themes/Dark/global.css | 11 +++++++++++ p/themes/Flat/freshrss.css | 8 +++++++- p/themes/Flat/global.css | 11 +++++++++++ p/themes/Origine/freshrss.css | 7 +++---- p/themes/Origine/global.css | 11 +++++++++++ 12 files changed, 63 insertions(+), 26 deletions(-) (limited to 'p/themes/Dark/global.css') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 2446e72cb..e324b15bd 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -27,10 +27,10 @@
  • - +
  • - +
    • diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 69b9c65a1..b00c30e71 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -36,7 +36,7 @@ if (Minz_Configuration::canLogIn()) {
    - + diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index edd7707ad..c807e6dd5 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -205,7 +205,7 @@
    - + diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index fc26ab58b..138808a9f 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -16,26 +16,26 @@
    - +
    - +
    - +
    - +
    - +
    - +  
    @@ -106,13 +106,13 @@
    - +
    - +
    @@ -127,7 +127,7 @@
    - +
    diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml index c6a96b48a..9dc733392 100644 --- a/app/views/configure/sharing.phtml +++ b/app/views/configure/sharing.phtml @@ -10,7 +10,7 @@
    - +
    @@ -21,7 +21,7 @@
    - +
    @@ -32,7 +32,7 @@
    - +
    diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml index f37b2320f..8ab4c04ba 100644 --- a/app/views/configure/users.phtml +++ b/app/views/configure/users.phtml @@ -29,7 +29,7 @@ conf->mail_login; ?>
    - placeholder="alice@example.net" /> + placeholder="alice@example.net" />
    @@ -145,7 +145,7 @@ conf->mail_login; ?>
    - +
    diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css index 19809c215..77dd1fc4f 100644 --- a/p/themes/Dark/freshrss.css +++ b/p/themes/Dark/freshrss.css @@ -31,7 +31,6 @@ } .header > .item.search input { width: 230px; - transition: width 200ms linear; } .header .item.search input:focus { width: 330px; @@ -825,9 +824,9 @@ select.number option { background: #1c1c1c; } -.header > .item.search input { +input.extend { -moz-transition: width 200ms linear; - -webkit-transition: width 200ms linear; + -webkit-transition: width 200ms linear; -o-transition: width 200ms linear; -ms-transition: width 200ms linear; } diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css index b02f00526..f96f83fc8 100644 --- a/p/themes/Dark/global.css +++ b/p/themes/Dark/global.css @@ -87,6 +87,13 @@ label { line-height: 25px; cursor: pointer; } +input { + width: 180px; +} +textarea { + width: 360px; + height: 100px; +} input, select, textarea { display: inline-block; max-width: 100%; @@ -116,6 +123,10 @@ input, select, textarea { border-color: red; box-shadow: 0 0 2px 1px red; } + input:focus.extend { + width: 300px; + transition: width 200ms linear; + } .form-group { margin: 0; diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css index 894497656..04b3df842 100644 --- a/p/themes/Flat/freshrss.css +++ b/p/themes/Flat/freshrss.css @@ -34,7 +34,6 @@ body { } .header > .item.search input { width: 230px; - transition: width 200ms linear; } .header .item.search input:focus { width: 330px; @@ -800,6 +799,13 @@ select.number option { -ms-transform: rotate(45deg); } +input.extend { + -moz-transition: width 200ms linear; + -webkit-transition: width 200ms linear; + -o-transition: width 200ms linear; + -ms-transition: width 200ms linear; +} + @media print { .header, .aside, diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css index af1d37549..e3baa26ab 100644 --- a/p/themes/Flat/global.css +++ b/p/themes/Flat/global.css @@ -88,6 +88,13 @@ label { font-weight: bold; color: #444; } +input { + width: 180px; +} +textarea { + width: 360px; + height: 100px; +} input, select, textarea { display: inline-block; max-width: 100%; @@ -117,6 +124,10 @@ input, select, textarea { border-color: red; box-shadow: 0 0 2px 1px red; } + input:focus.extend { + width: 300px; + transition: width 200ms linear; + } .form-group { margin: 5px 0; diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css index be549bf41..906e0c72b 100644 --- a/p/themes/Origine/freshrss.css +++ b/p/themes/Origine/freshrss.css @@ -32,7 +32,6 @@ } .header > .item.search input { width: 230px; - transition: width 200ms linear; } .header .item.search input:focus { width: 330px; @@ -847,9 +846,9 @@ select.number option { background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%); } -.header > .item.search input { +input.extend { -moz-transition: width 200ms linear; - -webkit-transition: width 200ms linear; + -webkit-transition: width 200ms linear; -o-transition: width 200ms linear; -ms-transition: width 200ms linear; } @@ -857,7 +856,7 @@ select.number option { @media(max-width: 840px) { .aside { -moz-transition: width 200ms linear; - -webkit-transition: width 200ms linear; + -webkit-transition: width 200ms linear; -o-transition: width 200ms linear; -ms-transition: width 200ms linear; } diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css index 5209ad161..58a3a52b1 100644 --- a/p/themes/Origine/global.css +++ b/p/themes/Origine/global.css @@ -86,6 +86,13 @@ label { line-height: 25px; cursor: pointer; } +input { + width: 180px; +} +textarea { + width: 360px; + height: 100px; +} input, select, textarea { display: inline-block; max-width: 100%; @@ -116,6 +123,10 @@ input, select, textarea { border-color: red; box-shadow: 0 0 2px 1px red; } + input:focus.extend { + width: 300px; + transition: width 200ms linear; + } .form-group { margin: 0; -- cgit v1.2.3