From c6dbe9def83153c7c274ef0fa47fe27ef592d3ab Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 16 Sep 2014 14:12:44 +0200 Subject: Use buttons instead of links for "mark as read" See https://github.com/marienfressinaud/FreshRSS/issues/599 --- p/themes/base-theme/template.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'p/themes/base-theme/template.css') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 466ec4603..9d81b6180 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -88,6 +88,15 @@ input[type="checkbox"] { input.extend:focus { width: 300px; } +button.as-link, +button.as-link:hover, +button.as-link:active { + background: transparent; + border: none; + color: inherit; + cursor: pointer; + font-size: 1.1em; +} /*=== COMPONENTS */ /*===============*/ -- cgit v1.2.3 From 6f8413403b53db7e17a36900bba2b470635b7943 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 16 Sep 2014 14:58:25 +0200 Subject: Change #bigMarkAsRead link in button See https://github.com/marienfressinaud/FreshRSS/issues/599#issuecomment-55735615 --- app/views/helpers/pagination.phtml | 8 ++++++-- p/scripts/main.js | 8 ++++++-- p/themes/base-theme/template.css | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'p/themes/base-theme/template.css') diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index db5cf25b5..f6fcbc701 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -14,11 +14,15 @@ - conf->reading_confirm) { echo ' class="confirm"';} ?>> +
diff --git a/p/scripts/main.js b/p/scripts/main.js index 07af35a5b..69ac01816 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -894,9 +894,13 @@ function load_more_posts() { box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day')); $('.pagination').replaceWith($('.pagination', data)); if (display_order === 'ASC') { - $('#nav_menu_read_all>a').attr('href', $('#bigMarkAsRead').attr('href')); + $('#nav_menu_read_all > .read_all').attr( + 'formaction', $('#bigMarkAsRead').attr('formaction') + ); } else { - $('#bigMarkAsRead').attr('href', $('#nav_menu_read_all>a').attr('href')); + $('#bigMarkAsRead').attr( + 'formaction', $('#nav_menu_read_all > .read_all').attr('formaction') + ); } $('[id^=day_]').each(function (i) { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 9d81b6180..4186000a3 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -516,6 +516,7 @@ a.btn { } #bigMarkAsRead { display: block; + width: 100%; padding: 3em 0; text-align: center; } -- cgit v1.2.3 From 922ed3c15dd300c58fcbbc744970af8768d855ea Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 16 Sep 2014 15:10:51 +0200 Subject: Improve "End of articles" section Increase font size Change colors in Origine See https://github.com/marienfressinaud/FreshRSS/issues/480 --- p/themes/Origine/origine.css | 14 +++++--------- p/themes/base-theme/template.css | 3 ++- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'p/themes/base-theme/template.css') diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 5ec6f1339..ce92d539d 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -805,19 +805,15 @@ a.btn { text-decoration: none; text-shadow: 0 -1px 0 #aaa; color: #666; - background: #fafafa; + background: #eee; } #bigMarkAsRead:hover { - color: #000; - background: #ccc; - background: radial-gradient(circle at 50% -25% , #ccc 0%, #fafafa 50%); - background: -moz-radial-gradient(circle at 50% -25% , #ccc 0%, #fafafa 50%); - background: -webkit-radial-gradient(circle at 50% -25% , #ccc 0%, #fafafa 50%); - background: -o-radial-gradient(circle at 50% -25% , #ccc 0%, #fafafa 50%); - background: -ms-radial-gradient(circle at 50% -25% , #ccc 0%, #fafafa 50%); + color: #27ae60; + text-shadow: 0 0 2px #27ae60; + background: #fff; } #bigMarkAsRead:hover .bigTick { - text-shadow: 0 0 10px #666; + text-shadow: 0 0 10px #27ae60; } /*=== Navigation menu (for articles) */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 4186000a3..0f660ed4b 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -517,8 +517,9 @@ a.btn { #bigMarkAsRead { display: block; width: 100%; - padding: 3em 0; + padding: 2em 0; text-align: center; + font-size: 1.8em; } .bigTick { font-size: 7em; -- cgit v1.2.3 From 4fd3babcb66556e53315dd46aea798e12fba3614 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 16 Sep 2014 16:50:01 +0200 Subject: Reduce height of bigMarkAsRead See https://github.com/marienfressinaud/FreshRSS/issues/480 --- p/themes/Origine/origine.css | 2 +- p/themes/base-theme/template.css | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'p/themes/base-theme/template.css') diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index ce92d539d..eb3a32583 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -813,7 +813,7 @@ a.btn { background: #fff; } #bigMarkAsRead:hover .bigTick { - text-shadow: 0 0 10px #27ae60; + text-shadow: 0 0 5px #27ae60; } /*=== Navigation menu (for articles) */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 0f660ed4b..a1f34f8bb 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -517,13 +517,12 @@ a.btn { #bigMarkAsRead { display: block; width: 100%; - padding: 2em 0; + padding: 1em 0; text-align: center; font-size: 1.8em; } .bigTick { - font-size: 7em; - line-height: 1.6em; + font-size: 4em; } /*=== Statistiques */ -- cgit v1.2.3 From 1f6fc5dfae95f3bdbbb05e72ed977d9e699527f6 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 16 Sep 2014 19:06:06 +0200 Subject: Reduce font-size of bigMarkAsRead See https://github.com/marienfressinaud/FreshRSS/issues/480 --- p/themes/Origine/origine.css | 1 - p/themes/base-theme/template.css | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'p/themes/base-theme/template.css') diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index eb3a32583..95fd671f1 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -809,7 +809,6 @@ a.btn { } #bigMarkAsRead:hover { color: #27ae60; - text-shadow: 0 0 2px #27ae60; background: #fff; } #bigMarkAsRead:hover .bigTick { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index a1f34f8bb..f05ddff4e 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -519,7 +519,7 @@ a.btn { width: 100%; padding: 1em 0; text-align: center; - font-size: 1.8em; + font-size: 1.4em; } .bigTick { font-size: 4em; -- cgit v1.2.3 From 0ef1fd6e4dd55f3626bae585b04b82ad194b8c63 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 17 Sep 2014 22:22:14 +0200 Subject: Style: reduce white space of line breaks in articles Makes articles a bit more compact. Plus a generic filter for multiple lines breaks, useful for instance in LeMonde.fr, which uses


https://github.com/marienfressinaud/FreshRSS/issues/618 --- p/themes/base-theme/template.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'p/themes/base-theme/template.css') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index f05ddff4e..2a9deb0ea 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -458,6 +458,12 @@ a.btn { .content pre { overflow: auto; } +br { + line-height: 1em; +} +br + br + br { + display: none; +} /*=== Notification and actualize notification */ .notification { -- cgit v1.2.3 From 9a9d7a5a315eb34bb83442c2967fe271d500db89 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 18 Sep 2014 16:22:36 +0200 Subject: Fix alignment of tables --- p/themes/Dark/dark.css | 1 - p/themes/Flat/flat.css | 1 - p/themes/Origine/origine.css | 1 - p/themes/Screwdriver/screwdriver.css | 1 - p/themes/base-theme/template.css | 9 +++++++++ 5 files changed, 9 insertions(+), 4 deletions(-) (limited to 'p/themes/base-theme/template.css') diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 669f4ce42..a5c499643 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -872,7 +872,6 @@ a.btn { .stat > table td, .stat > table th { border-bottom: 1px solid #333; - text-align: center; } /*=== LOGS */ diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index a942df0e8..e1cf35954 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -859,7 +859,6 @@ a.btn { .stat > table td, .stat > table th { border-bottom: 1px solid #ddd; - text-align: center; } /*=== LOGS */ diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 2f7baee7d..4195bc260 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -913,7 +913,6 @@ a.btn { .stat > table td, .stat > table th { border-bottom: 1px solid #ddd; - text-align: center; } /*=== LOGS */ diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 1d84753c7..5475d2fd9 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -1025,7 +1025,6 @@ opacity: 1; border-bottom: 1px solid #ccc; background: rgba(255,255,255,0.38); box-shadow: 0 1px #fff; - text-align: center; } /*=== LOGS */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 2a9deb0ea..733dd6e02 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -98,6 +98,15 @@ button.as-link:active { font-size: 1.1em; } +/*=== Tables */ +table { + max-width: 100%; +} +th.numeric, +td.numeric { + text-align: center; +} + /*=== COMPONENTS */ /*===============*/ /*=== Forms */ -- cgit v1.2.3 From 097703f23e6799f9c20d282459c461b0462dc737 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 18 Sep 2014 17:39:07 +0200 Subject: Improve stat design --- app/views/stats/idle.phtml | 19 +++++++++++---- app/views/stats/index.phtml | 46 ++++++++++++++++++------------------ app/views/stats/repartition.phtml | 8 +++---- p/themes/Dark/dark.css | 12 ++++++++++ p/themes/Flat/flat.css | 12 ++++++++++ p/themes/Origine/origine.css | 12 ++++++++++ p/themes/Screwdriver/screwdriver.css | 12 ++++++++++ p/themes/base-theme/base.css | 12 ++++++++++ p/themes/base-theme/template.css | 8 +++++++ 9 files changed, 109 insertions(+), 32 deletions(-) (limited to 'p/themes/base-theme/template.css') diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml index 2ba5237f7..608e2d33c 100644 --- a/app/views/stats/idle.phtml +++ b/app/views/stats/idle.phtml @@ -1,6 +1,6 @@ partial('aside_stats'); ?> -
+

@@ -12,11 +12,20 @@

-
    - -
    • - + + + +
      +
    • +
      + + + +
      +
      • +
    +
partial('aside_stats'); ?> -
+
- +

-
+

@@ -38,26 +38,9 @@
-
- -
-

-
-
- -
-

-
-
-
- -
-

-
-
-
- -
+

@@ -78,6 +61,23 @@
+ +
+

+
+
+ +
+

+
+
+
+

+
+
+