From e61ee56031aa0788f9a40ec245d3c391d219d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:16:41 +0100 Subject: Added QRCode and link to configure android application --- app/Resources/static/themes/_global/js/tools.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index ab30deb1..00f5d501 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,7 @@ const $ = require('jquery'); +var jrQrcode = require('jr-qrcode'); + function supportsLocalStorage() { try { return 'localStorage' in window && window.localStorage !== null; -- cgit v1.2.3 From 3b81212674bb4b2cf51ce51637e0093c952cefde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:48:34 +0100 Subject: Added translations and baggy part --- app/Resources/static/themes/_global/js/tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 00f5d501..9b23e4b5 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -var jrQrcode = require('jr-qrcode'); +import jrQrcode from 'jr-qrcode'; function supportsLocalStorage() { try { -- cgit v1.2.3 From 32508ef07aeb43966694ae360eeaeff8325e2a4d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 14:23:09 +0100 Subject: avoid eslint warning by disabling line Signed-off-by: Thomas Citharel --- app/Resources/static/themes/_global/js/tools.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 9b23e4b5..55de090c 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,6 +1,7 @@ const $ = require('jquery'); -import jrQrcode from 'jr-qrcode'; +/* Allows inline call qr-code call */ +import jrQrcode from 'jr-qrcode'; // eslint-disable-line function supportsLocalStorage() { try { -- cgit v1.2.3 From 8a9604aafe8b8c6ddde4e1be78189af5238588fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 9 Nov 2016 15:44:28 +0100 Subject: Added unmark.it sharing Fix #668 --- .../themes/_global/img/icons/unmark-icon--black.png | Bin 0 -> 926 bytes app/Resources/static/themes/baggy/css/main.css | 5 +++++ app/Resources/static/themes/material/css/main.css | 5 +++++ 3 files changed, 10 insertions(+) create mode 100644 app/Resources/static/themes/_global/img/icons/unmark-icon--black.png (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png new file mode 100644 index 00000000..45f679ee Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png differ diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 44db2070..6cf49de1 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -936,6 +936,11 @@ a.add-to-wallabag-link-after::after { background-image: url("../../_global/img/icons/diaspora-icon--black.png"); } +/* Unmark.it */ +.icon-image--unmark { + background-image: url("../../_global/img/icons/unmark-icon--black.png"); +} + /* shaarli */ .icon-image--shaarli { background-image: url("../../_global/img/icons/shaarli.png"); diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 2cc2e8a0..b165d45e 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -124,6 +124,11 @@ background-image: url("../../_global/img/icons/diaspora-icon--black.png"); } +/* Unmark.it */ +.icon-image--unmark { + background-image: url("../../_global/img/icons/unmark-icon--black.png"); +} + /* Shaarli */ .icon-image--shaarli { background-image: url("../../_global/img/icons/shaarli.png"); -- cgit v1.2.3 From 3cc78f06799b0c91957767e8d9255e67b30edd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 24 Oct 2016 11:20:11 +0200 Subject: Added shortcuts --- app/Resources/static/themes/_global/js/tools.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 55de090c..9a98f0a6 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,4 +1,5 @@ const $ = require('jquery'); +require('mousetrap'); /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -51,3 +52,14 @@ function initExport() { } export { savePercent, retrievePercent, initFilters, initExport }; + +/** Shortcuts **/ + +/* Go to */ +Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); +Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); + +/* Actions */ +Mousetrap.bind('g a', function() { + $("#nav-btn-add").trigger("click"); +}); -- cgit v1.2.3 From f9cded7dd2acab3af8ff8481941e0c199daf8270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 24 Oct 2016 20:37:49 +0200 Subject: Added new shortcuts --- app/Resources/static/themes/_global/js/tools.js | 37 ++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 9a98f0a6..d6a2d803 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -58,8 +58,43 @@ export { savePercent, retrievePercent, initFilters, initExport }; /* Go to */ Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); +Mousetrap.bind('g r', function() { window.location.href = Routing.generate('archive') }); +Mousetrap.bind('g a', function() { window.location.href = Routing.generate('all') }); +Mousetrap.bind('g t', function() { window.location.href = Routing.generate('tag') }); +Mousetrap.bind('g c', function() { window.location.href = Routing.generate('config') }); +Mousetrap.bind('g i', function() { window.location.href = Routing.generate('import') }); +Mousetrap.bind('g d', function() { window.location.href = Routing.generate('developer') }); +Mousetrap.bind('g h', function() { window.location.href = Routing.generate('howto') }); +Mousetrap.bind('g l', function() { window.location.href = Routing.generate('logout') }); + /* Actions */ -Mousetrap.bind('g a', function() { +Mousetrap.bind('g n', function() { $("#nav-btn-add").trigger("click"); }); + +Mousetrap.bind('esc', function() { + $(".close").trigger("click"); +}); + +// Display the first element of the current view +Mousetrap.bind('right', function() { + $("ul.data li:first-child span.dot-ellipsis a")[0].click(); +}); + +/* Article view */ +Mousetrap.bind('o', function() { + $("ul.side-nav li:nth-child(2) a i")[0].click(); +}); + +Mousetrap.bind('s', function() { + $("ul.side-nav li:nth-child(5) a i")[0].click(); +}); + +Mousetrap.bind('a', function() { + $("ul.side-nav li:nth-child(4) a i")[0].click(); +}); + +Mousetrap.bind('del', function() { + $("ul.side-nav li:nth-child(6) a i")[0].click(); +}); -- cgit v1.2.3 From af61cb80eb600618df95a01a15a08e87fc878c2a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 27 Oct 2016 01:57:27 +0200 Subject: es6 imports Signed-off-by: Thomas Citharel --- .../static/themes/_global/js/bookmarklet.js | 1 - app/Resources/static/themes/_global/js/tools.js | 52 +++++++++++----------- .../static/themes/baggy/js/autoCompleteTags.js | 2 +- app/Resources/static/themes/baggy/js/init.js | 18 +++++--- app/Resources/static/themes/baggy/js/uiTools.js | 4 +- app/Resources/static/themes/material/js/init.js | 6 +-- 6 files changed, 44 insertions(+), 39 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js index 5174ff47..a497628b 100644 --- a/app/Resources/static/themes/_global/js/bookmarklet.js +++ b/app/Resources/static/themes/_global/js/bookmarklet.js @@ -1,4 +1,3 @@ - top['bookmarklet-url@wallabag.org'] = 'bag it!' + '' + diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index d6a2d803..96d9fcf6 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,5 @@ -const $ = require('jquery'); -require('mousetrap'); +import $ from 'jquery'; +import Mousetrap from 'mousetrap'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -56,45 +56,45 @@ export { savePercent, retrievePercent, initFilters, initExport }; /** Shortcuts **/ /* Go to */ -Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); -Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); -Mousetrap.bind('g r', function() { window.location.href = Routing.generate('archive') }); -Mousetrap.bind('g a', function() { window.location.href = Routing.generate('all') }); -Mousetrap.bind('g t', function() { window.location.href = Routing.generate('tag') }); -Mousetrap.bind('g c', function() { window.location.href = Routing.generate('config') }); -Mousetrap.bind('g i', function() { window.location.href = Routing.generate('import') }); -Mousetrap.bind('g d', function() { window.location.href = Routing.generate('developer') }); -Mousetrap.bind('g h', function() { window.location.href = Routing.generate('howto') }); -Mousetrap.bind('g l', function() { window.location.href = Routing.generate('logout') }); +Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); +Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); +Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); +Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); +Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); +Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); +Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); +Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); +Mousetrap.bind('g h', () => { window.location.href = Routing.generate('howto'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); /* Actions */ -Mousetrap.bind('g n', function() { - $("#nav-btn-add").trigger("click"); +Mousetrap.bind('g n', () => { + $('#nav-btn-add').trigger('click'); }); -Mousetrap.bind('esc', function() { - $(".close").trigger("click"); +Mousetrap.bind('esc', () => { + $('.close').trigger('click'); }); // Display the first element of the current view -Mousetrap.bind('right', function() { - $("ul.data li:first-child span.dot-ellipsis a")[0].click(); +Mousetrap.bind('right', () => { + $('ul.data li:first-child span.dot-ellipsis a')[0].click(); }); /* Article view */ -Mousetrap.bind('o', function() { - $("ul.side-nav li:nth-child(2) a i")[0].click(); +Mousetrap.bind('o', () => { + $('ul.side-nav li:nth-child(2) a i')[0].click(); }); -Mousetrap.bind('s', function() { - $("ul.side-nav li:nth-child(5) a i")[0].click(); +Mousetrap.bind('s', () => { + $('ul.side-nav li:nth-child(5) a i')[0].click(); }); -Mousetrap.bind('a', function() { - $("ul.side-nav li:nth-child(4) a i")[0].click(); +Mousetrap.bind('a', () => { + $('ul.side-nav li:nth-child(4) a i')[0].click(); }); -Mousetrap.bind('del', function() { - $("ul.side-nav li:nth-child(6) a i")[0].click(); +Mousetrap.bind('del', () => { + $('ul.side-nav li:nth-child(6) a i')[0].click(); }); diff --git a/app/Resources/static/themes/baggy/js/autoCompleteTags.js b/app/Resources/static/themes/baggy/js/autoCompleteTags.js index f287ebfa..64fdaa92 100755 --- a/app/Resources/static/themes/baggy/js/autoCompleteTags.js +++ b/app/Resources/static/themes/baggy/js/autoCompleteTags.js @@ -5,4 +5,4 @@ function extractLast(term) { return split(term).pop(); } -export { split, extractLast }; +export default { split, extractLast }; diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index dc11043a..b7347f7c 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js @@ -1,11 +1,17 @@ -import { savePercent, retrievePercent } from '../../_global/js/tools'; -import { toggleSaveLinkForm } from './uiTools'; +import $ from 'jquery'; + +/* eslint-disable no-unused-vars */ +/* jquery has default scope */ +import cookie from 'jquery.cookie'; +import ui from 'jquery-ui-browserify'; +/* eslint-enable no-unused-vars */ -const $ = global.jquery = require('jquery'); -require('jquery.cookie'); -require('jquery-ui-browserify'); -const annotator = require('annotator'); +import annotator from 'annotator'; + +import { savePercent, retrievePercent } from '../../_global/js/tools'; +import toggleSaveLinkForm from './uiTools'; +global.jquery = $; $.fn.ready(() => { const $listmode = $('#listmode'); diff --git a/app/Resources/static/themes/baggy/js/uiTools.js b/app/Resources/static/themes/baggy/js/uiTools.js index 900b2707..713c53f7 100644 --- a/app/Resources/static/themes/baggy/js/uiTools.js +++ b/app/Resources/static/themes/baggy/js/uiTools.js @@ -1,4 +1,4 @@ -const $ = require('jquery'); +import $ from 'jquery'; function toggleSaveLinkForm(url, event) { $('#add-link-result').empty(); @@ -32,4 +32,4 @@ function toggleSaveLinkForm(url, event) { plainUrl.focus(); } -export { toggleSaveLinkForm }; +export default toggleSaveLinkForm; diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js index a68269e0..d8edeed1 100755 --- a/app/Resources/static/themes/material/js/init.js +++ b/app/Resources/static/themes/material/js/init.js @@ -1,10 +1,10 @@ +import $ from 'jquery'; +import annotator from 'annotator'; import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools'; -const $ = require('jquery'); +require('materialize'); // eslint-disable-line global.jQuery = $; -require('materialize'); // eslint-disable-line -const annotator = require('annotator'); $(document).ready(() => { // sideNav -- cgit v1.2.3 From 16ef7607f43ebc3e0134360b7657af191e14fe12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 2 Nov 2016 16:44:20 +0100 Subject: Reorganized JS folders for shortcuts --- .../static/themes/_global/js/shortcuts/entry.js | 0 .../static/themes/_global/js/shortcuts/main.js | 13 ++++++ app/Resources/static/themes/_global/js/tools.js | 48 +--------------------- app/Resources/static/themes/baggy/js/init.js | 3 ++ .../static/themes/baggy/js/shortcuts/entry.js | 19 +++++++++ .../static/themes/baggy/js/shortcuts/main.js | 0 app/Resources/static/themes/material/js/init.js | 2 + .../static/themes/material/js/shortcuts/entry.js | 19 +++++++++ .../static/themes/material/js/shortcuts/main.js | 13 ++++++ 9 files changed, 71 insertions(+), 46 deletions(-) create mode 100644 app/Resources/static/themes/_global/js/shortcuts/entry.js create mode 100644 app/Resources/static/themes/_global/js/shortcuts/main.js create mode 100644 app/Resources/static/themes/baggy/js/shortcuts/entry.js create mode 100644 app/Resources/static/themes/baggy/js/shortcuts/main.js create mode 100644 app/Resources/static/themes/material/js/shortcuts/entry.js create mode 100644 app/Resources/static/themes/material/js/shortcuts/main.js (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/shortcuts/entry.js b/app/Resources/static/themes/_global/js/shortcuts/entry.js new file mode 100644 index 00000000..e69de29b diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js new file mode 100644 index 00000000..0bb962d0 --- /dev/null +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -0,0 +1,13 @@ +/** Shortcuts **/ + +/* Go to */ +Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); +Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); +Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); +Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); +Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); +Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); +Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); +Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); +Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 96d9fcf6..77879dcd 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,7 @@ import $ from 'jquery'; import Mousetrap from 'mousetrap'; +import './shortcuts/main.js'; +import './shortcuts/entry.js'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -52,49 +54,3 @@ function initExport() { } export { savePercent, retrievePercent, initFilters, initExport }; - -/** Shortcuts **/ - -/* Go to */ -Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); -Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); -Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); -Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); -Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); -Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); -Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); -Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); -Mousetrap.bind('g h', () => { window.location.href = Routing.generate('howto'); }); -Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); - - -/* Actions */ -Mousetrap.bind('g n', () => { - $('#nav-btn-add').trigger('click'); -}); - -Mousetrap.bind('esc', () => { - $('.close').trigger('click'); -}); - -// Display the first element of the current view -Mousetrap.bind('right', () => { - $('ul.data li:first-child span.dot-ellipsis a')[0].click(); -}); - -/* Article view */ -Mousetrap.bind('o', () => { - $('ul.side-nav li:nth-child(2) a i')[0].click(); -}); - -Mousetrap.bind('s', () => { - $('ul.side-nav li:nth-child(5) a i')[0].click(); -}); - -Mousetrap.bind('a', () => { - $('ul.side-nav li:nth-child(4) a i')[0].click(); -}); - -Mousetrap.bind('del', () => { - $('ul.side-nav li:nth-child(6) a i')[0].click(); -}); diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index b7347f7c..5a8911ad 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js @@ -1,4 +1,7 @@ import $ from 'jquery'; +import { initFilters, initExport } from '../../_global/js/tools'; +import './shortcuts/main.js'; +import './shortcuts/entry.js'; /* eslint-disable no-unused-vars */ /* jquery has default scope */ diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js new file mode 100644 index 00000000..d618f28e --- /dev/null +++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js @@ -0,0 +1,19 @@ +/* Article view */ +Mousetrap.bind('o', () => { + $('div#article_toolbar ul.links li:nth-child(2) a')[0].click(); +}); + +/* mark as favorite */ +Mousetrap.bind('s', () => { + $('div#article_toolbar ul.links li:nth-child(5) a')[0].click(); +}); + +/* mark as read */ +Mousetrap.bind('a', () => { + $('div#article_toolbar ul.links li:nth-child(4) a')[0].click(); +}); + +/* delete */ +Mousetrap.bind('del', () => { + $('div#article_toolbar ul.links li:nth-child(7) a')[0].click(); +}); diff --git a/app/Resources/static/themes/baggy/js/shortcuts/main.js b/app/Resources/static/themes/baggy/js/shortcuts/main.js new file mode 100644 index 00000000..e69de29b diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js index d8edeed1..3ff8de0a 100755 --- a/app/Resources/static/themes/material/js/init.js +++ b/app/Resources/static/themes/material/js/init.js @@ -1,6 +1,8 @@ import $ from 'jquery'; import annotator from 'annotator'; import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools'; +import './shortcuts/main.js'; +import './shortcuts/entry.js'; require('materialize'); // eslint-disable-line diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js new file mode 100644 index 00000000..900a8214 --- /dev/null +++ b/app/Resources/static/themes/material/js/shortcuts/entry.js @@ -0,0 +1,19 @@ +/* open original article */ +Mousetrap.bind('o', () => { + $('ul.side-nav li:nth-child(2) a i')[0].click(); +}); + +/* mark as favorite */ +Mousetrap.bind('s', () => { + $('ul.side-nav li:nth-child(5) a i')[0].click(); +}); + +/* mark as read */ +Mousetrap.bind('a', () => { + $('ul.side-nav li:nth-child(4) a i')[0].click(); +}); + +/* delete */ +Mousetrap.bind('del', () => { + $('ul.side-nav li:nth-child(6) a i')[0].click(); +}); diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js new file mode 100644 index 00000000..ccd3c92d --- /dev/null +++ b/app/Resources/static/themes/material/js/shortcuts/main.js @@ -0,0 +1,13 @@ +/* Actions */ +Mousetrap.bind('g n', () => { + $('#nav-btn-add').trigger('click'); +}); + +Mousetrap.bind('esc', () => { + $('.close').trigger('click'); +}); + +// Display the first element of the current view +Mousetrap.bind('right', () => { + $('ul.data li:first-child span.dot-ellipsis a')[0].click(); +}); -- cgit v1.2.3 From 5637a26e9af98a05c76823c85611315cd1a986e0 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 10:02:16 +0100 Subject: Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page ! Also better indentation for js files (changed editorconfig for them). Signed-off-by: Thomas Citharel --- .../static/themes/_global/js/shortcuts/main.js | 3 + app/Resources/static/themes/_global/js/tools.js | 5 +- app/Resources/static/themes/baggy/js/init.js | 12 +++- .../static/themes/baggy/js/shortcuts/entry.js | 11 ++-- app/Resources/static/themes/material/js/init.js | 13 +++- .../static/themes/material/js/shortcuts/entry.js | 11 ++-- .../static/themes/material/js/shortcuts/main.js | 74 +++++++++++++++++++--- 7 files changed, 105 insertions(+), 24 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index 0bb962d0..1f2c1c52 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -1,3 +1,6 @@ +import Mousetrap from 'mousetrap'; + + /** Shortcuts **/ /* Go to */ diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 77879dcd..568b2dce 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,7 +1,6 @@ import $ from 'jquery'; -import Mousetrap from 'mousetrap'; -import './shortcuts/main.js'; -import './shortcuts/entry.js'; +import './shortcuts/main'; +import './shortcuts/entry'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index 5a8911ad..05360a28 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js @@ -1,7 +1,5 @@ +/* jQuery */ import $ from 'jquery'; -import { initFilters, initExport } from '../../_global/js/tools'; -import './shortcuts/main.js'; -import './shortcuts/entry.js'; /* eslint-disable no-unused-vars */ /* jquery has default scope */ @@ -9,8 +7,16 @@ import cookie from 'jquery.cookie'; import ui from 'jquery-ui-browserify'; /* eslint-enable no-unused-vars */ +/* Annotations */ import annotator from 'annotator'; +/* Shortcuts */ +import './shortcuts/main'; +import './shortcuts/entry'; +import '../../_global/js/shortcuts/main'; +import '../../_global/js/shortcuts/entry'; + +/* Tools */ import { savePercent, retrievePercent } from '../../_global/js/tools'; import toggleSaveLinkForm from './uiTools'; diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js index d618f28e..77d267a3 100644 --- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js +++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js @@ -1,19 +1,22 @@ +import Mousetrap from 'mousetrap'; +import $ from 'jquery'; + /* Article view */ Mousetrap.bind('o', () => { - $('div#article_toolbar ul.links li:nth-child(2) a')[0].click(); + $('div#article_toolbar ul.links li:nth-child(2) a')[0].click(); }); /* mark as favorite */ Mousetrap.bind('s', () => { - $('div#article_toolbar ul.links li:nth-child(5) a')[0].click(); + $('div#article_toolbar ul.links li:nth-child(5) a')[0].click(); }); /* mark as read */ Mousetrap.bind('a', () => { - $('div#article_toolbar ul.links li:nth-child(4) a')[0].click(); + $('div#article_toolbar ul.links li:nth-child(4) a')[0].click(); }); /* delete */ Mousetrap.bind('del', () => { - $('div#article_toolbar ul.links li:nth-child(7) a')[0].click(); + $('div#article_toolbar ul.links li:nth-child(7) a')[0].click(); }); diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js index 3ff8de0a..9746224b 100755 --- a/app/Resources/static/themes/material/js/init.js +++ b/app/Resources/static/themes/material/js/init.js @@ -1,8 +1,17 @@ +/* jQuery */ import $ from 'jquery'; + +/* Annotations */ import annotator from 'annotator'; + +/* Tools */ import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools'; -import './shortcuts/main.js'; -import './shortcuts/entry.js'; + +/* Import shortcuts */ +import './shortcuts/main'; +import './shortcuts/entry'; +import '../../_global/js/shortcuts/main'; +import '../../_global/js/shortcuts/entry'; require('materialize'); // eslint-disable-line diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js index 900a8214..674253b5 100644 --- a/app/Resources/static/themes/material/js/shortcuts/entry.js +++ b/app/Resources/static/themes/material/js/shortcuts/entry.js @@ -1,19 +1,22 @@ +import Mousetrap from 'mousetrap'; +import $ from 'jquery'; + /* open original article */ Mousetrap.bind('o', () => { - $('ul.side-nav li:nth-child(2) a i')[0].click(); + $('ul.side-nav li:nth-child(2) a i')[0].click(); }); /* mark as favorite */ Mousetrap.bind('s', () => { - $('ul.side-nav li:nth-child(5) a i')[0].click(); + $('ul.side-nav li:nth-child(5) a i')[0].click(); }); /* mark as read */ Mousetrap.bind('a', () => { - $('ul.side-nav li:nth-child(4) a i')[0].click(); + $('ul.side-nav li:nth-child(4) a i')[0].click(); }); /* delete */ Mousetrap.bind('del', () => { - $('ul.side-nav li:nth-child(6) a i')[0].click(); + $('ul.side-nav li:nth-child(6) a i')[0].click(); }); diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js index ccd3c92d..62b7ec64 100644 --- a/app/Resources/static/themes/material/js/shortcuts/main.js +++ b/app/Resources/static/themes/material/js/shortcuts/main.js @@ -1,13 +1,71 @@ -/* Actions */ -Mousetrap.bind('g n', () => { +import Mousetrap from 'mousetrap'; +import $ from 'jquery'; + +function toggleFocus(cardToToogleFocus) { + if (cardToToogleFocus) { + $(cardToToogleFocus).toggleClass('z-depth-4'); + } +} +let card; +let cardIndex; +let cardNumber; +let pagination; + +$(document).ready(() => { + cardIndex = 0; + cardNumber = $('#content ul.data > li').length; + card = $('#content ul.data > li')[cardIndex]; + pagination = $('.pagination'); + + /* If we come from next page */ + if (window.location.hash === '#prev') { + cardIndex = cardNumber - 1; + card = $('ul.data > li')[cardIndex]; + } + + /* Focus current card */ + toggleFocus(card); + + /* Actions */ + Mousetrap.bind('g n', () => { $('#nav-btn-add').trigger('click'); -}); + }); -Mousetrap.bind('esc', () => { + Mousetrap.bind('esc', () => { $('.close').trigger('click'); -}); + }); + + /* Select right card. If there's a next page, go to next page */ + Mousetrap.bind('right', () => { + if (cardIndex >= 0 && cardIndex < cardNumber - 1) { + toggleFocus(card); + cardIndex += 1; + card = $('ul.data > li')[cardIndex]; + toggleFocus(card); + return; + } + if (pagination != null && pagination.find('li.next') && cardIndex === cardNumber - 1) { + window.location.href = window.location.origin + $(pagination).find('li.next a').attr('href'); + return; + } + }); + + /* Select previous card. If there's a previous page, go to next page */ + Mousetrap.bind('left', () => { + if (cardIndex > 0 && cardIndex < cardNumber) { + toggleFocus(card); + cardIndex -= 1; + card = $('ul.data > li')[cardIndex]; + toggleFocus(card); + return; + } + if (pagination !== null && $(pagination).find('li.prev') && cardIndex === 0) { + window.location.href = `${window.location.origin + $(pagination).find('li.prev a').attr('href')}#prev`; + return; + } + }); -// Display the first element of the current view -Mousetrap.bind('right', () => { - $('ul.data li:first-child span.dot-ellipsis a')[0].click(); + Mousetrap.bind('enter', () => { + window.location.href = window.location.origin + $(card).find('span.card-title a').attr('href'); + }); }); -- cgit v1.2.3 From c930992348d81c70884791ee3edbec4a3cc1d128 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 5 Nov 2016 16:06:13 +0100 Subject: fix next/prev page --- .../static/themes/_global/js/shortcuts/main.js | 1 - .../static/themes/material/js/shortcuts/main.js | 18 ++++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index 1f2c1c52..ef6a1b84 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -1,6 +1,5 @@ import Mousetrap from 'mousetrap'; - /** Shortcuts **/ /* Go to */ diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js index 62b7ec64..ba396841 100644 --- a/app/Resources/static/themes/material/js/shortcuts/main.js +++ b/app/Resources/static/themes/material/js/shortcuts/main.js @@ -6,16 +6,12 @@ function toggleFocus(cardToToogleFocus) { $(cardToToogleFocus).toggleClass('z-depth-4'); } } -let card; -let cardIndex; -let cardNumber; -let pagination; $(document).ready(() => { - cardIndex = 0; - cardNumber = $('#content ul.data > li').length; - card = $('#content ul.data > li')[cardIndex]; - pagination = $('.pagination'); + let cardIndex = 0; + const cardNumber = $('#content ul.data > li').length; + let card = $('#content ul.data > li')[cardIndex]; + const pagination = $('.pagination'); /* If we come from next page */ if (window.location.hash === '#prev') { @@ -44,9 +40,8 @@ $(document).ready(() => { toggleFocus(card); return; } - if (pagination != null && pagination.find('li.next') && cardIndex === cardNumber - 1) { + if (pagination.length > 0 && pagination.find('li.next:not(.disabled)').length > 0 && cardIndex === cardNumber - 1) { window.location.href = window.location.origin + $(pagination).find('li.next a').attr('href'); - return; } }); @@ -59,9 +54,8 @@ $(document).ready(() => { toggleFocus(card); return; } - if (pagination !== null && $(pagination).find('li.prev') && cardIndex === 0) { + if (pagination.length > 0 && $(pagination).find('li.prev:not(.disabled)').length > 0 && cardIndex === 0) { window.location.href = `${window.location.origin + $(pagination).find('li.prev a').attr('href')}#prev`; - return; } }); -- cgit v1.2.3 From 10a1ffae5313b0f77287b92aca93bb0066d3b1e3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 15 Nov 2016 22:23:50 +0100 Subject: Fix keyboard navigation on quickstart view Signed-off-by: Thomas Citharel --- app/Resources/static/themes/material/js/shortcuts/main.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js index ba396841..8514f71e 100644 --- a/app/Resources/static/themes/material/js/shortcuts/main.js +++ b/app/Resources/static/themes/material/js/shortcuts/main.js @@ -13,6 +13,11 @@ $(document).ready(() => { let card = $('#content ul.data > li')[cardIndex]; const pagination = $('.pagination'); + /* Show nothing on quickstart */ + if ($('#content > div.quickstart').length > 0) { + return; + } + /* If we come from next page */ if (window.location.hash === '#prev') { cardIndex = cardNumber - 1; -- cgit v1.2.3 From 94f2057ffefdb164ae388a6971b4ed052082a434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 16 Nov 2016 09:17:12 +0100 Subject: Added CSS class on links --- app/Resources/static/themes/baggy/js/shortcuts/entry.js | 8 ++++---- app/Resources/static/themes/material/js/shortcuts/entry.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js index 77d267a3..728df8bd 100644 --- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js +++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js @@ -3,20 +3,20 @@ import $ from 'jquery'; /* Article view */ Mousetrap.bind('o', () => { - $('div#article_toolbar ul.links li:nth-child(2) a')[0].click(); + $('div#article_toolbar ul.links a.original')[0].click(); }); /* mark as favorite */ Mousetrap.bind('s', () => { - $('div#article_toolbar ul.links li:nth-child(5) a')[0].click(); + $('div#article_toolbar ul.links a.favorite')[0].click(); }); /* mark as read */ Mousetrap.bind('a', () => { - $('div#article_toolbar ul.links li:nth-child(4) a')[0].click(); + $('div#article_toolbar ul.links a.markasread')[0].click(); }); /* delete */ Mousetrap.bind('del', () => { - $('div#article_toolbar ul.links li:nth-child(7) a')[0].click(); + $('div#article_toolbar ul.links a.delete')[0].click(); }); diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js index 674253b5..357c22fe 100644 --- a/app/Resources/static/themes/material/js/shortcuts/entry.js +++ b/app/Resources/static/themes/material/js/shortcuts/entry.js @@ -3,20 +3,20 @@ import $ from 'jquery'; /* open original article */ Mousetrap.bind('o', () => { - $('ul.side-nav li:nth-child(2) a i')[0].click(); + $('ul.side-nav a.original i')[0].click(); }); /* mark as favorite */ Mousetrap.bind('s', () => { - $('ul.side-nav li:nth-child(5) a i')[0].click(); + $('ul.side-nav a.favorite i')[0].click(); }); /* mark as read */ Mousetrap.bind('a', () => { - $('ul.side-nav li:nth-child(4) a i')[0].click(); + $('ul.side-nav a.markasread i')[0].click(); }); /* delete */ Mousetrap.bind('del', () => { - $('ul.side-nav li:nth-child(6) a i')[0].click(); + $('ul.side-nav a.delete i')[0].click(); }); -- cgit v1.2.3 From ee122a7528f55dfb5f02e351c509d00b756fedaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 4 Nov 2016 23:24:43 +0100 Subject: Added a simple search engine Fix #18 --- app/Resources/static/themes/material/css/main.css | 10 +++++++--- app/Resources/static/themes/material/js/init.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index df126fb4..21f948b1 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -322,11 +322,13 @@ nav input { color: #444; } -.input-field.nav-panel-add label { +.input-field.nav-panel-add label, +.input-field.nav-panel-search label { left: 1rem; } -.input-field.nav-panel-add .close { +.input-field.nav-panel-add .close, +.input-field.nav-panel-search .close { position: absolute; top: 0; right: 1rem; @@ -345,7 +347,9 @@ nav input { } .input-field.nav-panel-add, -.input-field.nav-panel-add form { +.input-field.nav-panel-add form, +.input-field.nav-panel-search, +.input-field.nav-panel-search form{ height: 100%; } diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js index 9746224b..0b2832c0 100755 --- a/app/Resources/static/themes/material/js/init.js +++ b/app/Resources/static/themes/material/js/init.js @@ -55,7 +55,7 @@ $(document).ready(() => { $('.nav-panels .action').hide(100); $('.nav-panel-menu').addClass('hidden'); $('.nav-panels').css('background', 'white'); - $('#searchfield').focus(); + $('#search_entry_term').focus(); return false; }); $('.close').on('click', () => { -- cgit v1.2.3 From 32f455c1317bf536aea63147d2c5074ae7425d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 18 Nov 2016 17:36:19 +0100 Subject: Added tests --- app/Resources/static/themes/material/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 21f948b1..8e33cfbc 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -349,7 +349,7 @@ nav input { .input-field.nav-panel-add, .input-field.nav-panel-add form, .input-field.nav-panel-search, -.input-field.nav-panel-search form{ +.input-field.nav-panel-search form { height: 100%; } -- cgit v1.2.3 From 995c204428dd6be04d2bff1d5e17f3e95268f44d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 18 Nov 2016 19:21:31 +0100 Subject: Added shortcut --- app/Resources/static/themes/baggy/js/shortcuts/main.js | 7 +++++++ app/Resources/static/themes/material/js/shortcuts/main.js | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/js/shortcuts/main.js b/app/Resources/static/themes/baggy/js/shortcuts/main.js index e69de29b..aed09aee 100644 --- a/app/Resources/static/themes/baggy/js/shortcuts/main.js +++ b/app/Resources/static/themes/baggy/js/shortcuts/main.js @@ -0,0 +1,7 @@ +$(document).ready(() => { + Mousetrap.bind('s', () => { + $('#search').trigger('click'); + $('#search_entry_term').focus(); + return false; + }); +}); diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js index 8514f71e..ad4ca80a 100644 --- a/app/Resources/static/themes/material/js/shortcuts/main.js +++ b/app/Resources/static/themes/material/js/shortcuts/main.js @@ -30,6 +30,12 @@ $(document).ready(() => { /* Actions */ Mousetrap.bind('g n', () => { $('#nav-btn-add').trigger('click'); + return false; + }); + + Mousetrap.bind('s', () => { + $('#nav-btn-search').trigger('click'); + return false; }); Mousetrap.bind('esc', () => { -- cgit v1.2.3 From 77e2898ad406c5aa7672dcaead6b5090cd203d47 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 10:14:19 +0100 Subject: Fix card action overlap On smaller resolution --- app/Resources/static/themes/material/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 8e33cfbc..1af30777 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -544,6 +544,10 @@ a.original { line-height: 24px; } +.card .card-action ul.tools li a.tool { + margin-right: 5px !important; +} + .card .card-action a { color: #fff; margin: 0; -- cgit v1.2.3 From c526f9e4744ac03aa7ab4ff507d5466eee371b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 20 Nov 2016 10:11:57 +0100 Subject: Added help about shortcuts --- app/Resources/static/themes/baggy/js/shortcuts/entry.js | 2 +- app/Resources/static/themes/material/js/shortcuts/entry.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js index 728df8bd..22aa0caf 100644 --- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js +++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js @@ -7,7 +7,7 @@ Mousetrap.bind('o', () => { }); /* mark as favorite */ -Mousetrap.bind('s', () => { +Mousetrap.bind('f', () => { $('div#article_toolbar ul.links a.favorite')[0].click(); }); diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js index 357c22fe..2dcc93d7 100644 --- a/app/Resources/static/themes/material/js/shortcuts/entry.js +++ b/app/Resources/static/themes/material/js/shortcuts/entry.js @@ -7,7 +7,7 @@ Mousetrap.bind('o', () => { }); /* mark as favorite */ -Mousetrap.bind('s', () => { +Mousetrap.bind('f', () => { $('ul.side-nav a.favorite i')[0].click(); }); -- cgit v1.2.3 From 0df2a4b021e581c7661968a23e5c8dd5de5273c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Nov 2016 21:31:21 +0100 Subject: Fixed entry shortcuts available in list view --- .../static/themes/baggy/js/shortcuts/entry.js | 34 ++++++++++++---------- .../static/themes/material/js/shortcuts/entry.js | 34 ++++++++++++---------- 2 files changed, 38 insertions(+), 30 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js index 22aa0caf..c87408b9 100644 --- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js +++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js @@ -1,22 +1,26 @@ import Mousetrap from 'mousetrap'; import $ from 'jquery'; -/* Article view */ -Mousetrap.bind('o', () => { - $('div#article_toolbar ul.links a.original')[0].click(); -}); +$(document).ready(() => { + if ($('#article').length > 0) { + /* Article view */ + Mousetrap.bind('o', () => { + $('div#article_toolbar ul.links a.original')[0].click(); + }); -/* mark as favorite */ -Mousetrap.bind('f', () => { - $('div#article_toolbar ul.links a.favorite')[0].click(); -}); + /* mark as favorite */ + Mousetrap.bind('f', () => { + $('div#article_toolbar ul.links a.favorite')[0].click(); + }); -/* mark as read */ -Mousetrap.bind('a', () => { - $('div#article_toolbar ul.links a.markasread')[0].click(); -}); + /* mark as read */ + Mousetrap.bind('a', () => { + $('div#article_toolbar ul.links a.markasread')[0].click(); + }); -/* delete */ -Mousetrap.bind('del', () => { - $('div#article_toolbar ul.links a.delete')[0].click(); + /* delete */ + Mousetrap.bind('del', () => { + $('div#article_toolbar ul.links a.delete')[0].click(); + }); + } }); diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js index 2dcc93d7..e19800bd 100644 --- a/app/Resources/static/themes/material/js/shortcuts/entry.js +++ b/app/Resources/static/themes/material/js/shortcuts/entry.js @@ -1,22 +1,26 @@ import Mousetrap from 'mousetrap'; import $ from 'jquery'; -/* open original article */ -Mousetrap.bind('o', () => { - $('ul.side-nav a.original i')[0].click(); -}); +$(document).ready(() => { + if ($('#article').length > 0) { + /* open original article */ + Mousetrap.bind('o', () => { + $('ul.side-nav a.original i')[0].click(); + }); -/* mark as favorite */ -Mousetrap.bind('f', () => { - $('ul.side-nav a.favorite i')[0].click(); -}); + /* mark as favorite */ + Mousetrap.bind('f', () => { + $('ul.side-nav a.favorite i')[0].click(); + }); -/* mark as read */ -Mousetrap.bind('a', () => { - $('ul.side-nav a.markasread i')[0].click(); -}); + /* mark as read */ + Mousetrap.bind('a', () => { + $('ul.side-nav a.markasread i')[0].click(); + }); -/* delete */ -Mousetrap.bind('del', () => { - $('ul.side-nav a.delete i')[0].click(); + /* delete */ + Mousetrap.bind('del', () => { + $('ul.side-nav a.delete i')[0].click(); + }); + } }); -- cgit v1.2.3 From 66e9dde0dc0ba5f554231a7a968ef5b530a0563f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 23 Nov 2016 14:40:00 +0100 Subject: Fixed logout shortcut --- app/Resources/static/themes/_global/js/shortcuts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index ef6a1b84..c81bf869 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -12,4 +12,4 @@ Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); }); -Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('fos_user_security_logout'); }); -- cgit v1.2.3 From 5b69e03eb43faf3a0f9bbf5ded12447e33510472 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:18:30 +0100 Subject: Material: change color of background, article content and titles Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 1af30777..2fcf11bd 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -164,7 +164,7 @@ body { display: flex; min-height: 100vh; flex-direction: column; - background: #f0f0f0; + background: #fafafa; } body.login main { @@ -603,6 +603,19 @@ a.original { max-width: 40em; } +#article article { + color: #424242; +} + +#article article h1, +#article article h2, +#article article h3, +#article article h4, +#article article h5, +#article article h6 { + color: #212121; +} + #article img, #article figure { max-width: 100%; -- cgit v1.2.3 From 7470a2f36ab9c66176855affa9788e2dca8978e2 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:27:10 +0100 Subject: Material: prevent bold in title, update title font size Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 2fcf11bd..ffccb498 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -616,6 +616,39 @@ a.original { color: #212121; } +#article article h1 strong, +#article article h2 strong, +#article article h3 strong, +#article article h4 strong, +#article article h5 strong, +#article article h6 strong { + font-weight: 500; +} + +#article article h6 { + font-size: 1.2rem; +} + +#article article h5 { + font-size: 1.6rem; +} + +#article article h4 { + font-size: 1.9rem; +} + +#article article h3 { + font-size: 2.2rem; +} + +#article article h2 { + font-size: 2.5rem; +} + +#article article h1 { + font-size: 2.7rem; +} + #article img, #article figure { max-width: 100%; -- cgit v1.2.3 From 5ea90fa8b994dcc20738576261702183c0175907 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:27:45 +0100 Subject: Material: increase max width of article on large screens Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index ffccb498..86dab6bf 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -600,7 +600,7 @@ a.original { #article { font-size: 20px; margin: 0 auto; - max-width: 40em; + max-width: 45em; } #article article { -- cgit v1.2.3 From 858430c0d02b94fe84daf6f0a14bdbbb1b75a969 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:36:02 +0100 Subject: Material: update style of article links Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 86dab6bf..3a15a789 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -655,6 +655,15 @@ a.original { height: auto; } +#article article a { + border-bottom: 1px dotted #03a9f4; + text-decoration: none; +} + +#article article a:hover { + border-bottom-style: solid; +} + #article > header > h1 { font-size: 2em; margin: 2.1rem 0 0.68rem; -- cgit v1.2.3 From 59cfd63c235404b05712c9005b37d3814a655633 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:36:31 +0100 Subject: Material: update style of ul in article Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 3a15a789..b4d2765c 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -664,6 +664,15 @@ a.original { border-bottom-style: solid; } +#article article ul { + padding-left: 30px; +} + +#article article ul, +#article article ul li { + list-style-type: disc; +} + #article > header > h1 { font-size: 2em; margin: 2.1rem 0 0.68rem; -- cgit v1.2.3 From fdaa044314d6bd05ac3ff3a6cdad88c852702b2e Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:40:35 +0100 Subject: Material: update style of pre in article Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index b4d2765c..ff3a9891 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -673,6 +673,20 @@ a.original { list-style-type: disc; } +#article article pre { + box-sizing: border-box; + margin: 0 0 1.75em; + border: #e3f2fd 1px solid; + width: 100%; + padding: 10px; + font-family: monospace; + font-size: 0.8em; + white-space: pre; + overflow: auto; + background: #f5f5f5; + border-radius: 3px; +} + #article > header > h1 { font-size: 2em; margin: 2.1rem 0 0.68rem; -- cgit v1.2.3 From 819c8f5bd42e2b69228d8adc9303970cae768167 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 20 Nov 2016 20:45:05 +0100 Subject: Material: render blockquote in italic and strong in bold in article Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index ff3a9891..a8172b7e 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -673,6 +673,14 @@ a.original { list-style-type: disc; } +#article article blockquote { + font-style: italic; +} + +#article article strong { + font-weight: bold; +} + #article article pre { box-sizing: border-box; margin: 0 0 1.75em; -- cgit v1.2.3 From 56026217c55ee254cce5875ea56072d3a5c49274 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Fri, 25 Nov 2016 13:49:45 +0100 Subject: Material: update size of text in article Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/main.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index a8172b7e..82a74c23 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -605,6 +605,8 @@ a.original { #article article { color: #424242; + font-size: 18px; + line-height: 1.7em; } #article article h1, -- cgit v1.2.3 From 9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 11:02:10 +0100 Subject: Added list view --- app/Resources/static/themes/_global/img/list.png | Bin 0 -> 201 bytes app/Resources/static/themes/_global/img/table.png | Bin 0 -> 229 bytes app/Resources/static/themes/baggy/css/main.css | 15 ++++++--------- app/Resources/static/themes/material/css/main.css | 10 +++++++++- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100755 app/Resources/static/themes/_global/img/list.png create mode 100755 app/Resources/static/themes/_global/img/table.png (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/img/list.png b/app/Resources/static/themes/_global/img/list.png new file mode 100755 index 00000000..bd5aff5a Binary files /dev/null and b/app/Resources/static/themes/_global/img/list.png differ diff --git a/app/Resources/static/themes/_global/img/table.png b/app/Resources/static/themes/_global/img/table.png new file mode 100755 index 00000000..859c4cd8 Binary files /dev/null and b/app/Resources/static/themes/_global/img/table.png differ diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 4f48f8ca..126c451b 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -297,18 +297,14 @@ h2::after { text-decoration: none; } -#listmode a:hover { - opacity: 1; -} - #listmode.tablemode { - background-image: url("../img/baggy/table.png"); + background-image: url("../../_global/img/table.png"); background-repeat: no-repeat; background-position: bottom; } #listmode.listmode { - background-image: url("../img/baggy/list.png"); + background-image: url("../../_global/img/list.png"); background-repeat: no-repeat; background-position: bottom; } @@ -352,9 +348,9 @@ footer a { letter-spacing: -5px; } -.listmode .entry { - width: 100% !important; - margin-left: 0 !important; +.listmode.entry { + width: 100%; + height: inherit; } .card-entry-labels { @@ -588,6 +584,7 @@ div.pagination ul { text-align: left; font-style: italic; color: #999; + display: inline-flex; } div.pagination ul > * { diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 82a74c23..76423409 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -194,7 +194,6 @@ main, .results { height: 1em; - line-height: 30px; } .results .nb-results, @@ -203,6 +202,14 @@ main, margin-bottom: 0; } +.results .nb-results { + display: inline-flex; +} + +.results a { + color: #444; +} + .pagination { float: right; } @@ -593,6 +600,7 @@ a.original { background-position: 50%; } + /* ========================================================================== 5 = Article ========================================================================== */ -- cgit v1.2.3 From 56a7ce17f3a9a22e0bfc8651cb690a14447e0afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 11:26:08 +0100 Subject: Hide article text on mobile with list mode --- app/Resources/static/themes/baggy/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 126c451b..6d656c21 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -1203,6 +1203,10 @@ pre code { } @media screen and (max-width: 500px) { + .hide { + display: none; + } + .entry { width: 100%; margin-left: 0; -- cgit v1.2.3 From 9aa991281ddd315f607cabcfc3b917401d3d2104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 12:08:51 +0100 Subject: Renamed view_mode by list_mode and hide excerpt --- app/Resources/static/themes/baggy/css/main.css | 8 ++++---- app/Resources/static/themes/material/css/main.css | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 6d656c21..e16846ea 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -617,6 +617,10 @@ div.pagination ul .current { background-color: #ccc; } +.hide { + display: none; +} + /* ========================================================================== 2.1 = "save a link" related styles ========================================================================== */ @@ -1203,10 +1207,6 @@ pre code { } @media screen and (max-width: 500px) { - .hide { - display: none; - } - .entry { width: 100%; margin-left: 0; diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 76423409..8f7b7a3d 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -555,6 +555,14 @@ a.original { margin-right: 5px !important; } +.card-stacked:hover ul.tools-list { + display: block; +} + +.card-stacked ul.tools-list { + display: none; +} + .card .card-action a { color: #fff; margin: 0; @@ -600,7 +608,6 @@ a.original { background-position: 50%; } - /* ========================================================================== 5 = Article ========================================================================== */ -- cgit v1.2.3 From 78d6c3090a03b25ad349f7de679fb18303ce0a9d Mon Sep 17 00:00:00 2001 From: Simounet Date: Tue, 20 Dec 2016 13:04:51 +0100 Subject: Fix the box shadow on the card entry --- .../static/themes/material/js/shortcuts/main.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js index ad4ca80a..0a2d2a69 100644 --- a/app/Resources/static/themes/material/js/shortcuts/main.js +++ b/app/Resources/static/themes/material/js/shortcuts/main.js @@ -8,9 +8,14 @@ function toggleFocus(cardToToogleFocus) { } $(document).ready(() => { + const cards = $('#content').find('.card'); + const cardNumber = cards.length; let cardIndex = 0; - const cardNumber = $('#content ul.data > li').length; - let card = $('#content ul.data > li')[cardIndex]; + /* If we come from next page */ + if (window.location.hash === '#prev') { + cardIndex = cardNumber - 1; + } + let card = cards[cardIndex]; const pagination = $('.pagination'); /* Show nothing on quickstart */ @@ -18,12 +23,6 @@ $(document).ready(() => { return; } - /* If we come from next page */ - if (window.location.hash === '#prev') { - cardIndex = cardNumber - 1; - card = $('ul.data > li')[cardIndex]; - } - /* Focus current card */ toggleFocus(card); @@ -47,7 +46,7 @@ $(document).ready(() => { if (cardIndex >= 0 && cardIndex < cardNumber - 1) { toggleFocus(card); cardIndex += 1; - card = $('ul.data > li')[cardIndex]; + card = cards[cardIndex]; toggleFocus(card); return; } @@ -61,7 +60,7 @@ $(document).ready(() => { if (cardIndex > 0 && cardIndex < cardNumber) { toggleFocus(card); cardIndex -= 1; - card = $('ul.data > li')[cardIndex]; + card = cards[cardIndex]; toggleFocus(card); return; } -- cgit v1.2.3 From 22d0c929e33e8902db92c18b6fa288b773f46e36 Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 29 Dec 2016 19:19:51 +0100 Subject: Access to search, filters, export on mobile --- app/Resources/static/themes/material/css/main.css | 36 ++++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 8f7b7a3d..c6b7326d 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -283,6 +283,16 @@ nav input { color: #aaa; } +nav { + height: auto; +} + +.nav-wrapper { + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} + .nav-wrapper .button-collapse { padding: 0 15px; } @@ -291,8 +301,10 @@ nav input { display: none; } -.nav-panels { - overflow: hidden; +.nav-panel-buttom { + display: flex; + flex-grow: 1; + justify-content: right; } .nav-panel-buttom li { @@ -357,7 +369,7 @@ nav input { .input-field.nav-panel-add form, .input-field.nav-panel-search, .input-field.nav-panel-search form { - height: 100%; + flex-grow: 1; } /* ========================================================================== @@ -807,6 +819,14 @@ article aside .tools li { width: auto; } + .nav-panels .action { + padding-right: 0.75rem; + } + + .nav-panel-buttom { + justify-content: space-around; + } + #article { max-width: 35em; margin-left: auto; @@ -843,11 +863,13 @@ article aside .tools li { .pagination li.next { width: auto; } -} -@media only screen and (min-width: 400px) { - .nav-panel-buttom { - float: right; + .drag-target + .drag-target { + height: 50%; + } + + .drag-target + .drag-target + .drag-target { + top: 50%; } } -- cgit v1.2.3 From 8e2419a5cf8b28281eef9b567e0e24b190cbe9dd Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 29 Dec 2016 19:17:36 +0100 Subject: Fix right side-nav scrolling on low height window --- app/Resources/static/themes/material/css/main.css | 1 - 1 file changed, 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index c6b7326d..50aa690c 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -439,7 +439,6 @@ nav ul a:hover { .side-nav.fixed.right-aligned { right: -250px; left: auto !important; - overflow-y: visible; } #filters div.with-checkbox { -- cgit v1.2.3 From bb2934d47638c913579b18d66b72687bc508fdfa Mon Sep 17 00:00:00 2001 From: Simounet Date: Fri, 30 Dec 2016 13:54:13 +0100 Subject: Fix action's icons position --- app/Resources/static/themes/material/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 50aa690c..f43e6042 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -304,7 +304,7 @@ nav { .nav-panel-buttom { display: flex; flex-grow: 1; - justify-content: right; + justify-content: flex-end; } .nav-panel-buttom li { -- cgit v1.2.3 From ccb9e79a35cdac9f93de90f577f8ec63fdcc6081 Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 29 Dec 2016 19:17:36 +0100 Subject: Fix double overlay on expanded right sidenav --- app/Resources/static/themes/_global/js/tools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 568b2dce..cee84fa8 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -35,7 +35,7 @@ function initFilters() { // no display if filters not available if ($('div').is('#filters')) { $('#button_filters').show(); - $('.button-collapse-right').sideNav({ edge: 'right' }); + $('.js-filters-action').sideNav({ edge: 'right' }); $('#clear_form_filters').on('click', () => { $('#filters input').val(''); $('#filters :checked').removeAttr('checked'); @@ -48,7 +48,7 @@ function initExport() { // no display if export not available if ($('div').is('#export')) { $('#button_export').show(); - $('.button-collapse-right').sideNav({ edge: 'right' }); + $('.js-export-action').sideNav({ edge: 'right' }); } } -- cgit v1.2.3