diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-11-19 20:42:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-19 20:42:27 +0100 |
commit | 6f85bed294d6dd9f2dd9c945544074cbde38e191 (patch) | |
tree | 1ac2c526e54ddaf1678184f93d4e10a7a015349c /app/Resources/static/themes/material | |
parent | 27dce581caba158a8ffffa5bc30648a21f47da12 (diff) | |
parent | 995c204428dd6be04d2bff1d5e17f3e95268f44d (diff) | |
download | wallabag-6f85bed294d6dd9f2dd9c945544074cbde38e191.tar.gz wallabag-6f85bed294d6dd9f2dd9c945544074cbde38e191.tar.zst wallabag-6f85bed294d6dd9f2dd9c945544074cbde38e191.zip |
Merge pull request #2543 from wallabag/search-engine
Added a simple search engine
Diffstat (limited to 'app/Resources/static/themes/material')
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 10 | ||||
-rwxr-xr-x | app/Resources/static/themes/material/js/init.js | 2 | ||||
-rw-r--r-- | app/Resources/static/themes/material/js/shortcuts/main.js | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index df126fb4..8e33cfbc 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 { | |||
322 | color: #444; | 322 | color: #444; |
323 | } | 323 | } |
324 | 324 | ||
325 | .input-field.nav-panel-add label { | 325 | .input-field.nav-panel-add label, |
326 | .input-field.nav-panel-search label { | ||
326 | left: 1rem; | 327 | left: 1rem; |
327 | } | 328 | } |
328 | 329 | ||
329 | .input-field.nav-panel-add .close { | 330 | .input-field.nav-panel-add .close, |
331 | .input-field.nav-panel-search .close { | ||
330 | position: absolute; | 332 | position: absolute; |
331 | top: 0; | 333 | top: 0; |
332 | right: 1rem; | 334 | right: 1rem; |
@@ -345,7 +347,9 @@ nav input { | |||
345 | } | 347 | } |
346 | 348 | ||
347 | .input-field.nav-panel-add, | 349 | .input-field.nav-panel-add, |
348 | .input-field.nav-panel-add form { | 350 | .input-field.nav-panel-add form, |
351 | .input-field.nav-panel-search, | ||
352 | .input-field.nav-panel-search form { | ||
349 | height: 100%; | 353 | height: 100%; |
350 | } | 354 | } |
351 | 355 | ||
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(() => { | |||
55 | $('.nav-panels .action').hide(100); | 55 | $('.nav-panels .action').hide(100); |
56 | $('.nav-panel-menu').addClass('hidden'); | 56 | $('.nav-panel-menu').addClass('hidden'); |
57 | $('.nav-panels').css('background', 'white'); | 57 | $('.nav-panels').css('background', 'white'); |
58 | $('#searchfield').focus(); | 58 | $('#search_entry_term').focus(); |
59 | return false; | 59 | return false; |
60 | }); | 60 | }); |
61 | $('.close').on('click', () => { | 61 | $('.close').on('click', () => { |
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(() => { | |||
30 | /* Actions */ | 30 | /* Actions */ |
31 | Mousetrap.bind('g n', () => { | 31 | Mousetrap.bind('g n', () => { |
32 | $('#nav-btn-add').trigger('click'); | 32 | $('#nav-btn-add').trigger('click'); |
33 | return false; | ||
34 | }); | ||
35 | |||
36 | Mousetrap.bind('s', () => { | ||
37 | $('#nav-btn-search').trigger('click'); | ||
38 | return false; | ||
33 | }); | 39 | }); |
34 | 40 | ||
35 | Mousetrap.bind('esc', () => { | 41 | Mousetrap.bind('esc', () => { |