From 46ae0a3f5ada751c9442eca275e15450fad85509 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 30 Sep 2014 14:33:28 +0200 Subject: BREAK CATEGORIZE SYSTEM! And begin big changes. See https://github.com/marienfressinaud/FreshRSS/issues/646 --- p/themes/base-theme/template.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index dc011503d..792eac299 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -559,6 +559,8 @@ br + br + br { /*=== GLOBAL VIEW */ /*================*/ /*=== Category boxes */ + +/* TODO */ #stream.global .box-category { display: inline-block; width: 19em; @@ -581,6 +583,24 @@ br + br + br { width: 19em; max-width: 90%; } +/* TODO Date: Tue, 30 Sep 2014 19:45:49 +0200 Subject: Improve design of .box See https://github.com/marienfressinaud/FreshRSS/issues/646 --- app/layout/aside_feed.phtml | 16 ----------- app/views/configure/categorize.phtml | 24 +++++++++-------- p/themes/Dark/dark.css | 29 ++++++++++++++++++++ p/themes/Flat/flat.css | 30 +++++++++++++++++++++ p/themes/Origine/origine.css | 30 +++++++++++++++++++++ p/themes/Pafat/pafat.css | 29 ++++++++++++++++++++ p/themes/Screwdriver/screwdriver.css | 34 ++++++++++++++++++++++++ p/themes/base-theme/base.css | 24 +++++++++++++++++ p/themes/base-theme/template.css | 51 ++++++++++++++++++++++++------------ 9 files changed, 223 insertions(+), 44 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index c72710c2d..c028c4918 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -57,20 +57,4 @@
    • - -
  • - - feeds)) { ?> - feeds as $feed) { ?> - nbEntries(); ?> -
  • - - ✇ - name(); ?> - -
    • - - -
    • - diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml index b9d04ddb8..8f77f9724 100644 --- a/app/views/configure/categorize.phtml +++ b/app/views/configure/categorize.phtml @@ -12,12 +12,12 @@
    -
    +
      - - +
      • +
      • -
    +
    @@ -27,10 +27,9 @@ $feeds = $cat->feeds(); ?>
    -
    +
    -
    @@ -39,6 +38,10 @@
    • ❌
      • +
      • + +
    • +
    diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 10f6e655b..f3790614e 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -435,6 +435,35 @@ a.btn { font-size: 0; } +/*=== Boxes */ +.box { + border: 1px solid #000; + border-radius: 5px; +} +.box .box-title { + margin: 0; + padding: 5px 10px; + background: #26303F; + border-bottom: 1px solid #000; + border-radius: 5px 5px 0 0; +} +.box .box-content { + max-height: 260px; +} + +.box .box-content .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; +} + +.box .box-content .item .configure { + visibility: hidden; +} +.box .box-content .item:hover .configure { + visibility: visible; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index 484cee9f3..d0ac46fd5 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -438,6 +438,36 @@ a.btn { background: url("loader.gif") center center no-repeat #34495e; } +/*=== Boxes */ +.box { + border: 1px solid #ddd; + border-radius: 5px; +} +.box .box-title { + margin: 0; + padding: 5px 10px; + background: #ecf0f1; + color: #333; + border-bottom: 1px solid #ddd; + border-radius: 5px 5px 0 0; +} +.box .box-content { + max-height: 260px; +} + +.box .box-content .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; +} + +.box .box-content .item .configure { + visibility: hidden; +} +.box .box-content .item:hover .configure { + visibility: visible; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 08fc08379..e3ae85075 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -467,6 +467,36 @@ a.btn { font-size: 0; } +/*=== Boxes */ +.box { + background: #fff; + border-radius: 5px; + box-shadow: 0 0 3px #bbb; +} +.box .box-title { + margin: 0; + padding: 5px 10px; + background: #f6f6f6; + border-bottom: 1px solid #ddd; + border-radius: 5px 5px 0 0; +} +.box .box-content { + max-height: 260px; +} + +.box .box-content .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; +} + +.box .box-content .item .configure { + visibility: hidden; +} +.box .box-content .item:hover .configure { + visibility: visible; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index a35ac861d..28b17e15f 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -491,6 +491,35 @@ a.btn { font-size: 0; } +/*=== Boxes */ +.box { + border: 1px solid #aaa; + border-radius: 5px; +} +.box .box-title { + margin: 0; + padding: 5px 10px; + background: #f6f6f6; + border-bottom: 1px solid #aaa; + border-radius: 5px 5px 0 0; +} +.box .box-content { + max-height: 260px; +} + +.box .box-content .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; +} + +.box .box-content .item .configure { + visibility: hidden; +} +.box .box-content .item:hover .configure { + visibility: visible; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 37fa18e10..6206504d1 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -497,6 +497,40 @@ a.btn { font-size: 0; } +/*=== Boxes */ +.box { + background: #EDE7DE; + border-radius: 4px 4px 0 0; +} +.box .box-title { + margin: 0; + padding: 5px 10px; + background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717; + background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%); + box-shadow: 0px -1px #fff inset,0 -2px #ccc inset; + color: #888; + text-shadow: 0 1px #ccc; + border-radius: 4px 4px 0 0; + font-size: 1.1rem; + font-weight: normal; +} +.box .box-content { + max-height: 260px; +} + +.box .box-content .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; +} + +.box .box-content .item .configure { + visibility: hidden; +} +.box .box-content .item:hover .configure { + visibility: visible; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index ccfab10df..3f6ae956d 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -329,6 +329,30 @@ a.btn { font-size: 0; } +/*=== Boxes */ +.box { +} +.box .box-title { + margin: 0; + padding: 5px 10px; +} +.box .box-content { + max-height: 260px; +} + +.box .box-content .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; +} + +.box .box-content .item .configure { + visibility: hidden; +} +.box .box-content .item:hover .configure { + visibility: visible; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 792eac299..a5a29ab23 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -280,6 +280,40 @@ a.btn { width: 100px; } +/*=== Boxes */ +.box { + display: inline-block; + width: 20rem; + max-width: 95%; + margin: 20px 10px; + border: 1px solid #ccc; + vertical-align: top; +} +.box .box-title { + font-size: 1.2rem; + font-weight: bold; + text-align: center; +} +.box .box-title form { + margin: 0; +} +.box .box-content { + display: block; + overflow: auto; +} +.box .box-content .item { + display: block; +} + +.box .box-content-centered { + padding: 30px 5px; + text-align: center; +} +.box .box-content-centered .btn { + margin: 20px 0 0; +} + + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -585,23 +619,6 @@ br + br + br { } /* TODO Date: Wed, 1 Oct 2014 10:06:04 +0200 Subject: Load feed configuration on the same page Need improvements See https://github.com/marienfressinaud/FreshRSS/issues/646 --- app/Controllers/configureController.php | 4 ++++ app/views/configure/categorize.phtml | 5 ++++- app/views/configure/feed.phtml | 8 ++++++-- p/scripts/main.js | 30 ++++++++++++++++++++++++++++++ p/themes/base-theme/template.css | 5 +++++ 5 files changed, 49 insertions(+), 3 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index a7def6d9a..dd7a0a441 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -90,6 +90,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController { * Default values are empty strings unless specified. */ public function feedAction() { + if (Minz_Request::param('ajax')) { + $this->view->_useLayout(false); + } + $catDAO = new FreshRSS_CategoryDAO(); $this->view->categories = $catDAO->listCategories(false); diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml index 8f77f9724..008dc8c98 100644 --- a/app/views/configure/categorize.phtml +++ b/app/views/configure/categorize.phtml @@ -73,7 +73,7 @@ $empty = $feed->nbEntries() == 0 ? ' empty' : ''; ?>
  • - + ✇ name(); ?>
    • + +
    +
    diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index e96a28739..f58ac65af 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -1,8 +1,12 @@ -partial ('aside_feed'); ?> +partial('aside_feed'); + } +?> flux) { ?>
    - +

    flux->name (); ?>

    flux->description (); ?> diff --git a/p/scripts/main.js b/p/scripts/main.js index f6d5d2907..7fed7a819 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -1240,6 +1240,35 @@ function faviconNbUnread(n) { } } +function init_slider_observers() { + var slider = $('#slider'); + if (slider.length < 1) { + return; + } + + $('.open-slider').on('click', function() { + if (ajax_loading) { + return false; + } + + ajax_loading = true; + + var url_slide = $(this).attr('href'); + + $.ajax({ + type: 'GET', + url: url_slide, + data : { ajax: true } + }).done(function (data) { + slider.html(data); + slider.show(); + ajax_loading = false; + }); + + return false; + }) +} + function init_all() { if (!(window.$ && window.url_freshrss)) { if (window.console) { @@ -1275,6 +1304,7 @@ function init_all() { init_feed_observers(); init_password_observers(); init_stats_observers(); + init_slider_observers(); } if (window.console) { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index a5a29ab23..397f943a6 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -645,6 +645,11 @@ br + br + br { display: none; } +/*=== Slider */ +#slider { + min-height: 50px; +} + /*=== DIVERS */ /*===========*/ .nav-login, -- cgit v1.2.3 From 405f23050b18e8388edb6f8be90aa59c17ada421 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 1 Oct 2014 13:55:30 +0200 Subject: Design of the slider See https://github.com/marienfressinaud/FreshRSS/issues/646 --- app/views/subscription/index.phtml | 5 +++-- p/scripts/main.js | 14 ++++++++++---- p/themes/base-theme/template.css | 24 +++++++++++++++++++++++- 3 files changed, 36 insertions(+), 7 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 2d55890f7..10578bdd3 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -134,9 +134,10 @@
    -
    + +
    feed) ? ' class="active"' : ''; ?>> feed) && $this->feed) { + if (isset($this->feed)) { $this->renderHelper('feed/update'); } ?> diff --git a/p/scripts/main.js b/p/scripts/main.js index 7fed7a819..925a93650 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -1241,7 +1241,8 @@ function faviconNbUnread(n) { } function init_slider_observers() { - var slider = $('#slider'); + var slider = $('#slider'), + closer = $('#close-slider'); if (slider.length < 1) { return; } @@ -1252,7 +1253,6 @@ function init_slider_observers() { } ajax_loading = true; - var url_slide = $(this).attr('href'); $.ajax({ @@ -1261,12 +1261,18 @@ function init_slider_observers() { data : { ajax: true } }).done(function (data) { slider.html(data); - slider.show(); + closer.addClass('active'); + slider.addClass('active'); ajax_loading = false; }); return false; - }) + }); + + closer.on('click', function() { + closer.removeClass('active'); + slider.removeClass('active'); + }); } function init_all() { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 397f943a6..e6c832ee4 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -647,7 +647,29 @@ br + br + br { /*=== Slider */ #slider { - min-height: 50px; + position: fixed; + top: 0; bottom: 0; + left: 100%; right: 0; + overflow: auto; + background: #fff; + border-left: 1px solid #aaa; + transition: left 200ms linear; + -moz-transition: left 200ms linear; + -webkit-transition: left 200ms linear; + -o-transition: left 200ms linear; + -ms-transition: left 200ms linear; +} +#slider.active { + left: 40%; +} +#close-slider { + position: fixed; + top: 0; bottom: 0; + left: 100%; right: 0; + cursor: pointer; +} +#close-slider.active { + left: 0; } /*=== DIVERS */ -- cgit v1.2.3 From 6effa82cef4ea8fd98178e72b270de6ea4f9f80f Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 2 Oct 2014 15:02:42 +0200 Subject: Improve drag and drop - Refactoring - Better design - Item doesn't disappear if action is not completed See https://github.com/marienfressinaud/FreshRSS/issues/646 --- app/views/subscription/index.phtml | 11 ++++--- p/scripts/category.js | 63 +++++++++++++++++++++++++++++--------- p/themes/Origine/origine.css | 9 ------ p/themes/base-theme/template.css | 12 ++++++++ 4 files changed, 67 insertions(+), 28 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 3a79a34e6..2c56f79ed 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -1,6 +1,6 @@ partial('aside_subscription'); ?> -
    +

    @@ -113,21 +113,24 @@
    -
      +
        inError() ? ' error' : ''; $empty = $feed->nbEntries() == 0 ? ' empty' : ''; ?> -
      • +
      • ✇ name(); ?>
        • -
        • +
    diff --git a/p/scripts/category.js b/p/scripts/category.js index 4378aa9cd..37ad36b17 100644 --- a/p/scripts/category.js +++ b/p/scripts/category.js @@ -1,38 +1,66 @@ "use strict"; +var loading = false, + dnd_successful = false; + +function dragend_process(t) { + if (loading) { + window.setTimeout(function() { + dragend_process(t); + }, 50); + } + + if (!dnd_successful) { + t.style.opacity = 1.0; + } else { + t.parentNode.removeChild(t); + } +} + function init_draggable() { + if (!(window.$ && window.url_freshrss)) { + if (window.console) { + console.log('FreshRSS waiting for JS…'); + } + window.setTimeout(init_draggable, 50); + return; + } + $.event.props.push('dataTransfer'); - var feeds_draggable = '.box-content > .feed', - box_dropzone = '.box-content'; + var draggable = '[draggable="true"]', + dropzone = '[dropzone="move"]'; - $('.box').on('dragstart', feeds_draggable, function(e) { + $('.drop-section').on('dragstart', draggable, function(e) { e.dataTransfer.effectAllowed = 'move'; - e.dataTransfer.setData('html', e.target.outerHTML); - e.dataTransfer.setData('feed-id', e.target.getAttribute('data-feed-id')); + e.dataTransfer.setData('text/html', e.target.outerHTML); + e.dataTransfer.setData('text', e.target.getAttribute('data-feed-id')); + e.target.style.opacity = 0.3; + + dnd_successful = false; }); - $('.box').on('dragend', feeds_draggable, function(e) { - var parent = e.target.parentNode; - parent.removeChild(e.target); - + $('.drop-section').on('dragend', draggable, function(e) { + dragend_process(e.target); }); - $('.box').on('dragenter', box_dropzone, function(e) { + $('.drop-section').on('dragenter', dropzone, function(e) { $(e.target).addClass('drag-hover'); }); - $('.box').on('dragleave', box_dropzone, function(e) { + $('.drop-section').on('dragleave', dropzone, function(e) { $(e.target).removeClass('drag-hover'); }); - $('.box').on('dragover', box_dropzone, function(e) { + $('.drop-section').on('dragover', dropzone, function(e) { e.dataTransfer.dropEffect = "move"; return false; }); - $('.box').on('drop', box_dropzone, function(e) { - var feed_id = e.dataTransfer.getData('feed-id'), + $('.drop-section').on('drop', dropzone, function(e) { + var feed_id = e.dataTransfer.getData('text'), cat_id = e.target.parentNode.getAttribute('data-cat-id'); + loading = true; + $.ajax({ type: 'POST', url: './?c=feed&a=move', @@ -40,10 +68,15 @@ function init_draggable() { f_id: feed_id, c_id: cat_id } + }).success(function() { + $(e.target).after(e.dataTransfer.getData('text/html')); + loading = false; + }).complete(function() { + dnd_successful = true; }); - $(e.target).after(e.dataTransfer.getData('html')); $(e.target).removeClass('drag-hover'); + return false; }); } diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index c79f6cc4c..b25deab0c 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -498,15 +498,6 @@ a.btn { visibility: visible; } -/*=== Draggable */ -.drag-hover { - background: #dfd; - transition: all linear 0.2s; -} -[draggable=true] { - cursor: grab; -} - /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index e6c832ee4..06874c9fe 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -304,6 +304,10 @@ a.btn { .box .box-content .item { display: block; } +.box .box-content .item.disabled { + text-align: center; + font-style: italic; +} .box .box-content-centered { padding: 30px 5px; @@ -313,6 +317,14 @@ a.btn { margin: 20px 0 0; } +/*=== Draggable */ +.drag-hover { + margin: 0 0 5px; + border-bottom: 2px solid #ccc; +} +[draggable=true] { + cursor: grab; +} /*=== STRUCTURE */ /*===============*/ -- cgit v1.2.3 From 9f8d3d0527988b768f739fd4c0e61de68dfdd822 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 3 Oct 2014 12:18:43 +0200 Subject: Fix configure icon on Flat design See https://github.com/marienfressinaud/FreshRSS/issues/468 --- p/themes/Flat/flat.css | 5 +++++ p/themes/base-theme/template.css | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index d0ac46fd5..7b2695781 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -464,6 +464,11 @@ a.btn { .box .box-content .item .configure { visibility: hidden; } +.box .box-content .item .configure .icon { + vertical-align: middle; + background-color: #95a5a6; + border-radius: 3px; +} .box .box-content .item:hover .configure { visibility: visible; } diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 06874c9fe..1a96f1e2f 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -73,7 +73,9 @@ label { input { width: 180px; } -textarea { +textarea, +input[type="file"], +input.extend:focus { width: 300px; } input, select, textarea { @@ -85,9 +87,6 @@ input[type="checkbox"] { width: 15px !important; min-height: 15px !important; } -input.extend:focus { - width: 300px; -} button.as-link, button.as-link:hover, button.as-link:active { -- cgit v1.2.3 From e37a126b9de20a11f306d29c8f3d5052eb4310dd Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 22 Oct 2014 23:41:36 +0200 Subject: Fix some parts of aside_flux See https://github.com/marienfressinaud/FreshRSS/issues/634 --- app/layout/aside_flux.phtml | 37 ++++++++++++++++++------ p/themes/base-theme/base.css | 16 +++++++++++ p/themes/base-theme/template.css | 61 ++++++++++++++++++++-------------------- 3 files changed, 75 insertions(+), 39 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index e572e9d48..30f362348 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -1,4 +1,13 @@ -
    +hide_read_feeds && + FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && + !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) { + $class = ' state_unread'; + } +?> + +
    @@ -14,24 +23,36 @@
    • - +
      + +
    • - +
      + +
      • categories as $cat) { $feeds = $cat->feeds(); if (!empty($feeds)) { + $c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id()); + $c_show = $c_active && (!FreshRSS_Context::$conf->display_categories || + FreshRSS_Context::$current_get['feed']); ?> -
    • - name(); ?> +
    • +
      + name(); ?> +
      -
        - -
      • +
          + id()); + ?> +
        • diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 3f6ae956d..3b79a0822 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -353,6 +353,22 @@ a.btn { visibility: visible; } +/*=== Tree */ +.tree { + margin: 10px 0; +} +.tree-folder-title { + padding: 0 10px; + line-height: 2.5rem; + font-size: 1.2rem; + font-weight: bold; +} +.tree-folder-items .item { + padding: 0 5px 0 20px; + line-height: 2.5rem; + font-size: 0.8rem; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 1a96f1e2f..1eb67c15d 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -325,6 +325,26 @@ a.btn { cursor: grab; } +/*=== Tree */ +.tree { + margin: 0; + padding: 0; + list-style: none; +} +.tree-folder-title { + display: block; +} +.tree-folder-items { + padding: 0; + list-style: none; +} +.tree-folder-items .item { + display: block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -371,52 +391,31 @@ a.btn { } /*=== Aside main page (categories) */ -.categories { - list-style: none; - margin: 0; -} -.state_unread li:not(.active)[data-unread="0"] { +.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"], +.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] { display: none; } -.category { - display: block; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} -.category .btn:not([data-unread="0"]):after { +.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { content: attr(data-unread); } /*=== Aside main page (feeds) */ -.categories .feeds { - width: 100%; - list-style: none; -} -.categories .feeds:not(.active) { +.aside_flux .tree-folder-items:not(.active) { display: none; } -.categories .feeds .feed { - display: inline-block; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - vertical-align: middle; -} -.categories .feeds .feed:not([data-unread="0"]):before { +.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before { content: "(" attr(data-unread) ") "; } -.categories .feeds .dropdown-menu { +.aside_flux .tree-folder-items .dropdown-menu { left: 0; } -.categories .feeds .item .dropdown-toggle > .icon { +.aside_flux .tree-folder-items .item .dropdown-toggle > .icon { visibility: hidden; cursor: pointer; - vertical-align: top; } -.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, -.categories .feeds .item:hover .dropdown-toggle > .icon, -.categories .feeds .item.active .dropdown-toggle > .icon { +.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon { visibility: visible; } -- cgit v1.2.3 From 8c1789ae060000638c563e05ee42eb9b5b1c4fe0 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 09:26:00 +0200 Subject: Begin fixing of Origine theme See https://github.com/marienfressinaud/FreshRSS/issues/634 --- p/themes/Origine/origine.css | 35 ++++++++++++++++++++++------------- p/themes/base-theme/base.css | 16 ++++------------ 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index b25deab0c..c46f72bf8 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -498,6 +498,22 @@ a.btn { visibility: visible; } +/*=== Tree */ +.tree { + margin: 10px 0; +} +.tree-folder-title { + padding: 0 10px; + line-height: 2.5rem; + font-size: 1.2rem; + font-weight: bold; +} +.tree-folder-items .item { + padding: 0 5px 0 20px; + line-height: 2.5rem; + font-size: 0.8rem; +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -538,28 +554,21 @@ a.btn { } .aside.aside_flux { padding: 10px 0 50px; + text-align: center; } /*=== Aside main page (categories) */ -.categories { - text-align: center; -} -.category { - width: 235px; - margin: 10px auto; +.aside.aside_flux .tree { text-align: left; } -.category .btn:first-child { +.aside_flux .tree-folder-title { position: relative; - width: 213px; -} -.category.stick .btn:first-child { - width: 176px; + margin: 5px 0; } -.category .btn:first-child:not([data-unread="0"]):after { +.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; - padding: 1px 5px; + padding: 0 5px; background: #ccc; color: #fff; border: 1px solid #bbb; diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 3b79a0822..bd01a5d70 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -404,25 +404,17 @@ a.btn { } .aside.aside_flux { padding: 10px 0 50px; + text-align: center; } /*=== Aside main page (categories) */ -.categories { - text-align: center; -} -.category { - width: 235px; - margin: 10px auto; +.aside.aside_flux .tree { text-align: left; } -.category .btn:first-child { +.aside_flux .tree-folder-title { position: relative; - width: 213px; -} -.category.stick .btn:first-child { - width: 176px; } -.category .btn:first-child:not([data-unread="0"]):after { +.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 1px 5px; -- cgit v1.2.3 From 8769931a68d0dddb134674c86a43dec75b39bf83 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 09:32:02 +0200 Subject: Rename aside_flux in aside_feed. --- app/layout/aside_feed.phtml | 95 ++++++++++++++++++++++++++++++++++++++++ app/layout/aside_flux.phtml | 95 ---------------------------------------- app/layout/nav_menu.phtml | 2 +- app/views/index/normal.phtml | 2 +- p/scripts/main.js | 26 +++++------ p/themes/Origine/origine.css | 8 ++-- p/themes/base-theme/base.css | 8 ++-- p/themes/base-theme/template.css | 22 +++++----- 8 files changed, 129 insertions(+), 129 deletions(-) create mode 100644 app/layout/aside_feed.phtml delete mode 100644 app/layout/aside_flux.phtml (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml new file mode 100644 index 000000000..66b7b51af --- /dev/null +++ b/app/layout/aside_feed.phtml @@ -0,0 +1,95 @@ +hide_read_feeds && + FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && + !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) { + $class = ' state_unread'; + } +?> + +
          + + + +
          + + +
          + + + + + + +
            +
          • +
            + +
            +
            • + +
          • +
            + +
            +
            • + + categories as $cat) { + $feeds = $cat->feeds(); + if (!empty($feeds)) { + $c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id()); + $c_show = $c_active && (!FreshRSS_Context::$conf->display_categories || + FreshRSS_Context::$current_get['feed']); + ?> +
          • +
            + name(); ?> +
            + + +
            • + +
          +
          + + diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml deleted file mode 100644 index 30f362348..000000000 --- a/app/layout/aside_flux.phtml +++ /dev/null @@ -1,95 +0,0 @@ -hide_read_feeds && - FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && - !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) { - $class = ' state_unread'; - } -?> - -
          - - - -
          - - -
          - - - - - - -
            -
          • -
            - -
            -
            • - -
          • -
            - -
            -
            • - - categories as $cat) { - $feeds = $cat->feeds(); - if (!empty($feeds)) { - $c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id()); - $c_show = $c_active && (!FreshRSS_Context::$conf->display_categories || - FreshRSS_Context::$current_get['feed']); - ?> -
          • -
            - name(); ?> -
            - - -
            • - -
          -
          - - diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 2c9f8724d..6f555c3d0 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -2,7 +2,7 @@
          - + diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index 36adef2f2..02d621bd0 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -1,6 +1,6 @@ partial('aside_flux'); +$this->partial('aside_feed'); $this->partial('nav_menu'); if (!empty($this->entries)) { diff --git a/p/scripts/main.js b/p/scripts/main.js index 1e13ff16a..f4b3898db 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -80,7 +80,7 @@ function incUnreadsFeed(article, feed_id, nb) { //Update unread: all if (feed_priority > 0) { - elem = $('#aside_flux .all').children(':first').get(0); + elem = $('#aside_feed .all').children(':first').get(0); if (elem) { feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); @@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) { //Update unread: favourites if (article && article.closest('div').hasClass('favorite')) { - elem = $('#aside_flux .favorites').children(':first').get(0); + elem = $('#aside_feed .favorites').children(':first').get(0); if (elem) { feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); @@ -202,7 +202,7 @@ function mark_favorite(active) { } if (active.closest('div').hasClass('not_read')) { - var elem = $('#aside_flux .favorites').children(':first').get(0), + var elem = $('#aside_feed .favorites').children(':first').get(0), feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; if (elem) { elem.setAttribute('data-unread', numberFormat(feed_unreads + inc)); @@ -292,7 +292,7 @@ function next_entry() { } function prev_feed() { - var active_feed = $("#aside_flux .feeds li.active"); + var active_feed = $("#aside_feed .feeds li.active"); if (active_feed.length > 0) { active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();}); } else { @@ -301,7 +301,7 @@ function prev_feed() { } function next_feed() { - var active_feed = $("#aside_flux .feeds li.active"); + var active_feed = $("#aside_feed .feeds li.active"); if (active_feed.length > 0) { active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();}); } else { @@ -310,21 +310,21 @@ function next_feed() { } function first_feed() { - var feed = $("#aside_flux .feeds.active li:visible:first"); + var feed = $("#aside_feed .feeds.active li:visible:first"); if (feed.length > 0) { feed.find('a')[1].click(); } } function last_feed() { - var feed = $("#aside_flux .feeds.active li:visible:last"); + var feed = $("#aside_feed .feeds.active li:visible:last"); if (feed.length > 0) { feed.find('a')[1].click(); } } function prev_category() { - var active_cat = $("#aside_flux .category.stick.active"); + var active_cat = $("#aside_feed .category.stick.active"); if (active_cat.length > 0) { var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn'); @@ -338,7 +338,7 @@ function prev_category() { } function next_category() { - var active_cat = $("#aside_flux .category.stick.active"); + var active_cat = $("#aside_feed .category.stick.active"); if (active_cat.length > 0) { var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn'); @@ -352,14 +352,14 @@ function next_category() { } function first_category() { - var cat = $("#aside_flux .category.stick:visible:first"); + var cat = $("#aside_feed .category.stick:visible:first"); if (cat.length > 0) { cat.find('a.btn')[0].click(); } } function last_category() { - var cat = $("#aside_flux .category.stick:visible:last"); + var cat = $("#aside_feed .category.stick:visible:last"); if (cat.length > 0) { cat.find('a.btn')[0].click(); } @@ -487,7 +487,7 @@ function init_column_categories() { if (context['current_view'] !== 'normal') { return; } - $('#aside_flux').on('click', '.category>a.dropdown-toggle', function () { + $('#aside_feed').on('click', '.category>a.dropdown-toggle', function () { $(this).children().each(function() { if (this.alt === '▽') { this.src = this.src.replace('/icons/down.', '/icons/up.'); @@ -500,7 +500,7 @@ function init_column_categories() { $(this).parent().next(".feeds").slideToggle(); return false; }); - $('#aside_flux').on('click', '.feeds .dropdown-toggle', function () { + $('#aside_feed').on('click', '.feeds .dropdown-toggle', function () { if ($(this).nextAll('.dropdown-menu').length === 0) { var feed_id = $(this).closest('li').attr('id').substr(2), feed_web = $(this).data('fweb'), diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index c46f72bf8..e6d50c2e9 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -552,20 +552,20 @@ a.btn { border-right: 1px solid #aaa; background: #fff; } -.aside.aside_flux { +.aside.aside_feed { padding: 10px 0 50px; text-align: center; } /*=== Aside main page (categories) */ -.aside.aside_flux .tree { +.aside.aside_feed .tree { text-align: left; } -.aside_flux .tree-folder-title { +.aside_feed .tree-folder-title { position: relative; margin: 5px 0; } -.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 0 5px; diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index bd01a5d70..0b0a04c9a 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -402,19 +402,19 @@ a.btn { } .aside { } -.aside.aside_flux { +.aside.aside_feed { padding: 10px 0 50px; text-align: center; } /*=== Aside main page (categories) */ -.aside.aside_flux .tree { +.aside.aside_feed .tree { text-align: left; } -.aside_flux .tree-folder-title { +.aside_feed .tree-folder-title { position: relative; } -.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 1px 5px; diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 1eb67c15d..40ff8140a 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -386,36 +386,36 @@ a.btn { width: 250px; vertical-align: top; } -.aside.aside_flux { +.aside.aside_feed { background: #fff; } /*=== Aside main page (categories) */ -.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"], -.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] { +.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"], +.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] { display: none; } -.aside_flux .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { content: attr(data-unread); } /*=== Aside main page (feeds) */ -.aside_flux .tree-folder-items:not(.active) { +.aside_feed .tree-folder-items:not(.active) { display: none; } -.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before { +.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before { content: "(" attr(data-unread) ") "; } -.aside_flux .tree-folder-items .dropdown-menu { +.aside_feed .tree-folder-items .dropdown-menu { left: 0; } -.aside_flux .tree-folder-items .item .dropdown-toggle > .icon { +.aside_feed .tree-folder-items .item .dropdown-toggle > .icon { visibility: hidden; cursor: pointer; } -.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, -.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon, -.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon { +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { visibility: visible; } -- cgit v1.2.3 From 4204336bd67f8692bfdd964b0fddb8babb03b6ac Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 10:44:45 +0200 Subject: Begin to fix JS for new aside --- app/layout/aside_feed.phtml | 15 +++++----- p/scripts/main.js | 63 ++++++++++++++++++++-------------------- p/themes/Origine/origine.css | 2 +- p/themes/base-theme/template.css | 2 +- 4 files changed, 42 insertions(+), 40 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 66b7b51af..d7b12426b 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -22,15 +22,15 @@
            -
          • +
          • - +
            • -
          • +
          • - +
            • @@ -44,7 +44,8 @@ ?>
          • - name(); ?> + + name(); ?>
              @@ -52,14 +53,14 @@ foreach ($feeds as $feed) { $f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id()); ?> -
            • +
            • ✇ - name(); ?> + name(); ?>
            diff --git a/p/scripts/main.js b/p/scripts/main.js index f4b3898db..24c0972fc 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -56,31 +56,31 @@ function incLabel(p, inc, spaceAfter) { function incUnreadsFeed(article, feed_id, nb) { //Update unread: feed - var elem = $('#' + feed_id + '>.feed').get(0), + var elem = $('#' + feed_id).get(0), feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0, feed_priority = elem ? str2int(elem.getAttribute('data-priority')) : 0; if (elem) { - elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); - elem = $(elem).closest('li').get(0); + elem.setAttribute('data-unread', feed_unreads + nb); + elem = $(elem).children('a').get(0); if (elem) { - elem.setAttribute('data-unread', feed_unreads + nb); + elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); } } //Update unread: category - elem = $('#' + feed_id).parent().prevAll('.category').children(':first').get(0); + elem = $('#' + feed_id).parents('.tree-folder').get(0); feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; if (elem) { - elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); - elem = $(elem).closest('li').get(0); + elem.setAttribute('data-unread', feed_unreads + nb); + elem = $(elem).find('.tree-folder-title .title').get(0); if (elem) { - elem.setAttribute('data-unread', feed_unreads + nb); + elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); } } //Update unread: all if (feed_priority > 0) { - elem = $('#aside_feed .all').children(':first').get(0); + elem = $('#aside_feed .all .tree-folder-title .title').get(0); if (elem) { feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); @@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) { //Update unread: favourites if (article && article.closest('div').hasClass('favorite')) { - elem = $('#aside_feed .favorites').children(':first').get(0); + elem = $('#aside_feed .favorites .tree-folder-title .title').get(0); if (elem) { feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; elem.setAttribute('data-unread', numberFormat(feed_unreads + nb)); @@ -97,7 +97,7 @@ function incUnreadsFeed(article, feed_id, nb) { } var isCurrentView = false; - //Update unread: title + // Update unread: title document.title = document.title.replace(/^((?:\([ 0-9]+\) )?)/, function (m, p1) { var $feed = $('#' + feed_id); if (article || ($feed.closest('.active').length > 0 && $feed.siblings('.active').length === 0)) { @@ -194,7 +194,7 @@ function mark_favorite(active) { } $b.find('.icon').replaceWith(data.icon); - var favourites = $('.favorites>a').contents().last().get(0); + var favourites = $('#aside_feed .favorites .tree-folder-title .title').contents().last().get(0); if (favourites && favourites.textContent) { favourites.textContent = favourites.textContent.replace(/((?: \([ 0-9]+\))?\s*)$/, function (m, p1) { return incLabel(p1, inc, false); @@ -202,7 +202,7 @@ function mark_favorite(active) { } if (active.closest('div').hasClass('not_read')) { - var elem = $('#aside_feed .favorites').children(':first').get(0), + var elem = $('#aside_feed .favorites .tree-folder-title .title').get(0), feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; if (elem) { elem.setAttribute('data-unread', numberFormat(feed_unreads + inc)); @@ -292,42 +292,42 @@ function next_entry() { } function prev_feed() { - var active_feed = $("#aside_feed .feeds li.active"); + var active_feed = $("#aside_feed .tree-folder-items .item.active"); if (active_feed.length > 0) { - active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();}); + active_feed.prevAll(':visible:first').find('a').each(function(){this.click();}); } else { last_feed(); } } function next_feed() { - var active_feed = $("#aside_feed .feeds li.active"); + var active_feed = $("#aside_feed .tree-folder-items .item.active"); if (active_feed.length > 0) { - active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();}); + active_feed.nextAll(':visible:first').find('a').each(function(){this.click();}); } else { first_feed(); } } function first_feed() { - var feed = $("#aside_feed .feeds.active li:visible:first"); + var feed = $("#aside_feed .tree-folder-items.active .item:visible:first"); if (feed.length > 0) { feed.find('a')[1].click(); } } function last_feed() { - var feed = $("#aside_feed .feeds.active li:visible:last"); + var feed = $("#aside_feed .tree-folder-items.active .item:visible:last"); if (feed.length > 0) { feed.find('a')[1].click(); } } function prev_category() { - var active_cat = $("#aside_feed .category.stick.active"); + var active_cat = $("#aside_feed .tree-folder.active"); if (active_cat.length > 0) { - var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn'); + var prev_cat = active_cat.prevAll(':visible:first').find('.tree-folder-title .title'); if (prev_cat.length > 0) { prev_cat[0].click(); } @@ -338,10 +338,10 @@ function prev_category() { } function next_category() { - var active_cat = $("#aside_feed .category.stick.active"); + var active_cat = $("#aside_feed .tree-folder.active"); if (active_cat.length > 0) { - var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn'); + var next_cat = active_cat.nextAll(':visible:first').find('.tree-folder-title .title'); if (next_cat.length > 0) { next_cat[0].click(); } @@ -352,16 +352,16 @@ function next_category() { } function first_category() { - var cat = $("#aside_feed .category.stick:visible:first"); + var cat = $("#aside_feed .tree-folder:visible:first"); if (cat.length > 0) { - cat.find('a.btn')[0].click(); + cat.find('.tree-folder-title .title')[0].click(); } } function last_category() { - var cat = $("#aside_feed .category.stick:visible:last"); + var cat = $("#aside_feed .tree-folder:visible:last"); if (cat.length > 0) { - cat.find('a.btn')[0].click(); + cat.find('.tree-folder-title .title')[0].click(); } } @@ -487,7 +487,8 @@ function init_column_categories() { if (context['current_view'] !== 'normal') { return; } - $('#aside_feed').on('click', '.category>a.dropdown-toggle', function () { + + $('#aside_feed').on('click', '.tree-folder>.tree-folder-title>a.dropdown-toggle', function () { $(this).children().each(function() { if (this.alt === '▽') { this.src = this.src.replace('/icons/down.', '/icons/up.'); @@ -497,12 +498,12 @@ function init_column_categories() { this.alt = '▽'; } }); - $(this).parent().next(".feeds").slideToggle(); + $(this).parent().next(".tree-folder-items").slideToggle(); return false; }); - $('#aside_feed').on('click', '.feeds .dropdown-toggle', function () { + $('#aside_feed').on('click', '.tree-folder-items .item .dropdown-toggle', function () { if ($(this).nextAll('.dropdown-menu').length === 0) { - var feed_id = $(this).closest('li').attr('id').substr(2), + var feed_id = $(this).closest('.item').attr('id').substr(2), feed_web = $(this).data('fweb'), template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web); $(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template); diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index e6d50c2e9..64bec06a2 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -565,7 +565,7 @@ a.btn { position: relative; margin: 5px 0; } -.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 0 5px; diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 40ff8140a..fb02a5b53 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -395,7 +395,7 @@ a.btn { .aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] { display: none; } -.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { content: attr(data-unread); } -- cgit v1.2.3 From 6dc1267b9832272abd466579053c2bcdedcb5ecb Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 12:33:22 +0200 Subject: Fix Origine theme See https://github.com/marienfressinaud/FreshRSS/issues/634 --- app/layout/aside_subscription.phtml | 2 +- p/themes/Origine/origine.css | 8 ++++---- p/themes/base-theme/template.css | 24 ++++++++++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml index 9a95763c3..cbf5df67d 100644 --- a/app/layout/aside_subscription.phtml +++ b/app/layout/aside_subscription.phtml @@ -1,4 +1,4 @@ -
              +
              • diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 0a317695b..d01bed963 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -505,7 +505,7 @@ a.btn { .tree-folder-title { padding: 0 10px; line-height: 2.5rem; - font-size: 1.2rem; + font-size: 1rem; font-weight: bold; } .tree-folder-items { @@ -513,7 +513,7 @@ a.btn { border-bottom: 1px solid #ccc; background: #f6f6f6; } -.tree-folder-items .item { +.tree-folder-items > .item { padding: 0 10px; line-height: 2.5rem; font-size: 0.8rem; @@ -606,12 +606,12 @@ a.btn { .aside_feed .tree-folder-items .item.error.active > a { color: #fff; } -.aside_feed .tree-folder-items .item > a { +.aside_feed .tree-folder-items > .item > a { line-height: 3em; text-align: left; text-decoration: none; } -.aside_feed .tree-folder-items .item:not([data-unread="0"]) { +.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { font-weight: bold; } .aside_feed .tree-folder-items .dropdown-menu:after { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index fb02a5b53..bcafd162c 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -331,19 +331,31 @@ a.btn { padding: 0; list-style: none; } -.tree-folder-title { - display: block; -} .tree-folder-items { padding: 0; list-style: none; } -.tree-folder-items .item { +.tree-folder-title { display: block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } +.tree-folder-title .title { + vertical-align: middle; +} +.tree-folder-items > .item { + display: block; + white-space: nowrap; +} +.tree-folder-items > .item > a { + display: inline-block; + vertical-align: middle; + width: calc(100% - 32px); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} /*=== STRUCTURE */ /*===============*/ @@ -392,7 +404,7 @@ a.btn { /*=== Aside main page (categories) */ .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"], -.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] { +.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] { display: none; } .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { @@ -403,7 +415,7 @@ a.btn { .aside_feed .tree-folder-items:not(.active) { display: none; } -.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before { +.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before { content: "(" attr(data-unread) ") "; } .aside_feed .tree-folder-items .dropdown-menu { -- cgit v1.2.3 From cb730c373480ba415997696f4c0cbda4cca9d97e Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 13:33:48 +0200 Subject: Last fix for Origine (I hope!) See https://github.com/marienfressinaud/FreshRSS/issues/634 --- app/layout/aside_feed.phtml | 5 ++- p/themes/Origine/origine.css | 73 ++++++++++++++++++++-------------------- p/themes/base-theme/template.css | 11 ++---- 3 files changed, 40 insertions(+), 49 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index d7b12426b..47b63f187 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -54,13 +54,12 @@ $f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id()); ?>
              • -
                +
                - ✇ - name(); ?> + ✇ name(); ?>
              diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 004d31f0f..7292379c0 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -503,11 +503,26 @@ a.btn { margin: 10px 0; } .tree-folder-title { + position: relative; padding: 0 10px; + background: #fff; line-height: 2.5rem; font-size: 1rem; font-weight: bold; } +.tree-folder-title .title { + background: inherit; + color: #444; +} +.tree-folder-title .title:hover { + text-decoration: none; +} +.tree-folder.active .tree-folder-title { + background: #f0f0f0; +} +.tree-folder.active .tree-folder-title .title { + color: #0062BE; +} .tree-folder-items { border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; @@ -518,6 +533,15 @@ a.btn { line-height: 2.5rem; font-size: 0.8rem; } +.tree-folder-items > .item.active { + background: #0062be; +} +.tree-folder-items > .item > a { + text-decoration: none; +} +.tree-folder-items > .item.active > a { + color: #fff; +} /*=== STRUCTURE */ /*===============*/ @@ -561,22 +585,12 @@ a.btn { padding: 10px 0 50px; text-align: center; } - -/*=== Aside main page (categories) */ .aside.aside_feed .tree { - text-align: left; -} -.aside_feed .tree-folder-title { - position: relative; - background: #fff; -} -.aside_feed .tree-folder-title .title { - background: inherit; - color: #444; -} -.aside_feed .tree-folder-title .title:hover { - text-decoration: none; + position: sticky; + top: 0; } + +/*=== Aside main page (categories) */ .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { position: absolute; right: 0; @@ -587,39 +601,24 @@ a.btn { background: inherit; border-left: 1px solid #aaa; } -.aside_feed .tree-folder.active .tree-folder-title { - background: #f0f0f0; -} -.aside_feed .tree-folder.active .tree-folder-title .title { - color: #0062BE; -} /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items .item.active { - background: #0062BE; -} -.aside_feed .tree-folder-items .item.empty.active { +.aside_feed .tree-folder-items > .item.empty.active { background: #e67e22; } -.aside_feed .tree-folder-items .item.error.active { - background: #BD362F; +.aside_feed .tree-folder-items > .item.error.active { + background: #bd362f; } -.aside_feed .tree-folder-items .item.empty > a { +.aside_feed .tree-folder-items > .item.empty > a { color: #e67e22; } -.aside_feed .tree-folder-items .item.error > a { - color: #BD362F; +.aside_feed .tree-folder-items > .item.error > a { + color: #bd362f; } -.aside_feed .tree-folder-items .item.active > a, -.aside_feed .tree-folder-items .item.empty.active > a, -.aside_feed .tree-folder-items .item.error.active > a { +.aside_feed .tree-folder-items > .item.empty.active > a, +.aside_feed .tree-folder-items > .item.error.active > a { color: #fff; } -.aside_feed .tree-folder-items > .item > a { - line-height: 3em; - text-align: left; - text-decoration: none; -} .aside_feed .tree-folder-items > .item:not([data-unread="0"]) { font-weight: bold; } diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index bcafd162c..5a07426ea 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -330,6 +330,7 @@ a.btn { margin: 0; padding: 0; list-style: none; + text-align: left; } .tree-folder-items { padding: 0; @@ -351,7 +352,7 @@ a.btn { .tree-folder-items > .item > a { display: inline-block; vertical-align: middle; - width: calc(100% - 32px); + width: calc(100% - 16px); overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -717,7 +718,6 @@ br + br + br { @media(max-width: 840px) { .header, .aside .btn-important, - .aside .feeds .dropdown, .flux_header .item.website span, .item.date, .day .date, .dropdown-menu > .no-mobile, @@ -746,9 +746,6 @@ br + br + br { width: 90%; overflow: auto; } - .aside .categories { - margin: 10px 0 75px; - } .flux_header .item.website { width: 40px; @@ -770,10 +767,6 @@ br + br + br { width: 100%; } - #stream.global .box-category { - margin: 10px 0; - } - #panel { top: 0; bottom: 0; left: 0; right: 0; -- cgit v1.2.3 From 45dbe94890e507402d043dee8e176081b8a290e1 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 23 Oct 2014 13:54:18 +0200 Subject: Fix aside on mobile (Origine) --- app/layout/aside_feed.phtml | 2 +- p/themes/Origine/origine.css | 19 +++++++++++-------- p/themes/base-theme/template.css | 12 ++---------- 3 files changed, 14 insertions(+), 19 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 47b63f187..1480173b2 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -11,7 +11,7 @@ -
              +
              diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 7292379c0..7f60a1ec5 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -582,7 +582,7 @@ a.btn { background: #fff; } .aside.aside_feed { - padding: 10px 0 50px; + padding: 10px 0; text-align: center; } .aside.aside_feed .tree { @@ -1030,17 +1030,20 @@ a.btn { } .aside .toggle_aside, #panel .close { - position: absolute; display: block; - top: 0; right: 0; - width: 30px; - height: 30px; - line-height: 30px; + width: 100%; + height: 50px; + line-height: 50px; text-align: center; background: #f6f6f6; - border-left: 1px solid #ddd; border-bottom: 1px solid #ddd; - border-radius: 0 0 0 5px; + } + + .aside.aside_feed { + padding: 0; + } + .aside.aside_feed .tree { + position: static; } .nav_menu .btn { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 5a07426ea..b4cfec952 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -699,19 +699,11 @@ br + br + br { /*===========*/ .nav-login, .nav_menu .search, +.aside .toggle_aside, .nav_menu .toggle_aside { display: none; } -.aside .toggle_aside { - position: absolute; - right: 0; - display: none; - width: 30px; - height: 30px; - line-height: 30px; - text-align: center; -} /*=== MOBILE */ /*===========*/ @@ -724,11 +716,11 @@ br + br + br { .no-mobile { display: none; } + .aside .toggle_aside, .nav-login { display: block; } .nav_menu .toggle_aside, - .aside .toggle_aside, .nav_menu .search, #panel .close img { display: inline-block; -- cgit v1.2.3 From 0c8b55fc1317cff28de1f270ada0a75b4de074ac Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 10:07:53 +0200 Subject: First iteration to update all the themes See See https://github.com/marienfressinaud/FreshRSS/issues/634 --- app/layout/aside_feed.phtml | 2 +- p/themes/Dark/dark.css | 97 ++++++++++++++++++++++++++++++++---- p/themes/Flat/flat.css | 95 +++++++++++++++++++++++++++++++---- p/themes/Origine/origine.css | 2 + p/themes/Pafat/pafat.css | 95 +++++++++++++++++++++++++++++++---- p/themes/Screwdriver/screwdriver.css | 94 +++++++++++++++++++++++++++++++--- p/themes/base-theme/base.css | 90 +++++++++++++++++++-------------- p/themes/base-theme/template.css | 5 +- 8 files changed, 400 insertions(+), 80 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 1480173b2..12beba3a1 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -59,7 +59,7 @@
              - ✇ name(); ?> + ✇ name(); ?>
            diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index f3790614e..d00fdcbd3 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -464,6 +464,42 @@ a.btn { visibility: visible; } +/*=== Tree */ +.tree { + margin: 10px 0; +} +.tree-folder-title { + position: relative; + padding: 0 10px; + line-height: 2.5rem; + font-size: 1rem; +} +.tree-folder-title .title { + background: inherit; +} +.tree-folder-title .title:hover { + text-decoration: none; +} +.tree-folder.active .tree-folder-title { + font-weight: bold; +} +.tree-folder.active .tree-folder-title .title { +} +.tree-folder-items { +} +.tree-folder-items > .item { + padding: 0 10px; + line-height: 2.5rem; + font-size: 0.8rem; +} +.tree-folder-items > .item.active { +} +.tree-folder-items > .item > a { + text-decoration: none; +} +.tree-folder-items > .item.active > a { +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -500,10 +536,46 @@ a.btn { border-right: 1px solid #333; background: #1c1c1c; } -.aside.aside_flux { - padding: 10px 0 50px; - border-right: 1px solid #333; - background: #1c1c1c; +.aside.aside_feed { + padding: 10px 0; + text-align: center; +} +.aside.aside_feed .tree { + position: sticky; + top: 0; + margin: 10px 0 50px; +} + +/*=== Aside main page (categories) */ +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { + position: absolute; + top: 3px; right: 3px; + padding: 1px 5px; +} + +/*=== Aside main page (feeds) */ +.aside_feed .tree-folder-items > .item.empty.active { +} +.aside_feed .tree-folder-items > .item.error.active { +} +.aside_feed .tree-folder-items > .item.empty > a { +} +.aside_feed .tree-folder-items > .item.error > a { +} +.aside_feed .tree-folder-items > .item.empty.active > a, +.aside_feed .tree-folder-items > .item.error.active > a { +} +.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { + font-weight: bold; +} +.aside_feed .tree-folder-items .dropdown-menu:after { + left: 2px; +} +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { + border-radius: 3px; + vertical-align: middle; } /*=== Aside main page (categories) */ @@ -963,17 +1035,20 @@ a.btn { } .aside .toggle_aside, #panel .close { - position: absolute; display: block; - top: 0; right: 0; - width: 30px; - height: 30px; - line-height: 30px; + width: 100%; + height: 50px; + line-height: 50px; text-align: center; background: #111; - border-left: 1px solid #333; border-bottom: 1px solid #333; - border-radius: 0 0 0 5px; + } + + .aside.aside_feed { + padding: 0; + } + .aside.aside_feed .tree { + position: static; } .nav_menu .btn { diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index e2151b1f9..a1129771a 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -473,6 +473,42 @@ a.btn { visibility: visible; } +/*=== Tree */ +.tree { + margin: 10px 0; +} +.tree-folder-title { + position: relative; + padding: 0 10px; + line-height: 2.5rem; + font-size: 1rem; +} +.tree-folder-title .title { + background: inherit; +} +.tree-folder-title .title:hover { + text-decoration: none; +} +.tree-folder.active .tree-folder-title { + font-weight: bold; +} +.tree-folder.active .tree-folder-title .title { +} +.tree-folder-items { +} +.tree-folder-items > .item { + padding: 0 10px; + line-height: 2.5rem; + font-size: 0.8rem; +} +.tree-folder-items > .item.active { +} +.tree-folder-items > .item > a { + text-decoration: none; +} +.tree-folder-items > .item.active > a { +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -508,9 +544,46 @@ a.btn { .aside { background: #ecf0f1; } -.aside.aside_flux { - padding: 10px 0 50px; - background: #ecf0f1; +.aside.aside_feed { + padding: 10px 0; + text-align: center; +} +.aside.aside_feed .tree { + position: sticky; + top: 0; + margin: 10px 0 50px; +} + +/*=== Aside main page (categories) */ +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { + position: absolute; + top: 3px; right: 3px; + padding: 1px 5px; +} + +/*=== Aside main page (feeds) */ +.aside_feed .tree-folder-items > .item.empty.active { +} +.aside_feed .tree-folder-items > .item.error.active { +} +.aside_feed .tree-folder-items > .item.empty > a { +} +.aside_feed .tree-folder-items > .item.error > a { +} +.aside_feed .tree-folder-items > .item.empty.active > a, +.aside_feed .tree-folder-items > .item.error.active > a { +} +.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { + font-weight: bold; +} +.aside_feed .tree-folder-items .dropdown-menu:after { + left: 2px; +} +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { + border-radius: 3px; + vertical-align: middle; } /*=== Aside main page (categories) */ @@ -961,15 +1034,19 @@ a.btn { } .aside .toggle_aside, #panel .close { - position: absolute; display: block; - top: 0; right: 0; - width: 32px; - height: 32px; - line-height: 30px; + width: 100%; + height: 50px; + line-height: 50px; text-align: center; background: #34495e; - border-radius: 0 0 0 5px; + } + + .aside.aside_feed { + padding: 0; + } + .aside.aside_feed .tree { + position: static; } .nav_menu .btn { diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 7f60a1ec5..b4465a717 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -584,10 +584,12 @@ a.btn { .aside.aside_feed { padding: 10px 0; text-align: center; + background: #fff; } .aside.aside_feed .tree { position: sticky; top: 0; + margin: 10px 0 50px; } /*=== Aside main page (categories) */ diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 28b17e15f..ed19aa5db 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -520,6 +520,42 @@ a.btn { visibility: visible; } +/*=== Tree */ +.tree { + margin: 10px 0; +} +.tree-folder-title { + position: relative; + padding: 0 10px; + line-height: 2.5rem; + font-size: 1rem; +} +.tree-folder-title .title { + background: inherit; +} +.tree-folder-title .title:hover { + text-decoration: none; +} +.tree-folder.active .tree-folder-title { + font-weight: bold; +} +.tree-folder.active .tree-folder-title .title { +} +.tree-folder-items { +} +.tree-folder-items > .item { + padding: 0 10px; + line-height: 2.5rem; + font-size: 0.8rem; +} +.tree-folder-items > .item.active { +} +.tree-folder-items > .item > a { + text-decoration: none; +} +.tree-folder-items > .item.active > a { +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -572,8 +608,46 @@ a.btn { border-right: 1px solid #aaa; background: #fff; } -.aside.aside_flux { - padding: 10px 0 50px; +.aside.aside_feed { + padding: 10px 0; + text-align: center; +} +.aside.aside_feed .tree { + position: sticky; + top: 0; + margin: 10px 0 50px; +} + +/*=== Aside main page (categories) */ +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { + position: absolute; + top: 3px; right: 3px; + padding: 1px 5px; +} + +/*=== Aside main page (feeds) */ +.aside_feed .tree-folder-items > .item.empty.active { +} +.aside_feed .tree-folder-items > .item.error.active { +} +.aside_feed .tree-folder-items > .item.empty > a { +} +.aside_feed .tree-folder-items > .item.error > a { +} +.aside_feed .tree-folder-items > .item.empty.active > a, +.aside_feed .tree-folder-items > .item.error.active > a { +} +.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { + font-weight: bold; +} +.aside_feed .tree-folder-items .dropdown-menu:after { + left: 2px; +} +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { + border-radius: 3px; + vertical-align: middle; } /*=== Aside main page (categories) */ @@ -1056,17 +1130,20 @@ a.btn { } .aside .toggle_aside, #panel .close { - position: absolute; display: block; - top: 0; right: 0; - width: 30px; - height: 30px; - line-height: 30px; + width: 100%; + height: 40px; + line-height: 40px; text-align: center; background: #f6f6f6; - border-left: 1px solid #ddd; border-bottom: 1px solid #ddd; - border-radius: 0 0 0 5px; + } + + .aside.aside_feed { + padding: 0; + } + .aside.aside_feed .tree { + position: static; } .nav_menu .btn { diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 6206504d1..94a1bccdd 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -531,6 +531,42 @@ a.btn { visibility: visible; } +/*=== Tree */ +.tree { + margin: 10px 0; +} +.tree-folder-title { + position: relative; + padding: 0 10px; + line-height: 2.5rem; + font-size: 1rem; +} +.tree-folder-title .title { + background: inherit; +} +.tree-folder-title .title:hover { + text-decoration: none; +} +.tree-folder.active .tree-folder-title { + font-weight: bold; +} +.tree-folder.active .tree-folder-title .title { +} +.tree-folder-items { +} +.tree-folder-items > .item { + padding: 0 10px; + line-height: 2.5rem; + font-size: 0.8rem; +} +.tree-folder-items > .item.active { +} +.tree-folder-items > .item > a { + text-decoration: none; +} +.tree-folder-items > .item.active > a { +} + /*=== STRUCTURE */ /*===============*/ /*=== Header */ @@ -578,9 +614,46 @@ a.btn { background: #222; width: 235px; } -.aside.aside_flux { - padding: 10px 0 50px; - background: #222; +.aside.aside_feed { + padding: 10px 0; + text-align: center; +} +.aside.aside_feed .tree { + position: sticky; + top: 0; + margin: 10px 0 50px; +} + +/*=== Aside main page (categories) */ +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { + position: absolute; + top: 3px; right: 3px; + padding: 1px 5px; +} + +/*=== Aside main page (feeds) */ +.aside_feed .tree-folder-items > .item.empty.active { +} +.aside_feed .tree-folder-items > .item.error.active { +} +.aside_feed .tree-folder-items > .item.empty > a { +} +.aside_feed .tree-folder-items > .item.error > a { +} +.aside_feed .tree-folder-items > .item.empty.active > a, +.aside_feed .tree-folder-items > .item.error.active > a { +} +.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { + font-weight: bold; +} +.aside_feed .tree-folder-items .dropdown-menu:after { + left: 2px; +} +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { + border-radius: 3px; + vertical-align: middle; } /*=== Aside main page (categories) */ @@ -1135,12 +1208,10 @@ opacity: 1; } .aside .toggle_aside, #panel .close { - position: absolute; display: block; - top: 0; right: 0; - width: 30px; - height: 30px; - line-height: 30px; + width: 100%; + height: 40px; + line-height: 40px; text-align: center; background: #171717; box-shadow: 0 1px rgba(255,255,255,0.08); @@ -1151,6 +1222,13 @@ opacity: 1; margin: 20px 0 0; } + .aside.aside_feed { + padding: 0; + } + .aside.aside_feed .tree { + position: static; + } + .nav_menu .btn { margin: 5px 10px; } diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 0b0a04c9a..968716073 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -358,16 +358,36 @@ a.btn { margin: 10px 0; } .tree-folder-title { + position: relative; padding: 0 10px; line-height: 2.5rem; - font-size: 1.2rem; + font-size: 1rem; +} +.tree-folder-title .title { + background: inherit; +} +.tree-folder-title .title:hover { + text-decoration: none; +} +.tree-folder.active .tree-folder-title { font-weight: bold; } -.tree-folder-items .item { - padding: 0 5px 0 20px; +.tree-folder.active .tree-folder-title .title { +} +.tree-folder-items { +} +.tree-folder-items > .item { + padding: 0 10px; line-height: 2.5rem; font-size: 0.8rem; } +.tree-folder-items > .item.active { +} +.tree-folder-items > .item > a { + text-decoration: none; +} +.tree-folder-items > .item.active > a { +} /*=== STRUCTURE */ /*===============*/ @@ -403,55 +423,44 @@ a.btn { .aside { } .aside.aside_feed { - padding: 10px 0 50px; + padding: 10px 0; text-align: center; } - -/*=== Aside main page (categories) */ .aside.aside_feed .tree { - text-align: left; -} -.aside_feed .tree-folder-title { - position: relative; + position: sticky; + top: 0; + margin: 10px 0 50px; } -.aside_feed .tree-folder-title > a:not([data-unread="0"]):after { + +/*=== Aside main page (categories) */ +.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { position: absolute; top: 3px; right: 3px; padding: 1px 5px; } /*=== Aside main page (feeds) */ -.categories .feeds .item.active { -} -.categories .feeds .item.empty.active { +.aside_feed .tree-folder-items > .item.empty.active { } -.categories .feeds .item.error.active { +.aside_feed .tree-folder-items > .item.error.active { } -.categories .feeds .item.empty .feed { +.aside_feed .tree-folder-items > .item.empty > a { } -.categories .feeds .item.error .feed { +.aside_feed .tree-folder-items > .item.error > a { } -.categories .feeds .item.active .feed, -.categories .feeds .item.empty.active .feed, -.categories .feeds .item.error.active .feed { +.aside_feed .tree-folder-items > .item.empty.active > a, +.aside_feed .tree-folder-items > .item.error.active > a { } -.categories .feeds .item .feed { - margin: 0; - width: 165px; - line-height: 3em; - font-size: 0.8em; - text-align: left; - text-decoration: none; -} -.categories .feeds .feed:not([data-unread="0"]) { +.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { font-weight: bold; } -.categories .feeds .dropdown-menu:after { +.aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; } -.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, -.categories .feeds .item:hover .dropdown-toggle > .icon, -.categories .feeds .item.active .dropdown-toggle > .icon { +.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, +.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { + border-radius: 3px; vertical-align: middle; } @@ -758,15 +767,20 @@ a.btn { } .aside .toggle_aside, #panel .close { - position: absolute; display: block; - top: 0; right: 0; - width: 30px; - height: 30px; - line-height: 30px; + width: 100%; + height: 50px; + line-height: 50px; text-align: center; } + .aside.aside_feed { + padding: 0; + } + .aside.aside_feed .tree { + position: static; + } + .nav_menu .btn { margin: 5px 10px; } diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index b4cfec952..86e06f5ea 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -352,7 +352,7 @@ a.btn { .tree-folder-items > .item > a { display: inline-block; vertical-align: middle; - width: calc(100% - 16px); + width: calc(100% - 32px); overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -399,9 +399,6 @@ a.btn { width: 250px; vertical-align: top; } -.aside.aside_feed { - background: #fff; -} /*=== Aside main page (categories) */ .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"], -- cgit v1.2.3 From 958503251f7bb53799fb1665ddfac08f043dfff5 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 10:23:16 +0200 Subject: Fix Dark theme See https://github.com/marienfressinaud/FreshRSS/issues/634 --- p/themes/Dark/dark.css | 100 +++++++++++-------------------------------- p/themes/base-theme/base.css | 7 ++- 2 files changed, 29 insertions(+), 78 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index d00fdcbd3..2b853a45c 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -473,19 +473,23 @@ a.btn { padding: 0 10px; line-height: 2.5rem; font-size: 1rem; + background: #1c1c1c; + font-weight: bold; } .tree-folder-title .title { background: inherit; + color: #888; } .tree-folder-title .title:hover { text-decoration: none; } .tree-folder.active .tree-folder-title { - font-weight: bold; -} -.tree-folder.active .tree-folder-title .title { + background: #2c2c2c; } .tree-folder-items { + border-top: 1px solid #222; + border-bottom: 1px solid #222; + background: #161616; } .tree-folder-items > .item { padding: 0 10px; @@ -493,11 +497,13 @@ a.btn { font-size: 0.8rem; } .tree-folder-items > .item.active { + background: #1c1c1c; } .tree-folder-items > .item > a { text-decoration: none; } .tree-folder-items > .item.active > a { + color: #888; } /*=== STRUCTURE */ @@ -549,21 +555,33 @@ a.btn { /*=== Aside main page (categories) */ .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { position: absolute; - top: 3px; right: 3px; - padding: 1px 5px; + right: 0; + margin: 10px 0; + padding: 0 10px; + font-size: 0.9rem; + line-height: 1.5rem; + background: inherit; + border-left: 1px solid #666; } /*=== Aside main page (feeds) */ .aside_feed .tree-folder-items > .item.empty.active { + background: #c95; } .aside_feed .tree-folder-items > .item.error.active { + background: #a44; } .aside_feed .tree-folder-items > .item.empty > a { + color: #c95; } .aside_feed .tree-folder-items > .item.error > a { + color: #a44; +} +.aside_feed .tree-folder-items > .item.empty.active > a { + color: #111; } -.aside_feed .tree-folder-items > .item.empty.active > a, .aside_feed .tree-folder-items > .item.error.active > a { + color: #fff; } .aside_feed .tree-folder-items > .item:not([data-unread="0"]) { font-weight: bold; @@ -576,77 +594,7 @@ a.btn { .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { border-radius: 3px; vertical-align: middle; -} - -/*=== Aside main page (categories) */ -.categories { - text-align: center; -} -.category { - width: 235px; - margin: 10px auto; - text-align: left; -} -.category .btn:first-child { - position: relative; - width: 213px; -} -.category.stick .btn:first-child { - width: 176px; -} -.category .btn:first-child:not([data-unread="0"]):after { - position: absolute; - top: 3px; right: 3px; - padding: 1px 5px; - background: #111; - color: #888; - border: 1px solid #000; - border-radius: 5px; -} - -/*=== Aside main page (feeds) */ -.categories .feeds .item.active { - background: #333; -} -.categories .feeds .item.active .feed { - color: #888; -} -.categories .feeds .item.empty .feed { - color: #c95; -} -.categories .feeds .item.empty.active { - background: #c95; -} -.categories .feeds .item.error .feed { - color: #a44; -} -.categories .feeds .item.error.active { - background: #a44; -} -.categories .feeds .item.empty.active .feed, -.categories .feeds .item.error.active .feed { - color: #fff; -} -.categories .feeds .item .feed { - margin: 0; - width: 165px; - line-height: 3em; - font-size: 0.8em; - text-align: left; - text-decoration: none; -} -.categories .feeds .feed:not([data-unread="0"]) { - font-weight: bold; -} -.categories .feeds .dropdown-menu:after { - left: 2px; -} -.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon, -.categories .feeds .item:hover .dropdown-toggle > .icon, -.categories .feeds .item.active .dropdown-toggle > .icon { - vertical-align: middle; background-color: #111; - border-radius: 3px; } /*=== Configuration pages */ diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 968716073..4de5fa98a 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -435,8 +435,11 @@ a.btn { /*=== Aside main page (categories) */ .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { position: absolute; - top: 3px; right: 3px; - padding: 1px 5px; + right: 0; + margin: 10px 0; + padding: 0 10px; + font-size: 0.9rem; + line-height: 1.5rem; } /*=== Aside main page (feeds) */ -- cgit v1.2.3 From 9fc536c28763260dd996f64e2cd451605faa64d3 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 12:43:05 +0200 Subject: Fix .state_unread .items with data-unread="0" --- p/themes/base-theme/template.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 86e06f5ea..b07b579d0 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -402,7 +402,7 @@ a.btn { /*=== Aside main page (categories) */ .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"], -.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] { +.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] { display: none; } .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { -- cgit v1.2.3 From fa0c7d75e6b9d01130f1c9518eef5f37d8e6d4ff Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 13:50:08 +0200 Subject: Begin to fix global view --- app/layout/aside_feed.phtml | 6 ++-- app/views/index/global.phtml | 27 ++++++++++++------ p/scripts/global_view.js | 2 +- p/themes/Dark/dark.css | 3 -- p/themes/Origine/origine.css | 11 +++----- p/themes/Pafat/pafat.css | 4 --- p/themes/Screwdriver/screwdriver.css | 3 -- p/themes/base-theme/base.css | 3 -- p/themes/base-theme/template.css | 54 ++++++++++++------------------------ 9 files changed, 44 insertions(+), 69 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 12beba3a1..06e12a5cf 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -42,7 +42,7 @@ $c_show = $c_active && (!FreshRSS_Context::$conf->display_categories || FreshRSS_Context::$current_get['feed']); ?> -
          • +
          • name(); ?> @@ -53,13 +53,13 @@ foreach ($feeds as $feed) { $f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id()); ?> -
          • +
          • - ✇ name(); ?> + ✇ name(); ?>
          diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index ab63c409a..5159882ba 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -1,11 +1,20 @@ -partial('nav_menu'); ?> +partial('nav_menu'); + + $class = ''; + if (FreshRSS_Context::$conf->hide_read_feeds && + FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) && + !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) { + $class = ' state_unread'; + } +?> -
          +
          'index', 'a' => 'index', - 'params' => array() + 'params' => Minz_Request::params() ); foreach ($this->categories as $cat) { @@ -14,20 +23,20 @@ if (!empty($feeds)) { ?> -
          -
          name(); ?>
          +
          +
          name(); ?>
            nbNotRead(); - $error = $feed->inError() ? 'error ' : ''; - $empty = $feed->nbEntries() === 0 ? 'empty ' : ''; + $error = $feed->inError() ? ' error' : ''; + $empty = $feed->nbEntries() === 0 ? ' empty' : ''; $url_base['params']['get'] = 'f_' . $feed->id(); ?> -
          • +
          • ✇ - name(); ?> + name(); ?>
          diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js index 8c2e6c1a2..14909f44e 100644 --- a/p/scripts/global_view.js +++ b/p/scripts/global_view.js @@ -9,7 +9,7 @@ function load_panel(link) { panel_loading = true; $.get(link, function (data) { - $("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data)); + $("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination, #stream.prompt", data)); $("#panel .nav_menu").children().not("#nav_menu_read_all").remove(); diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 2b853a45c..25a3e66f6 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -852,9 +852,6 @@ a.btn { border-radius: 5px; text-align: left; } -#stream.global .category { - margin: 0; -} #stream.global .btn { width: auto; height: 2em; diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index b4465a717..7230aa128 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -593,7 +593,7 @@ a.btn { } /*=== Aside main page (categories) */ -.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { +.aside_feed .category .title:not([data-unread="0"]):after { position: absolute; right: 0; margin: 10px 0; @@ -603,6 +603,9 @@ a.btn { background: inherit; border-left: 1px solid #aaa; } +.feed .item-title:not([data-unread="0"]) { + font-weight: bold; +} /*=== Aside main page (feeds) */ .aside_feed .tree-folder-items > .item.empty.active { @@ -621,9 +624,6 @@ a.btn { .aside_feed .tree-folder-items > .item.error.active > a { color: #fff; } -.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { - font-weight: bold; -} .aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; } @@ -903,9 +903,6 @@ a.btn { text-align: left; box-shadow: 0 0 3px #bbb; } -#stream.global .category { - margin: 0; -} #stream.global .btn { width: auto; height: 2em; diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index cdbedbf22..84a485e13 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -914,10 +914,6 @@ a.btn { text-align: left; } -#stream.global .category { - margin: 0; -} - #stream.global .category:first-child { margin: 0; } diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index aa5758a90..5771bb68f 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -969,9 +969,6 @@ opacity: 1; box-shadow: 0 0 4px #171717; overflow:hidden; } -#stream.global .category { - margin: 0; -} #stream.global .btn { width: auto; height: 2em; diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 4de5fa98a..53f59bbe5 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -668,9 +668,6 @@ a.btn { #stream.global .box-category { text-align: left; } -#stream.global .category { - margin: 0; -} #stream.global .btn { width: auto; height: 2em; diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index b07b579d0..1af7a73d6 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -289,6 +289,7 @@ a.btn { vertical-align: top; } .box .box-title { + position: relative; font-size: 1.2rem; font-weight: bold; text-align: center; @@ -400,22 +401,10 @@ a.btn { vertical-align: top; } -/*=== Aside main page (categories) */ -.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"], -.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] { - display: none; -} -.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after { - content: attr(data-unread); -} - /*=== Aside main page (feeds) */ .aside_feed .tree-folder-items:not(.active) { display: none; } -.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before { - content: "(" attr(data-unread) ") "; -} .aside_feed .tree-folder-items .dropdown-menu { left: 0; } @@ -612,32 +601,13 @@ br + br + br { /*=== GLOBAL VIEW */ /*================*/ -/*=== Category boxes */ - -/* TODO */ -#stream.global .box-category { - display: inline-block; - width: 19em; - max-width: 95%; - margin: 20px 10px; - border: 1px solid #ccc; - vertical-align: top; -} -#stream.global .category { - width: 100%; -} -#stream.global .btn { - display: block; -} -#stream.global .box-category .feeds { - display: block; - overflow: auto; +#stream.global { + text-align: center; } -#stream.global .box-category .feed { - width: 19em; - max-width: 90%; + +#stream.global .box { + text-align: left; } -/* TODO Date: Fri, 24 Oct 2014 14:10:45 +0200 Subject: Fix Origine and base-theme themes for global view See https://github.com/marienfressinaud/FreshRSS/issues/634 --- p/themes/Origine/origine.css | 39 ++++++++++++++------------------------- p/themes/base-theme/base.css | 32 ++++++++++++++++---------------- p/themes/base-theme/template.css | 3 +++ 3 files changed, 33 insertions(+), 41 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 7230aa128..918d4f653 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -897,32 +897,24 @@ a.btn { /*=== GLOBAL VIEW */ /*================*/ -#stream.global .box-category { - background: #fff; - border-radius: 5px; +.box.category .box-title .title { + font-weight: normal; + text-decoration: none; text-align: left; - box-shadow: 0 0 3px #bbb; -} -#stream.global .btn { - width: auto; - height: 2em; - margin: 0; - padding: 0 10px; - background: #f6f6f6; - border: none; - border-bottom: 1px solid #ddd; - border-radius: 5px 5px 0 0; - line-height: 2em; - font-size: 1.2rem; } -#stream.global .btn:not([data-unread="0"]) { +.box.category:not([data-unread="0"]) .box-title { background: #0084CC; +} +.box.category:not([data-unread="0"]) .box-title:active { + background: #3498db; +} +.box.category:not([data-unread="0"]) .box-title .title { color: #fff; font-weight: bold; - text-shadow: none; } -#stream.global .btn:first-child:not([data-unread="0"]):after { - top: 0; right: 5px; +.box.category .title:not([data-unread="0"]):after { + position: absolute; + top: 5px; right: 10px; border: 0; background: none; color: #fff; @@ -930,12 +922,9 @@ a.btn { box-shadow: none; text-shadow: none; } -#stream.global .box-category .feeds { - max-height: 250px; -} -#stream.global .box-category .feeds .item { +.box.category .item.feed { padding: 2px 10px; - font-size: 0.9rem; + font-size: 0.8rem; } /*=== DIVERS */ diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 53f59bbe5..029c2d254 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -665,30 +665,30 @@ a.btn { /*=== GLOBAL VIEW */ /*================*/ -#stream.global .box-category { +.box.category .box-title .title { + font-weight: normal; + text-decoration: none; text-align: left; } -#stream.global .btn { - width: auto; - height: 2em; - margin: 0; - padding: 0 10px; - line-height: 2em; - font-size: 1.2rem; +.box.category:not([data-unread="0"]) .box-title { } -#stream.global .btn:not([data-unread="0"]) { - font-weight: bold; +.box.category:not([data-unread="0"]) .box-title:active { } -#stream.global .btn:first-child:not([data-unread="0"]):after { - top: 0; right: 5px; +.box.category:not([data-unread="0"]) .box-title .title { font-weight: bold; } -#stream.global .box-category .feeds { - max-height: 250px; +.box.category .title:not([data-unread="0"]):after { + position: absolute; + top: 5px; right: 10px; + border: 0; + background: none; + font-weight: bold; + box-shadow: none; + text-shadow: none; } -#stream.global .box-category .feeds .item { +.box.category .item.feed { padding: 2px 10px; - font-size: 0.9rem; + font-size: 0.8rem; } /*=== DIVERS */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 1af7a73d6..f4f19ee71 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -294,6 +294,9 @@ a.btn { font-weight: bold; text-align: center; } +.box .box-title a { + display: block; +} .box .box-title form { margin: 0; } -- cgit v1.2.3 From 98fbc736ec3b4a5260da72eb8c9f66b798b74725 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 14:34:08 +0200 Subject: Fix all the themes for global view See https://github.com/marienfressinaud/FreshRSS/issues/634 --- p/themes/Dark/dark.css | 45 ++++++++++++----------------- p/themes/Flat/flat.css | 45 +++++++++++------------------ p/themes/Origine/origine.css | 3 -- p/themes/Pafat/pafat.css | 55 +++++++++-------------------------- p/themes/Screwdriver/screwdriver.css | 56 +++++++++++++++--------------------- p/themes/base-theme/template.css | 3 ++ 6 files changed, 75 insertions(+), 132 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 25a3e66f6..f48f42b68 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -845,43 +845,34 @@ a.btn { /*=== GLOBAL VIEW */ /*================*/ -#stream.global .box-category { - text-align: left; - background: #1a1a1a; - border: 1px solid #000; - border-radius: 5px; +.box.category .box-title .title { + font-weight: normal; + text-decoration: none; text-align: left; + color: #888; } -#stream.global .btn { - width: auto; - height: 2em; - margin: 0; - padding: 0 10px; - line-height: 2em; - font-size: 1.2rem; +.box.category:not([data-unread="0"]) .box-title { + background: #34495E; +} +.box.category:not([data-unread="0"]) .box-title:active { background: #26303F; - border: none; - border-bottom: 1px solid #000; - border-radius: 5px 5px 0 0; } -#stream.global .btn:not([data-unread="0"]) { - font-weight: bold; - background: #34495e; +.box.category:not([data-unread="0"]) .box-title .title { color: #fff; -} -#stream.global .btn:first-child:not([data-unread="0"]):after { - top: 0; right: 5px; font-weight: bold; +} +.box.category .title:not([data-unread="0"]):after { + position: absolute; + top: 5px; right: 10px; border: 0; background: none; - color: #fff; -} -#stream.global .box-category .feeds { - max-height: 250px; + font-weight: bold; + box-shadow: none; + text-shadow: none; } -#stream.global .box-category .feeds .item { +.box.category .item.feed { padding: 2px 10px; - font-size: 0.9rem; + font-size: 0.8rem; } /*=== Panel */ diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index c594811f2..432a9a0fb 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -851,44 +851,33 @@ a.btn { /*=== GLOBAL VIEW */ /*================*/ -#stream.global .box-category { +.box.category .box-title .title { + font-weight: normal; + text-decoration: none; text-align: left; - border: 1px solid #ddd; - border-radius: 5px; } -#stream.global .category { - margin: 0; +.box.category:not([data-unread="0"]) .box-title { + background: #3498db; } -#stream.global .btn { - width: auto; - height: 2em; - margin: 0; - padding: 0 10px; - line-height: 2em; - font-size: 1.2rem; - background: #ecf0f1; - color: #333; - border-bottom: 1px solid #ddd; - border-radius: 5px 5px 0 0; +.box.category:not([data-unread="0"]) .box-title:active { + background: #2980b9; } -#stream.global .btn:not([data-unread="0"]) { +.box.category:not([data-unread="0"]) .box-title .title { font-weight: bold; - background: #3498db; color: #fff; } -#stream.global .btn:first-child:not([data-unread="0"]):after { - top: 0; right: 5px; - font-weight: bold; - background: none; +.box.category .title:not([data-unread="0"]):after { + position: absolute; + top: 5px; right: 10px; border: 0; - color: #fff; -} -#stream.global .box-category .feeds { - max-height: 250px; + background: none; + font-weight: bold; + box-shadow: none; + text-shadow: none; } -#stream.global .box-category .feeds .item { +.box.category .item.feed { padding: 2px 10px; - font-size: 0.9rem; + font-size: 0.8rem; } /*=== DIVERS */ diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 918d4f653..7231abd01 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -603,9 +603,6 @@ a.btn { background: inherit; border-left: 1px solid #aaa; } -.feed .item-title:not([data-unread="0"]) { - font-weight: bold; -} /*=== Aside main page (feeds) */ .aside_feed .tree-folder-items > .item.empty.active { diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 84a485e13..f10b66086 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -908,59 +908,32 @@ a.btn { /*=== GLOBAL VIEW */ /*================*/ -#stream.global .box-category { - background: #fff; - border:none; +.box.category .box-title .title { + font-weight: normal; + text-decoration: none; text-align: left; } - -#stream.global .category:first-child { - margin: 0; +.box.category:not([data-unread="0"]) .box-title { + background: #5BC0DE; } - - -#stream.global .btn { - width: auto; - height: 2em; - margin: 0; - padding: 0 10px; - background: #f6f6f6; - border-bottom: 1px solid #aaa; - border-radius: 5px 5px 0 0; - line-height: 2em; - font-size: 1.2rem; -} - -#stream.global .btn:not([data-unread="0"]) { - background: #5bc0de; - border-color : #5bc0de; - color: #fff; +.box.category:not([data-unread="0"]) .box-title .title { font-weight: bold; - text-shadow: none; - + color: #fff; } - - -#stream.global .btn:first-child:not([data-unread="0"]):after { - top: 0; right: 5px; +.box.category .title:not([data-unread="0"]):after { + position: absolute; + top: 5px; right: 10px; border: 0; background: none; - color: #fff; font-weight: bold; box-shadow: none; text-shadow: none; + font-size: 0.8rem; + line-height: 1.6rem; } - -#stream.global .box-category .feeds { - max-height: 250px; - width: 302px; - border : solid #aaa 1px; - border-top : none; -} - -#stream.global .box-category .feeds .item { +.box.category .item.feed { padding: 2px 10px; - font-size: 0.9rem; + font-size: 0.8rem; } /*=== DIVERS */ diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 5771bb68f..c38cb617e 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -957,60 +957,50 @@ opacity: 1; /*=== GLOBAL VIEW */ /*================*/ -#stream.global{ - background:#222; +#stream.global { + background: #222; padding: 24px 0; box-shadow: 0 1px #fff, 0 -2px 2px #171717 inset, 0 2px 2px #171717 inset; } -#stream.global .box-category { - background: #fff; - border-radius: 4px 4px 0 0; - text-align: left; - box-shadow: 0 0 4px #171717; - overflow:hidden; -} -#stream.global .btn { - width: auto; - height: 2em; - margin: 0; - padding: 0 10px; + +.box.category .box-title { background: linear-gradient(0deg, #EDE7DE 0%, #fff 100%) #171717; background: -webkit-linear-gradient(bottom, #EDE7DE 0%, #fff 100%); - border: none; box-shadow: 0px -1px #fff inset,0 -2px #ccc inset; border-radius: none; line-height: 2em; font-size: 1.2rem; - color:#888; text-shadow:0 1px #ccc; } -#stream.global .btn:not([data-unread="0"]) { +.box.category .box-title .title { + font-weight: normal; + text-decoration: none; + text-align: left; + color: #888; +} +.box.category:not([data-unread="0"]) .box-title { +} +.box.category:not([data-unread="0"]) .box-title:active { +} +.box.category:not([data-unread="0"]) .box-title .title { color: #222; font-weight: bold; } -#stream.global .btn:first-child:not([data-unread="0"]):after { - top: 0; - right: 5px; +.box.category .title:not([data-unread="0"]):after { + position: absolute; + top: 5px; right: 10px; border: 0; background: none; - color: #222; font-weight: bold; - box-shadow: none; - text-shadow: none; -} -#stream.global .box-category .feeds { - max-height: 250px; - color:#222; - background:#EDE7DE; } -#stream.global .box-category .feeds .item { +.box.category .item.feed { padding: 2px 10px; - font-size: 0.9rem; - overflow:hidden; + font-size: 0.8rem; } -#stream.global .box-category .feed { - color:#222; +.box.category .item.feed .item-title { + color: #222; } + /*=== PANEL */ /*===========*/ #panel { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index f4f19ee71..fd95cb697 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -673,6 +673,9 @@ br + br + br { .feed .item-title:not([data-unread="0"]):before { content: "(" attr(data-unread) ") "; } +.feed .item-title:not([data-unread="0"]) { + font-weight: bold; +} .state_unread .category:not(.active)[data-unread="0"], .state_unread .feed:not(.active)[data-unread="0"] { -- cgit v1.2.3 From 27c380400dc715441c4193d7c4a7056f960fbfd5 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 14:42:46 +0200 Subject: Fix feed in error or empty (all the themes) See https://github.com/marienfressinaud/FreshRSS/issues/634 --- p/themes/Dark/dark.css | 15 ++++++--------- p/themes/Flat/flat.css | 15 ++++++--------- p/themes/Origine/origine.css | 12 ++++++------ p/themes/Pafat/pafat.css | 15 ++++++--------- p/themes/Screwdriver/screwdriver.css | 9 +++------ p/themes/base-theme/base.css | 15 ++++++--------- 6 files changed, 33 insertions(+), 48 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index f48f42b68..1f26224e4 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -565,27 +565,24 @@ a.btn { } /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items > .item.empty.active { +.feed.item.empty.active { background: #c95; } -.aside_feed .tree-folder-items > .item.error.active { +.feed.item.error.active { background: #a44; } -.aside_feed .tree-folder-items > .item.empty > a { +.feed.item.empty > a { color: #c95; } -.aside_feed .tree-folder-items > .item.error > a { +.feed.item.error > a { color: #a44; } -.aside_feed .tree-folder-items > .item.empty.active > a { +.feed.item.empty.active > a { color: #111; } -.aside_feed .tree-folder-items > .item.error.active > a { +.feed.item.error.active > a { color: #fff; } -.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { - font-weight: bold; -} .aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; } diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index 432a9a0fb..46c874311 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -570,25 +570,22 @@ a.btn { } /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items > .item.empty.active { +.feed.item.empty.active { background: #f39c12; } -.aside_feed .tree-folder-items > .item.error.active { +.feed.item.error.active { background: #bd362f; } -.aside_feed .tree-folder-items > .item.empty > a { +.feed.item.empty > a { color: #e67e22; } -.aside_feed .tree-folder-items > .item.error > a { +.feed.item.error > a { color: #bd362f; } -.aside_feed .tree-folder-items > .item.empty.active > a, -.aside_feed .tree-folder-items > .item.error.active > a { +.feed.item.empty.active > a, +.feed.item.error.active > a { color: #fff; } -.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { - font-weight: bold; -} .aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; } diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 7231abd01..1b54e9bfe 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -605,20 +605,20 @@ a.btn { } /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items > .item.empty.active { +.feed.item.empty.active { background: #e67e22; } -.aside_feed .tree-folder-items > .item.error.active { +.feed.item.error.active { background: #bd362f; } -.aside_feed .tree-folder-items > .item.empty > a { +.feed.item.empty > a { color: #e67e22; } -.aside_feed .tree-folder-items > .item.error > a { +.feed.item.error > a { color: #bd362f; } -.aside_feed .tree-folder-items > .item.empty.active > a, -.aside_feed .tree-folder-items > .item.error.active > a { +.feed.item.empty.active > a, +.feed.item.error.active > a { color: #fff; } .aside_feed .tree-folder-items .dropdown-menu:after { diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index f10b66086..15fdb3a1a 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -615,25 +615,22 @@ a.btn { } /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items > .item.empty.active { +.feed.item.empty.active { background: #e67e22; } -.aside_feed .tree-folder-items > .item.error.active { +.feed.item.error.active { background: #bd362f; } -.aside_feed .tree-folder-items > .item.empty > a { +.feed.item.empty > a { color: #e67e22; } -.aside_feed .tree-folder-items > .item.error > a { +.feed.item.error > a { color: #bd362f; } -.aside_feed .tree-folder-items > .item.empty.active > a, -.aside_feed .tree-folder-items > .item.error.active > a { +.feed.item.empty.active > a, +.feed.item.error.active > a { color: #fff; } -.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { - font-weight: bold; -} .aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; } diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index c38cb617e..ae6ceb00f 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -649,15 +649,12 @@ a.btn { } /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items > .item.empty > a { +.feed.item.empty > a { color: #e67e22; } -.aside_feed .tree-folder-items > .item.error > a { +.feed.item.error > a { color: #BD362F; } -.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { - font-weight: bold; -} .aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; } @@ -997,7 +994,7 @@ opacity: 1; padding: 2px 10px; font-size: 0.8rem; } -.box.category .item.feed .item-title { +.box.category .item.feed:not(.empty):not(.error) .item-title { color: #222; } diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 029c2d254..0d53c50d1 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -443,19 +443,16 @@ a.btn { } /*=== Aside main page (feeds) */ -.aside_feed .tree-folder-items > .item.empty.active { +.feed.item.empty.active { } -.aside_feed .tree-folder-items > .item.error.active { +.feed.item.error.active { } -.aside_feed .tree-folder-items > .item.empty > a { +.feed.item.empty > a { } -.aside_feed .tree-folder-items > .item.error > a { +.feed.item.error > a { } -.aside_feed .tree-folder-items > .item.empty.active > a, -.aside_feed .tree-folder-items > .item.error.active > a { -} -.aside_feed .tree-folder-items > .item:not([data-unread="0"]) { - font-weight: bold; +.feed.item.empty.active > a, +.feed.item.error.active > a { } .aside_feed .tree-folder-items .dropdown-menu:after { left: 2px; -- cgit v1.2.3 From cdad09ae2c363ee74ef7feba58e00e3500a35317 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 24 Oct 2014 14:53:38 +0200 Subject: Fix feed colors on subscription page (all themes) --- p/themes/Dark/dark.css | 4 ++++ p/themes/Flat/flat.css | 4 ++++ p/themes/Origine/origine.css | 4 ++++ p/themes/Pafat/pafat.css | 4 ++++ p/themes/Screwdriver/screwdriver.css | 2 ++ p/themes/base-theme/base.css | 4 ++++ p/themes/base-theme/template.css | 1 + 7 files changed, 23 insertions(+) (limited to 'p/themes/base-theme') diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 1f26224e4..e551aa9c0 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -571,15 +571,19 @@ a.btn { .feed.item.error.active { background: #a44; } +.feed.item.empty, .feed.item.empty > a { color: #c95; } +.feed.item.error, .feed.item.error > a { color: #a44; } +.feed.item.empty.active, .feed.item.empty.active > a { color: #111; } +.feed.item.error.active, .feed.item.error.active > a { color: #fff; } diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index 46c874311..eb7737c5d 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -576,12 +576,16 @@ a.btn { .feed.item.error.active { background: #bd362f; } +.feed.item.empty, .feed.item.empty > a { color: #e67e22; } +.feed.item.error, .feed.item.error > a { color: #bd362f; } +.feed.item.empty.active, +.feed.item.error.active, .feed.item.empty.active > a, .feed.item.error.active > a { color: #fff; diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 1b54e9bfe..464422a0b 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -611,12 +611,16 @@ a.btn { .feed.item.error.active { background: #bd362f; } +.feed.item.empty, .feed.item.empty > a { color: #e67e22; } +.feed.item.error, .feed.item.error > a { color: #bd362f; } +.feed.item.empty.active, +.feed.item.error.active, .feed.item.empty.active > a, .feed.item.error.active > a { color: #fff; diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 15fdb3a1a..49cb3bc17 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -621,12 +621,16 @@ a.btn { .feed.item.error.active { background: #bd362f; } +.feed.item.empty, .feed.item.empty > a { color: #e67e22; } +.feed.item.error, .feed.item.error > a { color: #bd362f; } +.feed.item.empty.active, +.feed.item.error.active, .feed.item.empty.active > a, .feed.item.error.active > a { color: #fff; diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index ae6ceb00f..4f55d752e 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -649,9 +649,11 @@ a.btn { } /*=== Aside main page (feeds) */ +.feed.item.empty, .feed.item.empty > a { color: #e67e22; } +.feed.item.error, .feed.item.error > a { color: #BD362F; } diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 0d53c50d1..871a632d8 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -447,10 +447,14 @@ a.btn { } .feed.item.error.active { } +.feed.item.empty, .feed.item.empty > a { } +.feed.item.error, .feed.item.error > a { } +.feed.item.empty.active, +.feed.item.error.active, .feed.item.empty.active > a, .feed.item.error.active > a { } diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index fd95cb697..a79d539d8 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -179,6 +179,7 @@ a.btn { .dropdown { position: relative; display: inline-block; + vertical-align: middle; } .dropdown-target { display: none; -- cgit v1.2.3 From 659515862566744fc90511bc4182fc32ccf2e6b3 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 26 Oct 2014 14:13:05 +0100 Subject: Fix themes (aside_feed) --- p/themes/Dark/dark.css | 3 +-- p/themes/Flat/flat.css | 3 +-- p/themes/Origine/origine.css | 4 +--- p/themes/Pafat/pafat.css | 1 - p/themes/Screwdriver/screwdriver.css | 1 - p/themes/base-theme/base.css | 1 - p/themes/base-theme/template.css | 14 ++++++++++++-- 7 files changed, 15 insertions(+), 12 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index e551aa9c0..03bf3c985 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -474,7 +474,6 @@ a.btn { line-height: 2.5rem; font-size: 1rem; background: #1c1c1c; - font-weight: bold; } .tree-folder-title .title { background: inherit; @@ -485,6 +484,7 @@ a.btn { } .tree-folder.active .tree-folder-title { background: #2c2c2c; + font-weight: bold; } .tree-folder-items { border-top: 1px solid #222; @@ -594,7 +594,6 @@ a.btn { .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { border-radius: 3px; - vertical-align: middle; background-color: #111; } diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index eb7737c5d..313bee0ee 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -483,7 +483,6 @@ a.btn { background: #34495e; line-height: 2.5rem; font-size: 1rem; - font-weight: bold; } .tree-folder-title .title { background: inherit; @@ -494,6 +493,7 @@ a.btn { } .tree-folder.active .tree-folder-title { background: #2980b9; + font-weight: bold; } .tree-folder-items { background: #2c3e50; @@ -597,7 +597,6 @@ a.btn { .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { border-radius: 3px; - vertical-align: middle; } /*=== Configuration pages */ diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index 464422a0b..afd6ec04f 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -508,7 +508,6 @@ a.btn { background: #fff; line-height: 2.5rem; font-size: 1rem; - font-weight: bold; } .tree-folder-title .title { background: inherit; @@ -519,6 +518,7 @@ a.btn { } .tree-folder.active .tree-folder-title { background: #f0f0f0; + font-weight: bold; } .tree-folder.active .tree-folder-title .title { color: #0062BE; @@ -629,11 +629,9 @@ a.btn { left: 2px; } .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon, -.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { background-color: #fff; border-radius: 3px; - vertical-align: middle; } /*=== Configuration pages */ diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 49cb3bc17..8b1e7866c 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -642,7 +642,6 @@ a.btn { .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { border-radius: 3px; - vertical-align: middle; background-color: #fff; } diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 4f55d752e..b6c2e670e 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -664,7 +664,6 @@ a.btn { .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { border-radius: 3px; - vertical-align: middle; } /*=== Configuration pages */ diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index 871a632d8..ac30dbfea 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -465,7 +465,6 @@ a.btn { .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon, .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon { border-radius: 3px; - vertical-align: middle; } /*=== Configuration pages */ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index a79d539d8..ffb104af2 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -401,14 +401,23 @@ a.btn { .aside { display: table-cell; height: 100%; - width: 250px; + width: 300px; vertical-align: top; } -/*=== Aside main page (feeds) */ +/*=== Aside main page */ +.aside_feed .tree-folder-title .icon { + padding: 5px; +} +.aside_feed .tree-folder-items .item.feed { + padding: 0px 15px; +} .aside_feed .tree-folder-items:not(.active) { display: none; } +.aside_feed .tree-folder-items .dropdown { + vertical-align: top; +} .aside_feed .tree-folder-items .dropdown-menu { left: 0; } @@ -472,6 +481,7 @@ a.btn { .flux .item.date { width: 145px; text-align: right; + overflow: hidden; } .flux .item > a { display: block; -- cgit v1.2.3 From 01ef0ef2b8b5f8eda53b2dff19f460dd9d1b8276 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 26 Oct 2014 18:58:43 +0100 Subject: Fix nav_entries menu width See https://github.com/marienfressinaud/FreshRSS/issues/678 --- p/themes/base-theme/template.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index ffb104af2..6640284f9 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -569,7 +569,7 @@ br + br + br { position: fixed; bottom: 0; left: 0; display: table; - width: 250px; + width: 300px; background: #fff; table-layout: fixed; } -- cgit v1.2.3 From 482f995d61f4b172f7b79becc25d0d7157098daf Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 26 Oct 2014 21:21:07 +0100 Subject: All the category area is clickable See https://github.com/marienfressinaud/FreshRSS/issues/646 --- p/themes/base-theme/template.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 6640284f9..79fe506f2 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -348,6 +348,8 @@ a.btn { text-overflow: ellipsis; } .tree-folder-title .title { + display: inline-block; + width: 100%; vertical-align: middle; } .tree-folder-items > .item { @@ -406,6 +408,10 @@ a.btn { } /*=== Aside main page */ +.aside_feed .category .title { + width: calc(100% - 35px); +} + .aside_feed .tree-folder-title .icon { padding: 5px; } -- cgit v1.2.3 From 724e13f0a6419b046b33da71e66058e279551edd Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 31 Oct 2014 16:43:05 +0100 Subject: Fix global view mark as read --- app/views/index/global.phtml | 5 +++-- p/scripts/global_view.js | 12 ++++++------ p/themes/base-theme/template.css | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index 0975a5a00..ae7f5ffbc 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -47,7 +47,8 @@ ?>
          -
          -
          display_posts ? '' : ' class="hide_posts"'; ?>> +
          +
          display_posts ? '' : ' class="hide_posts"'; ?>> +
          diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js index 14909f44e..7d7ba22b5 100644 --- a/p/scripts/global_view.js +++ b/p/scripts/global_view.js @@ -24,12 +24,13 @@ function load_panel(link) { // en en ouvrant une autre ensuite, on se retrouve au même point de scroll $("#panel").scrollTop(0); - $('#panel').on('click', '#nav_menu_read_all > a, #nav_menu_read_all .item > a, #bigMarkAsRead', function () { + $('#panel').on('click', '#nav_menu_read_all button, #bigMarkAsRead', function () { + console.log($(this).attr("formaction")); $.ajax({ - url: $(this).attr("href"), + type: "POST", + url: $(this).attr("formaction"), async: false }); - //$("#panel .close").first().click(); window.location.reload(false); return false; }); @@ -39,9 +40,8 @@ function load_panel(link) { } function init_close_panel() { - $("#panel .close").click(function () { - $("#panel").html('' + icons['close'] + ''); - init_close_panel(); + $("#overlay .close").click(function () { + $("#panel").html(''); $("#panel").slideToggle(); $("#overlay").fadeOut(); diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 79fe506f2..5ba621415 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -645,13 +645,13 @@ br + br + br { overflow: auto; background: #fff; } -#panel .close { +#overlay .close { position: fixed; top: 0; bottom: 0; left: 0; right: 0; display: block; } -#panel .close img { +#overlay .close img { display: none; } @@ -762,7 +762,7 @@ br + br + br { } #panel { - top: 0; bottom: 0; + top: 25px; bottom: 30px; left: 0; right: 0; } #panel .close { -- cgit v1.2.3 From afe51884d9258e26a3aecfe422e69ede9f86fa7e Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 1 Nov 2014 09:58:06 -0400 Subject: Add CSS numbering on user query list --- p/themes/base-theme/template.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 5ba621415..f696ac237 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -499,7 +499,8 @@ a.btn { text-overflow: ellipsis; overflow: hidden; } -.flux .item.share > a { +.flux .item.share > a, +.item.query > a { display: list-item; list-style-position: inside; list-style-type: decimal; -- cgit v1.2.3 From ec55aa94bfb30cdb0cd701785189215dfaf2094a Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 15 Nov 2014 18:02:22 -0500 Subject: Theme selection redesign I made a CSS3 gallery to select the theme. Now you can see the theme before applying it. Comments are welcome. See #571 --- app/views/configure/display.phtml | 34 ++++++++---- p/themes/Dark/thumbs/original.png | Bin 0 -> 123928 bytes p/themes/Flat/thumbs/original.png | Bin 0 -> 133420 bytes p/themes/Origine/thumbs/original.png | Bin 0 -> 135886 bytes p/themes/Pafat/thumbs/original.png | Bin 0 -> 129220 bytes p/themes/Screwdriver/thumbs/original.png | Bin 0 -> 133107 bytes p/themes/base-theme/template.css | 92 +++++++++++++++++++++++++++++++ 7 files changed, 115 insertions(+), 11 deletions(-) create mode 100644 p/themes/Dark/thumbs/original.png create mode 100644 p/themes/Flat/thumbs/original.png create mode 100644 p/themes/Origine/thumbs/original.png create mode 100644 p/themes/Pafat/thumbs/original.png create mode 100644 p/themes/Screwdriver/thumbs/original.png (limited to 'p/themes/base-theme') diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 69205fa93..39582249e 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -21,17 +21,29 @@
          - +
            + themes); $i = 1; ?> + themes as $theme) { ?> + theme === $theme['id']) {echo "checked";}?> value=""/> +
          • +
            + +
            +
            + + + + + + +
            +
            + +
            +
            • + + +
          diff --git a/p/themes/Dark/thumbs/original.png b/p/themes/Dark/thumbs/original.png new file mode 100644 index 000000000..fd574319f Binary files /dev/null and b/p/themes/Dark/thumbs/original.png differ diff --git a/p/themes/Flat/thumbs/original.png b/p/themes/Flat/thumbs/original.png new file mode 100644 index 000000000..b9cafa9c8 Binary files /dev/null and b/p/themes/Flat/thumbs/original.png differ diff --git a/p/themes/Origine/thumbs/original.png b/p/themes/Origine/thumbs/original.png new file mode 100644 index 000000000..d26d4fbed Binary files /dev/null and b/p/themes/Origine/thumbs/original.png differ diff --git a/p/themes/Pafat/thumbs/original.png b/p/themes/Pafat/thumbs/original.png new file mode 100644 index 000000000..fe05f7260 Binary files /dev/null and b/p/themes/Pafat/thumbs/original.png differ diff --git a/p/themes/Screwdriver/thumbs/original.png b/p/themes/Screwdriver/thumbs/original.png new file mode 100644 index 000000000..ba9bacf90 Binary files /dev/null and b/p/themes/Screwdriver/thumbs/original.png differ diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index f696ac237..aab511fb9 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -683,6 +683,98 @@ br + br + br { left: 0; } +/*=== SLIDESHOW */ +/*==============*/ +.slides { + padding: 0; + height: 320px; + display: block; + position: relative; + min-width: 260px; + max-width: 640px; +} +.slides * { + user-select: none; + -ms-user-select: none; + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + -webkit-touch-callout: none; +} +.slides input { + display: none; +} +.slide-container { + display: block; +} +.slide { + top: 0; + opacity: 0; + width: 100%; + height: 100%; + display: block; + position: absolute; + transform: scale(0); + transition: all .7s ease-in-out; +} +.slide img { + width: 100%; + height: 100%; +} +.nav label { + width: 10%; + height: 100%; + display: none; + position: absolute; + opacity: 0; + z-index: 9; + cursor: pointer; + transition: opacity .2s; + color: #FFF; + font-size: 1000%; + text-align: center; + line-height: 225%; + font-family: "Varela Round", sans-serif; + background-color: rgba(255, 255, 255, .3); + text-shadow: 0px 0px 15px rgb(119, 119, 119); + padding: 0; +} +.properties { + bottom: 15px; + display: none; + left: 15%; + padding: 5px; + position: absolute; + text-align: center; + width: 70%; + font-size: 15pt; + text-shadow: 0px 0px 15px rgb(119, 119, 119); + border-radius: 5px; + box-shadow: 5px 5px 10px; + border: 1px solid; + background-color: #fff; +} +.slide:hover + .nav label { + opacity: 0.5; +} +.slide:hover ~ .properties { + display: block; +} +.nav label:hover { + opacity: 1; +} +.nav .next { + right: 0; +} +input:checked + .slide-container .slide { + opacity: 1; + transform: scale(1); + transition: opacity 1s ease-in-out; +} +input:checked + .slide-container .nav label { + display: block; +} + /*=== DIVERS */ /*===========*/ .category .title:not([data-unread="0"]):after { -- cgit v1.2.3 From 91388c5b7602af44894e8283c18ca76b5b06ed43 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sun, 16 Nov 2014 08:55:19 -0500 Subject: Theme properties are more visible --- app/views/configure/display.phtml | 4 +++- p/themes/base-theme/template.css | 25 +++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) (limited to 'p/themes/base-theme') diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 39582249e..1c925a5ca 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -38,7 +38,9 @@
          - +
          +
          +
          • diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index aab511fb9..80f76e80b 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -692,6 +692,7 @@ br + br + br { position: relative; min-width: 260px; max-width: 640px; + margin-bottom: 30px; } .slides * { user-select: none; @@ -740,26 +741,19 @@ br + br + br { padding: 0; } .properties { - bottom: 15px; + bottom: -35px; + position: absolute; + width: 100%; display: none; - left: 15%; - padding: 5px; +} +.properties .page-number { + right: 0; + top: 0; position: absolute; - text-align: center; - width: 70%; - font-size: 15pt; - text-shadow: 0px 0px 15px rgb(119, 119, 119); - border-radius: 5px; - box-shadow: 5px 5px 10px; - border: 1px solid; - background-color: #fff; } .slide:hover + .nav label { opacity: 0.5; } -.slide:hover ~ .properties { - display: block; -} .nav label:hover { opacity: 1; } @@ -774,6 +768,9 @@ input:checked + .slide-container .slide { input:checked + .slide-container .nav label { display: block; } +input:checked + .slide-container .properties { + display: block; +} /*=== DIVERS */ /*===========*/ -- cgit v1.2.3 From c1c0011d04bdef525c85cfd67e34058080d5f5ce Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 12 Dec 2014 12:40:11 +0100 Subject: Quick fix for theme slider Bluelagoon description was overflowed by its screenshot --- p/themes/base-theme/template.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 80f76e80b..535a80a22 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -741,10 +741,15 @@ br + br + br { padding: 0; } .properties { - bottom: -35px; + display: none; + bottom: 0; position: absolute; width: 100%; - display: none; + padding: 5px; + background: rgba(255, 255, 255, 0.7); + color: #000; + border-top: 1px solid #aaa; + z-index: 10; } .properties .page-number { right: 0; -- cgit v1.2.3 From bf87db31d90ef18871045f1c815443e162e06e46 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 12 Dec 2014 12:43:34 +0100 Subject: Second fix for theme slider --- p/themes/base-theme/template.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 535a80a22..280b9b332 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -693,6 +693,7 @@ br + br + br { min-width: 260px; max-width: 640px; margin-bottom: 30px; + border: 1px solid #aaa; } .slides * { user-select: none; @@ -743,8 +744,8 @@ br + br + br { .properties { display: none; bottom: 0; + left: 0; right: 0; position: absolute; - width: 100%; padding: 5px; background: rgba(255, 255, 255, 0.7); color: #000; @@ -752,7 +753,7 @@ br + br + br { z-index: 10; } .properties .page-number { - right: 0; + right: 5px; top: 0; position: absolute; } -- cgit v1.2.3 From 6078888de631ea105410079888838503fd7acb3d Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Fri, 12 Dec 2014 14:27:50 +0100 Subject: Remove user-select: none in theme selector See https://github.com/FreshRSS/FreshRSS/issues/571 --- p/themes/base-theme/template.css | 8 -------- 1 file changed, 8 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 280b9b332..25f206106 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -695,14 +695,6 @@ br + br + br { margin-bottom: 30px; border: 1px solid #aaa; } -.slides * { - user-select: none; - -ms-user-select: none; - -moz-user-select: none; - -khtml-user-select: none; - -webkit-user-select: none; - -webkit-touch-callout: none; -} .slides input { display: none; } -- cgit v1.2.3 From f31b02be7882f8a7b180d64f3f77ba83cd9935f5 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 13 Jan 2015 14:10:31 +0100 Subject: Remove sticky feed aside. Work on an extension. See https://github.com/FreshRSS/FreshRSS/issues/697 --- p/themes/BlueLagoon/BlueLagoon.css | 5 ----- p/themes/Dark/dark.css | 5 ----- p/themes/Flat/flat.css | 5 ----- p/themes/Origine/origine.css | 5 ----- p/themes/Pafat/pafat.css | 5 ----- p/themes/Screwdriver/screwdriver.css | 5 ----- p/themes/base-theme/base.css | 5 ----- 7 files changed, 35 deletions(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css index ae1c24604..ffb80ddb2 100644 --- a/p/themes/BlueLagoon/BlueLagoon.css +++ b/p/themes/BlueLagoon/BlueLagoon.css @@ -622,8 +622,6 @@ a.btn { text-align: center; } .aside.aside_feed .tree { - position: sticky; - top: 0; margin: 10px 0 50px; } @@ -1140,9 +1138,6 @@ opacity: 1; .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css index 909444d43..dd7502f25 100644 --- a/p/themes/Dark/dark.css +++ b/p/themes/Dark/dark.css @@ -547,8 +547,6 @@ a.btn { text-align: center; } .aside.aside_feed .tree { - position: sticky; - top: 0; margin: 10px 0 50px; } @@ -982,9 +980,6 @@ a.btn { .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css index 313bee0ee..42b73bae2 100644 --- a/p/themes/Flat/flat.css +++ b/p/themes/Flat/flat.css @@ -553,8 +553,6 @@ a.btn { border-radius: 0 10px 0 0; } .aside.aside_feed .tree { - position: sticky; - top: 0; margin: 10px 0 50px; } @@ -979,9 +977,6 @@ a.btn { .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css index eb2ecd5e8..18df4468a 100644 --- a/p/themes/Origine/origine.css +++ b/p/themes/Origine/origine.css @@ -587,8 +587,6 @@ a.btn { background: #fff; } .aside.aside_feed .tree { - position: sticky; - top: 0; margin: 10px 0 50px; } @@ -1028,9 +1026,6 @@ a.btn { .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css index 8b1e7866c..61e5c8f63 100644 --- a/p/themes/Pafat/pafat.css +++ b/p/themes/Pafat/pafat.css @@ -586,8 +586,6 @@ a.btn { text-align: center; } .aside.aside_feed .tree { - position: sticky; - top: 5px; margin: 10px 0 50px; } @@ -1039,9 +1037,6 @@ a.btn { .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css index 8dbd2ec34..a43d1801c 100644 --- a/p/themes/Screwdriver/screwdriver.css +++ b/p/themes/Screwdriver/screwdriver.css @@ -617,8 +617,6 @@ a.btn { text-align: center; } .aside.aside_feed .tree { - position: sticky; - top: 0; margin: 10px 0 50px; } @@ -1139,9 +1137,6 @@ opacity: 1; .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index ac30dbfea..f874d554c 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -427,8 +427,6 @@ a.btn { text-align: center; } .aside.aside_feed .tree { - position: sticky; - top: 0; margin: 10px 0 50px; } @@ -777,9 +775,6 @@ a.btn { .aside.aside_feed { padding: 0; } - .aside.aside_feed .tree { - position: static; - } .nav_menu .btn { margin: 5px 10px; -- cgit v1.2.3 From 9e406394950b6df386918fa5f21ff110d726cd08 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 18 Jan 2015 12:33:55 +0100 Subject: Enlarge the .item.date to contain larger date I know it's not the best solution, a dynamic width would be the best but there are some CSS constraints. I don't want to spend my time on this problem ;) Fix https://github.com/FreshRSS/FreshRSS/issues/756 --- p/themes/base-theme/template.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'p/themes/base-theme') diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 25f206106..c6ea40f66 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -485,7 +485,7 @@ a.btn { text-decoration: none; } .flux .item.date { - width: 145px; + width: 155px; text-align: right; overflow: hidden; } -- cgit v1.2.3 From 01683ba1364abc9ea48bd2b637d9faad942b0721 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 27 Jan 2015 17:19:57 +0100 Subject: Remove information about me and update links FreshRSS should not be associated to me but to the community: - Remove links to send me email or references to a "lead developer" - Change old Github links marienfressinaud/FreshRSS to FreshRSS/FreshRSS --- README.fr.md | 15 ++++++--------- README.md | 15 ++++++--------- app/i18n/de/index.php | 3 +-- app/i18n/en/index.php | 3 +-- app/i18n/fr/index.php | 3 +-- app/views/index/about.phtml | 5 +---- p/themes/BlueLagoon/README.md | 2 +- p/themes/Screwdriver/README.md | 2 +- p/themes/base-theme/README.md | 2 +- 9 files changed, 19 insertions(+), 31 deletions(-) (limited to 'p/themes/base-theme') diff --git a/README.fr.md b/README.fr.md index 4e6c52d68..380d7bc1e 100644 --- a/README.fr.md +++ b/README.fr.md @@ -9,26 +9,23 @@ Il permet de gérer plusieurs utilisateurs, et dispose d’un mode de lecture an * Site officiel : http://freshrss.org * Démo : http://demo.freshrss.org/ -* Développeur : Marien Fressinaud -* Version actuelle : 0.10-dev -* Date de publication 2014-xx-xx -* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html) +* Licence : [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html) ![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png) # Note sur les branches **Ce logiciel est encore en développement !** Veuillez vous assurer d'utiliser la branche qui vous correspond : -* Utilisez [la branche master](https://github.com/marienfressinaud/FreshRSS/tree/master/) si vous visez la stabilité. -* [La branche beta](https://github.com/marienfressinaud/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois. -* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/marienfressinaud/FreshRSS/tree/dev) vous ouvre les bras ! +* Utilisez [la branche master](https://github.com/FreshRSS/FreshRSS/tree/master/) si vous visez la stabilité. +* [La branche beta](https://github.com/FreshRSS/FreshRSS/tree/beta) est celle par défaut : les nouveautés y sont ajoutées environ tous les mois. +* Pour les développeurs et ceux qui savent ce qu'ils font, [la branche dev](https://github.com/FreshRSS/FreshRSS/tree/dev) vous ouvre les bras ! # Disclaimer Cette application a été développée pour s’adapter à des besoins personnels et non professionnels. Je ne garantis en aucun cas la sécurité de celle-ci, ni son bon fonctionnement. Je m’engage néanmoins à répondre dans la mesure du possible aux demandes d’évolution si celles-ci me semblent justifiées. Privilégiez pour cela des demandes sur GitHub -(https://github.com/marienfressinaud/FreshRSS/issues) ou par mail (dev@marienfressinaud.fr) +(https://github.com/FreshRSS/FreshRSS/issues). # Pré-requis * Serveur modeste, par exemple sous Linux ou Windows @@ -44,7 +41,7 @@ Privilégiez pour cela des demandes sur GitHub ![Capture d’écran de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png) # Installation -1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip) +1. Récupérez l’application FreshRSS via la commande git ou [en téléchargeant l’archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip) 2. Placez l’application sur votre serveur (la partie à exposer au Web est le répertoire `./p/`) 3. Le serveur Web doit avoir les droits d’écriture dans le répertoire `./data/` 4. Accédez à FreshRSS à travers votre navigateur Web et suivez les instructions d’installation diff --git a/README.md b/README.md index 430dd82bc..a09a64639 100644 --- a/README.md +++ b/README.md @@ -9,26 +9,23 @@ It is a multi-user application with an anonymous reading mode. * Official website: http://freshrss.org * Demo: http://demo.freshrss.org/ -* Developer: Marien Fressinaud -* Current version: 0.10-dev -* Publication date: 2014-xx-xx -* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html) +* License: [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html) ![FreshRSS logo](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png) # Note on branches **This application is still in development!** Please use the branch that suits your needs: -* Use [the master branch](https://github.com/marienfressinaud/FreshRSS/tree/master/) if you need a stable version. -* [The beta branch](https://github.com/marienfressinaud/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis. -* For developers and tech savvy persons, [the dev branch](https://github.com/marienfressinaud/FreshRSS/tree/dev) is waiting for you! +* Use [the master branch](https://github.com/FreshRSS/FreshRSS/tree/master/) if you need a stable version. +* [The beta branch](https://github.com/FreshRSS/FreshRSS/tree/beta) is the default branch: new features are added on a monthly basis. +* For developers and tech savvy persons, [the dev branch](https://github.com/FreshRSS/FreshRSS/tree/dev) is waiting for you! # Disclaimer This application was developed to fulfill personal needs not professional needs. There is no guarantee neither on its security nor its proper functioning. If there is feature requests which I think are good for the project, I'll do my best to include them. The best way is to open issues on GitHub -(https://github.com/marienfressinaud/FreshRSS/issues) or by email (dev@marienfressinaud.fr) +(https://github.com/FreshRSS/FreshRSS/issues). # Requirements * Light server running Linux or Windows @@ -44,7 +41,7 @@ The best way is to open issues on GitHub ![FreshRSS screenshot](http://marienfressinaud.fr/data/images/freshrss/freshrss_default-design.png) # Installation -1. Get FreshRSS with git or [by downloading the archive](https://github.com/marienfressinaud/FreshRSS/archive/master.zip) +1. Get FreshRSS with git or [by downloading the archive](https://github.com/FreshRSS/FreshRSS/archive/master.zip) 2. Dump the application on your server (expose only the `./p/` folder) 3. Add write access on `./data/` folder to the webserver user 4. Access FreshRSS with your browser and follow the installation process diff --git a/app/i18n/de/index.php b/app/i18n/de/index.php index 8538bf3de..3449de87d 100644 --- a/app/i18n/de/index.php +++ b/app/i18n/de/index.php @@ -8,8 +8,7 @@ return array( 'credits' => 'Credits', 'credits_content' => 'Einige Designelemente stammen von Bootstrap, obwohl FreshRSS dieses Framework nicht nutzt. Icons stammen vom GNOME project. Open Sans Font wurde von Steve Matteson erstellt. Favicons werden mit getFavicon API gesammelt. FreshRSS basiert auf Minz, einem PHP-Framework.', 'freshrss_description' => 'FreshRSS ist ein RSS-Feedsaggregator zum selbst hosten wie zum Beispiel Kriss Feed oder Leed. Er ist leicht und einfach zu handhaben und gleichzeitig ein leistungsstarkes und konfigurierbares Werkzeug.', - 'github_or_email' => 'on Github or by mail', - 'lead_developer' => 'Hauptentwickler', + 'github' => 'on Github', 'license' => 'Lizenz', 'project_website' => 'Projekt-Webseite', 'title' => 'Über', diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php index 8e7d81db8..80fa3d950 100644 --- a/app/i18n/en/index.php +++ b/app/i18n/en/index.php @@ -8,8 +8,7 @@ return array( 'credits' => 'Credits', 'credits_content' => 'Some design elements come from Bootstrap although FreshRSS doesn’t use this framework. Icons come from GNOME project. Open Sans font police has been created by Steve Matteson. Favicons are collected with getFavicon API. FreshRSS is based on Minz, a PHP framework.', 'freshrss_description' => 'FreshRSS is a RSS feeds aggregator to self-host like Kriss Feed or Leed. It is light and easy to take in hand while being powerful and configurable tool.', - 'github_or_email' => 'on Github or by mail', - 'lead_developer' => 'Lead developer', + 'github' => 'on Github', 'license' => 'License', 'project_website' => 'Project website', 'title' => 'About', diff --git a/app/i18n/fr/index.php b/app/i18n/fr/index.php index f9975c593..7e028ab92 100644 --- a/app/i18n/fr/index.php +++ b/app/i18n/fr/index.php @@ -8,8 +8,7 @@ return array( 'credits' => 'Crédits', 'credits_content' => 'Des éléments de design sont issus du projet Bootstrap bien que FreshRSS n’utilise pas ce framework. Les icônes sont issues du projet GNOME. La police Open Sans utilisée a été créée par Steve Matteson. Les favicons sont récupérés grâce au site getFavicon. FreshRSS repose sur Minz, un framework PHP.', 'freshrss_description' => 'FreshRSS est un agrégateur de flux RSS à auto-héberger à l’image de Kriss Feed ou Leed. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable.', - 'github_or_email' => 'sur Github ou par courriel', - 'lead_developer' => 'Développeur principal', + 'github' => 'sur Github', 'license' => 'Licence', 'project_website' => 'Site du projet', 'title' => 'À propos', diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml index ff2c538a2..3fdb5160d 100644 --- a/app/views/index/about.phtml +++ b/app/views/index/about.phtml @@ -7,11 +7,8 @@
          -
          -
          Marien Fressinaud —
          -
          -
          +
          diff --git a/p/themes/BlueLagoon/README.md b/p/themes/BlueLagoon/README.md index 62afc234b..a83dd6743 100644 --- a/p/themes/BlueLagoon/README.md +++ b/p/themes/BlueLagoon/README.md @@ -1,7 +1,7 @@ Blue Lagoon ======= -**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/marienfressinaud/FreshRSS/)** +**C'est un cocktail (bis)! C'est la version plus "fresh" de [Screwdriver](https://github.com/misterair/Screwdriver). C'est... c'est... un thème pour l'agrégateur de flux RSS [FreshRSS](https://github.com/FreshRSS/FreshRSS/)** En toute modestie, ce thème tue du Nyan Cat. diff --git a/p/themes/Screwdriver/README.md b/p/themes/Screwdriver/README.md index 4b10eb90f..385e1dc71 100644 --- a/p/themes/Screwdriver/README.md +++ b/p/themes/Screwdriver/README.md @@ -1,7 +1,7 @@ Screwdriver ======= -**C'est un cocktail! C'est chaud mais "fresh" à la fois. C'est... c'est... un thème pour l'agrégateur de flux RSSFreshRSS!!** +**C'est un cocktail! C'est chaud mais "fresh" à la fois. C'est... c'est... un thème pour l'agrégateur de flux RSSFreshRSS!!** En toute modestie, ce thème tue du chaton. ![screenshot](https://github.com/misterair/Screwdriver/blob/master/screenshot.png) diff --git a/p/themes/base-theme/README.md b/p/themes/base-theme/README.md index 6f186e15c..9f7d635ca 100644 --- a/p/themes/base-theme/README.md +++ b/p/themes/base-theme/README.md @@ -8,5 +8,5 @@ A base theme for [FreshRSS](http://freshrss.org) 3. Choose your new theme in FreshRSS configuration 4. Enjoy your wonderful theme! -Don't hesitate to share your theme with us [on Github](https://github.com/marienfressinaud/FreshRSS/issues) :) +Don't hesitate to share your theme with us [on Github](https://github.com/FreshRSS/FreshRSS/issues) :) -- cgit v1.2.3 From b355a45c35b366fe2ad56b461dd28b11956ef6d9 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 29 Jan 2015 09:52:43 +0100 Subject: Change behaviour of #add_rss input.extend UI was frustrating when input had the focus: we needed to click elsewhere to be able to open the next dropdown. See https://github.com/FreshRSS/FreshRSS/issues/777 --- app/views/subscription/index.phtml | 2 +- p/themes/base-theme/template.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'p/themes/base-theme') diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index b9e40988c..331e8244e 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -7,7 +7,7 @@
          - +
          diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index c6ea40f66..a299a5ddf 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -75,6 +75,7 @@ input { } textarea, input[type="file"], +input.long, input.extend:focus { width: 300px; } -- cgit v1.2.3