From e8319fa2cbd388712a39202d44c1b6a3a520b048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Tue, 3 Jan 2017 22:04:09 +0100 Subject: [PATCH] Revert "Merge pull request #793 from kvch/pics-modal" This reverts commit bff41987a49af9ae53ff9fc3494fa7973ac03500, reversing changes made to d08108be6293c8764f0d1d950a7aab283cddffed. --- searx/static/plugins/js/infinite_scroll.js | 4 - .../static/themes/oscar/css/logicodev.min.css | Bin 11209 -> 10469 bytes searx/static/themes/oscar/css/pointhi.min.css | Bin 7437 -> 6697 bytes .../oscar/less/logicodev/modal-pic.less | 61 --------------- .../themes/oscar/less/logicodev/oscar.less | 2 - .../themes/oscar/less/pointhi/oscar.less | 4 - .../oscar/result_templates/images.html | 73 +++++++----------- 7 files changed, 29 insertions(+), 115 deletions(-) delete mode 100644 searx/static/themes/oscar/less/logicodev/modal-pic.less diff --git a/searx/static/plugins/js/infinite_scroll.js b/searx/static/plugins/js/infinite_scroll.js index 1bc27e2e7..9cd582d7f 100644 --- a/searx/static/plugins/js/infinite_scroll.js +++ b/searx/static/plugins/js/infinite_scroll.js @@ -4,13 +4,9 @@ $(document).ready(function() { if ($(document).height() - win.height() == win.scrollTop()) { var formData = $('#pagination form:last').serialize(); if (formData) { - var pageno = $('#pagination input[name=pageno]:last').attr('value'); $('#pagination').html(''); $.post('./', formData, function (data) { - var lastImageHref = $('.result-images:last a').attr('href'); var body = $(data); - $('a[href^="#open-modal"]:last').attr('href', '#open-modal-1-' + pageno); - body.find('.modal-image a:first').attr('href', lastImageHref); $('#pagination').remove(); $('#main_results').append('
'); $('#main_results').append(body.find('.result')); diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index 4f5acfff3176d0c2a07a98ae85af14d0e468e15a..33d451b8f1b712e5bd5d8f106b4d1deb13fa6da8 100644 GIT binary patch delta 7 OcmX>Z{xopIQw;zSPXrVI delta 753 zcmaKqO>ToQ5QVQo6Gcj-f*`Gu#+IsHp{uS9He^)nv5b?FAjFk=jUFWTsDb>DwkckK z@%Wp0Gw<;F_4av~Hi1OWavvniM5VC+3#dp6rQp<}CLuMDt*v{ zi#IN%syGxnXS?44#4?i!Tb=095BdPkHWsho&m6XuY#aa-nNPenfPMhCYqDBSXnavO zP8aDaWv&5+3q!{2v0Yve86mv_bKv!h6dag0m7x5dv0SWlIje?p`i!hRMl3>izp1Z^ z@`7#ToQ5QXp26-^W=kqUw|N*Y_LdKH5W83lVRcFGND8Ik)S@OKHIQwrd&g)kO81eAwA-^}n;G0G zPD~cFY53Hx;AKXSJ}53q5{0KHqNrH{_CUf%kQ$9;%2JJ>8Y_%1_Cnc$C{&^z*5k!H zmr_+63Z1jV?*L+%$%L)W^ymkD0B1XkH}F>u`${$r0E)~fUK>E)f!hsPuO>9UsvD=v zbe%HS0KlbhoWFE}j6{;EM?P))lwu=84UDRDj)8!yhNB$F&xbzH^6Ha20 zq7j#I#5pEgdX?N(LglT#?sy|Q3q`G9dfGg9o5Y#Ty5W=2=$t&svAE;JlkqONa59*8 P-*#uY;m@-Z{iyy1yfG0_ diff --git a/searx/static/themes/oscar/less/logicodev/modal-pic.less b/searx/static/themes/oscar/less/logicodev/modal-pic.less deleted file mode 100644 index 6861f1710..000000000 --- a/searx/static/themes/oscar/less/logicodev/modal-pic.less +++ /dev/null @@ -1,61 +0,0 @@ -.modal-image { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: rgba(0,0,0,0.8); - z-index: 1000000001; - opacity:0 !important; - pointer-events: none; - - button { - display: none; - } - - &:target { - opacity: 1 !important; - pointer-events: auto; - } - - & > div { - margin: 2% auto; - width: 97%; - background: @dim-gray; - border: @gray 0.1rem solid; - } - - @media (min-width: 769px) { - & > div { - max-width: 60.0rem; - } - } - - .image-paging-left { - font-size: 2.2rem; - padding-right: 1.0rem; - } - - .image-paging-right { - font-size: 2.2rem; - padding-left: 1.2rem; - } - - .image-container::before { - display: block; - min-width: 1.0rem; - max-width: 60.0rem; - min-height: 10.0rem; - height: 30.0rem; - content: ""; - } -} - -.modal-close { - position:fixed; - top: 0; - left: 0; - height: 100% !important; - width: 100% !important; - z-index: -1; -} diff --git a/searx/static/themes/oscar/less/logicodev/oscar.less b/searx/static/themes/oscar/less/logicodev/oscar.less index ecb3a0799..55181cb9c 100644 --- a/searx/static/themes/oscar/less/logicodev/oscar.less +++ b/searx/static/themes/oscar/less/logicodev/oscar.less @@ -19,5 +19,3 @@ @import "cursor.less"; @import "code.less"; - -@import "modal-pic.less"; diff --git a/searx/static/themes/oscar/less/pointhi/oscar.less b/searx/static/themes/oscar/less/pointhi/oscar.less index 4529801bb..4e2fee129 100644 --- a/searx/static/themes/oscar/less/pointhi/oscar.less +++ b/searx/static/themes/oscar/less/pointhi/oscar.less @@ -17,7 +17,3 @@ @import "code.less"; @import "navbar.less"; - -@import "../logicodev/variables.less"; - -@import "../logicodev/modal-pic.less"; diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 3bf52cd68..b23f34915 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -1,54 +1,39 @@ - - {{ result.title|striptags }} +{% from 'oscar/macros.html' import draw_favicon %} + + + {{ result.title|striptags }} - - -