From 9e219cbf5014c8f4f52f3ca6722f7a20cdcc13dd Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 12 May 2013 19:21:39 +0200 Subject: Fix issue #70 : lorsqu'on rencontre un problème avec un flux, on l'indique à l'utilisateur (couleur rouge) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/global.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'public/theme/global.css') diff --git a/public/theme/global.css b/public/theme/global.css index 99b335585..258d84baf 100644 --- a/public/theme/global.css +++ b/public/theme/global.css @@ -261,6 +261,13 @@ input, select, textarea { .nav.nav-list a:hover { text-decoration: none; } + .nav.nav-list .item.error a { + color: #BD362F; + } + .nav.nav-list .item.active.error a { + color: #fff; + background: #BD362F; + } .nav.nav-list .nav-header { padding: 0 10px; -- cgit v1.2.3 From 64c6c65c3c179d69706859e1aaa4a5647f7bb20c Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 16 Jun 2013 21:10:03 +0200 Subject: Ajustement CSS pour les iframes (les vidéos Youtube débordent sinon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/global.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'public/theme/global.css') diff --git a/public/theme/global.css b/public/theme/global.css index 258d84baf..ea83b4deb 100644 --- a/public/theme/global.css +++ b/public/theme/global.css @@ -50,6 +50,11 @@ img { border: none; } +/* IFRAME */ +iframe { + max-width: 100%; +} + /* FORMULAIRES */ legend { display: block; -- cgit v1.2.3 From a73c6de610c33e4431dc8bca0758319bc3e831bd Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 23 Jun 2013 12:30:09 +0200 Subject: Fix issue #92 : agrandissement des boutons close MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Permet une meilleure sélection (notamment en vue mobile) mais nécessitera peut-être encore un réajustement dans le futur --- public/theme/freshrss.css | 10 +++++----- public/theme/global.css | 16 ++++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'public/theme/global.css') diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css index 345bd5252..613a6f037 100644 --- a/public/theme/freshrss.css +++ b/public/theme/freshrss.css @@ -332,7 +332,7 @@ overflow: auto; } #stream.global .category .feeds .item { - padding: 0 10px; + padding: 2px 10px; font-size: 90%; } @@ -563,13 +563,13 @@ position: absolute; right: 0; display: inline-block; - width: 20px; - height: 20px; + width: 26px; + height: 26px; margin: 0 10px 0 0; border: 1px solid #ccc; - border-radius: 10px; + border-radius: 20px; text-align: center; - line-height: 20px; + line-height: 26px; } .aside .categories { margin: 30px 0; diff --git a/public/theme/global.css b/public/theme/global.css index ea83b4deb..4c504db63 100644 --- a/public/theme/global.css +++ b/public/theme/global.css @@ -50,8 +50,8 @@ img { border: none; } -/* IFRAME */ -iframe { +/* VIDEOS */ +iframe, embed, object { max-width: 100%; } @@ -396,15 +396,19 @@ input, select, textarea { display: inline-block; position: absolute; top: -16px; right: -16px; - width: 16px; - height: 16px; - padding: 5px; + width: 26px; + height: 26px; background: #fff; border-radius: 50px; border: 1px solid #ddd; - line-height: 16px; + line-height: 26px; text-align: center; } + .dropdown .dropdown-close a { + display: block; + width: 100%; + height: 100%; + } .dropdown .dropdown-close:hover { background: #f4f4f4; } -- cgit v1.2.3 From dff85f9a304a6ff2ede764a8f62024e7b4ff074e Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 23 Jun 2013 15:05:39 +0200 Subject: Ajout d'une barre de navigation en version mobile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix issue #57 : pas d'effet de slide (effet trop bling-bling) mais ajout d'une barre de navigation permettant d'aller à l'article suivant / précédent ou de remonter en haut de la page --- app/layout/nav_entries.phtml | 5 +++ app/views/helpers/normal_view.phtml | 2 ++ app/views/javascript/main.phtml | 64 ++++++++++++++++++++++-------------- public/theme/freshrss.css | 33 +++++++++++++++++++ public/theme/global.css | 8 +++++ public/theme/icons/next.png | Bin 0 -> 373 bytes public/theme/icons/next.svg | 31 +++++++++++++++++ public/theme/icons/previous.png | Bin 0 -> 395 bytes public/theme/icons/previous.svg | 31 +++++++++++++++++ 9 files changed, 150 insertions(+), 24 deletions(-) create mode 100644 app/layout/nav_entries.phtml create mode 100644 public/theme/icons/next.png create mode 100644 public/theme/icons/next.svg create mode 100644 public/theme/icons/previous.png create mode 100644 public/theme/icons/previous.svg (limited to 'public/theme/global.css') diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml new file mode 100644 index 000000000..101e7443e --- /dev/null +++ b/app/layout/nav_entries.phtml @@ -0,0 +1,5 @@ +
    +
    • +
    • +
    • +
\ No newline at end of file diff --git a/app/views/helpers/normal_view.phtml b/app/views/helpers/normal_view.phtml index 2ca365552..eaf1e4276 100644 --- a/app/views/helpers/normal_view.phtml +++ b/app/views/helpers/normal_view.phtml @@ -107,6 +107,8 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { entryPaginator->render ('pagination.phtml', 'next'); ?> +partial ('nav_entries'); ?> +
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index e290e02d3..e51cf978e 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -105,6 +105,32 @@ function mark_favorite (active) { }); } +function prev_entry() { + old_active = $(".flux.active"); + last_active = $(".flux:last"); + new_active = old_active.prevAll (".flux:first"); + + if (new_active.hasClass("flux")) { + toggleContent (new_active, old_active); + } else if (old_active[0] === undefined && + new_active[0] === undefined) { + toggleContent (last_active, old_active); + } +} + +function next_entry() { + old_active = $(".flux.active"); + first_active = $(".flux:first"); + new_active = old_active.nextAll (".flux:first"); + + if (new_active.hasClass("flux")) { + toggleContent (new_active, old_active); + } else if (old_active[0] === undefined && + new_active[0] === undefined) { + toggleContent (first_active, old_active); + } +} + function init_img () { $(".flux_content .content img").each (function () { if ($(this).width () > ($(".flux_content .content").width()) / 2) { @@ -206,18 +232,7 @@ function init_shortcuts () { }); // Touches de navigation - shortcut.add("", function () { - old_active = $(".flux.active"); - last_active = $(".flux:last"); - new_active = old_active.prevAll (".flux:first"); - - if (new_active.hasClass("flux")) { - toggleContent (new_active, old_active); - } else if (old_active[0] === undefined && - new_active[0] === undefined) { - toggleContent (last_active, old_active); - } - }, { + shortcut.add("", prev_entry, { 'disable_in_input':true }); shortcut.add("shift+", function () { @@ -230,18 +245,7 @@ function init_shortcuts () { }, { 'disable_in_input':true }); - shortcut.add("", function () { - old_active = $(".flux.active"); - first_active = $(".flux:first"); - new_active = old_active.nextAll (".flux:first"); - - if (new_active.hasClass("flux")) { - toggleContent (new_active, old_active); - } else if (old_active[0] === undefined && - new_active[0] === undefined) { - toggleContent (first_active, old_active); - } - }, { + shortcut.add("", next_entry, { 'disable_in_input':true }); shortcut.add("shift+", function () { @@ -281,6 +285,17 @@ function init_shortcuts () { }); } +function init_nav_entries() { + $('.nav_entries a.previous_entry').click(function() { + prev_entry(); + return false; + }); + $('.nav_entries a.next_entry').click(function() { + next_entry(); + return false; + }); +} + $(document).ready (function () { if(is_reader_mode()) { hide_posts = false; @@ -288,4 +303,5 @@ $(document).ready (function () { init_posts (); init_column_categories (); init_shortcuts (); + init_nav_entries(); }); diff --git a/public/theme/freshrss.css b/public/theme/freshrss.css index 613a6f037..178472ac9 100644 --- a/public/theme/freshrss.css +++ b/public/theme/freshrss.css @@ -426,6 +426,11 @@ .pagination:last-child .item { border-top: 1px solid #aaa; } + +.nav_entries { + display: none; +} + .loading { background: url("loader.gif") center center no-repeat; font-size: 0; @@ -538,6 +543,9 @@ font-size: 120%; } + .pagination { + margin: 0 0 40px; + } .pagination .pager-previous, .pagination .pager-next { width: 100px; } @@ -574,4 +582,29 @@ .aside .categories { margin: 30px 0; } + + .nav_entries { + display: table; + width: 100%; + height: 40px; + position: fixed; + bottom: 0; + margin: 0; + background: #fff; + border-top: 1px solid #ddd; + text-align: center; + line-height: 40px; + table-layout: fixed; + } + .nav_entries .item { + display: table-cell; + width: 30%; + } + .nav_entries .item a { + display: block; + } + .nav_entries .item .icon.i_up { + margin: 5px 0 0; + vertical-align: top; + } } diff --git a/public/theme/global.css b/public/theme/global.css index 4c504db63..b1fd01436 100644 --- a/public/theme/global.css +++ b/public/theme/global.css @@ -517,6 +517,14 @@ input, select, textarea { background-image: url("icons/up.png"); background-image: url("icons/up.svg"); } + .icon.i_next { + background-image: url("icons/next.png"); + background-image: url("icons/next.svg"); + } + .icon.i_prev { + background-image: url("icons/previous.png"); + background-image: url("icons/previous.svg"); + } .icon.i_help { background-image: url("icons/help.png"); background-image: url("icons/help.svg"); diff --git a/public/theme/icons/next.png b/public/theme/icons/next.png new file mode 100644 index 000000000..ab3490c3b Binary files /dev/null and b/public/theme/icons/next.png differ diff --git a/public/theme/icons/next.svg b/public/theme/icons/next.svg new file mode 100644 index 000000000..72637b4e6 --- /dev/null +++ b/public/theme/icons/next.svg @@ -0,0 +1,31 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + diff --git a/public/theme/icons/previous.png b/public/theme/icons/previous.png new file mode 100644 index 000000000..10e40669e Binary files /dev/null and b/public/theme/icons/previous.png differ diff --git a/public/theme/icons/previous.svg b/public/theme/icons/previous.svg new file mode 100644 index 000000000..67685c50c --- /dev/null +++ b/public/theme/icons/previous.svg @@ -0,0 +1,31 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + -- cgit v1.2.3 From 371434c63acedb4229c48ea8e737b908f271ca26 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 2 Jul 2013 18:04:02 +0200 Subject: Fix issues #93 et #94 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Les noms de catégorie trop longs ne cassent plus les boutons dans la colonne de gauche (ajout d'un overflow hidden) Les articles enroulés ne bugguent plus lorsqu'on charge plus d'articles. L'action au clic pour dérouler un article était appliqué deux fois, désormais on "unbind" d'abord l'action avant de la réappliquer (pas très efficace mais c'est la façon la plus simple) --- app/views/javascript/main.phtml | 4 +++- public/theme/global.css | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'public/theme/global.css') diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index b3da278bc..9226efe63 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -163,7 +163,9 @@ function init_posts () { $(".flux:not(.active) .flux_content").hide (); } - $(".flux_header .item.title, .flux_header .item.date").click (function () { + var flux_header_toggle = $(".flux_header .item.title, .flux_header .item.date"); + flux_header_toggle.unbind('click'); // évite d'associer 2 fois le toggle + flux_header_toggle.click (function () { old_active = $(".flux.active"); new_active = $(this).parent ().parent (); diff --git a/public/theme/global.css b/public/theme/global.css index b1fd01436..081d26730 100644 --- a/public/theme/global.css +++ b/public/theme/global.css @@ -188,6 +188,7 @@ input, select, textarea { line-height: 20px; vertical-align: middle; cursor: pointer; + overflow: hidden; } a.btn { min-height: 25px; -- cgit v1.2.3 From b5f233f6d524ca9f74e9d33bf5692a1a678d7fec Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 4 Jul 2013 19:26:33 +0200 Subject: Fix CSS (Windows) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sous Windows, le redimensionnement des radiobox et des checkbox est effectif (contrairement à Gnu/Linux). On force désormais la taille de ces éléments à 15px --- public/theme/global.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'public/theme/global.css') diff --git a/public/theme/global.css b/public/theme/global.css index 081d26730..b3d80e52a 100644 --- a/public/theme/global.css +++ b/public/theme/global.css @@ -88,8 +88,8 @@ input, select, textarea { } input[type="radio"], input[type="checkbox"] { - width: 15px; - min-height: 15px; + width: 15px !important; + min-height: 15px !important; } input:focus, select:focus, textarea:focus { color: #0062BE; -- cgit v1.2.3