From 400279182ed24cb6204194e77cf15f372ffad7ed Mon Sep 17 00:00:00 2001 From: dalf Date: Sat, 25 Oct 2014 17:05:37 +0200 Subject: [PATCH 1/4] [fix] no horizontal scrolling on small screen [fix] small images in the results aren't not "zoomed" --- searx/static/default/css/style.css | 82 +--------------------------- searx/static/default/less/style.less | 40 ++++++++------ 2 files changed, 25 insertions(+), 97 deletions(-) diff --git a/searx/static/default/css/style.css b/searx/static/default/css/style.css index 70265b072..dcf7f08df 100644 --- a/searx/static/default/css/style.css +++ b/searx/static/default/css/style.css @@ -1,81 +1 @@ -html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0} -body,#container{padding:0;margin:0} -#container{width:100%;position:absolute;top:0} -.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6} -.search .checkbox_container label:hover{border-bottom:2px solid #3498db} -.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9} -#search_wrapper{position:relative;width:50em;padding:10px} -.center #search_wrapper{margin-left:auto;margin-right:auto} -.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2} -#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0} -@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff} -ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0} -.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px} -.row p{padding:0 10px;max-width:700px} -.row h3,.row ul{margin:4px 8px} -.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px} -a:link.hmarg{color:#3498db} -a:visited.hmarg{color:#3498db} -a:active.hmarg{color:#3498db} -a:hover.hmarg{color:#3498db} -.top_margin{margin-top:60px} -.center{text-align:center} -h1{font-size:5em} -div.title{background:url('../img/searx.png') no-repeat;width:100%;background-position:center}div.title h1{visibility:hidden} -input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer} -input[type="checkbox"]{visibility:hidden} -fieldset{margin:8px;border:1px solid #3498db} -#categories{margin:0 10px} -.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none} -.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} -.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff} -.engine_checkbox{padding:4px} -label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none} -label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline} -.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none} -.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline} -a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad} -.result{margin:19px 0 18px 0;padding:0;clear:both} -.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline} -.result_title a:visited{color:#8e44ad} -.cache_link{font-size:10px !important} -.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0} -.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px} -.result .content br.last{clear:both} -.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b} -.result .published_date{font-size:.8em;color:#888;margin:5px 20px} -.engines{color:#888} -.small_font{font-size:.8em} -.small p{margin:2px 0} -.right{float:right} -.invisible{display:none} -.left{float:left} -.highlight{color:#094089} -.content .highlight{color:#000} -.image_result{float:left;margin:10px 10px;position:relative;height:160px}.image_result img{border:0;height:160px} -.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff} -.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em} -.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em} -.definition_result{border-left:10px solid #808080;padding-left:3px} -.percentage{position:relative;width:300px}.percentage div{background:#444} -table{width:100%} -td{padding:0 4px} -tr:hover{background:#ddd} -#results{margin:auto;padding:0;width:50em;margin-bottom:20px} -#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer} -#sidebar input[type="submit"]{text-decoration:underline} -#suggestions,#answers{margin-top:20px} -#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer} -#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline} -#suggestions form,#answers form,#infoboxes form{display:inline} -#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px} -#infoboxes .infobox h2{margin:0} -#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top} -#infoboxes .infobox input{font-size:1em} -#infoboxes .infobox br{clear:both} -#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em} -#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none} -#pagination{clear:both;width:40em} -#apis{margin-top:8px;clear:both} -@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%} .github{display:none} .checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0} .right{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em} #categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0} #apis{display:none} #search_url{display:none} .result{border-top:1px solid #e8e7e6;margin:7px 0 6px 0}}.favicon{float:left;margin-right:4px;margin-top:2px} -.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff} +html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6}.search .checkbox_container label:hover{border-bottom:2px solid #3498db}.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx.png') no-repeat;width:100%;background-position:center}div.title h1{visibility:hidden}input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.result{margin:19px 0 18px 0;padding:0;clear:both}.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline}.result_title a:visited{color:#8e44ad}.cache_link{font-size:10px !important}.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0}.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .content br.last{clear:both}.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b}.result .published_date{font-size:.8em;color:#888;margin:5px 20px}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.definition_result{border-left:10px solid #808080;padding-left:3px}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#sidebar input[type="submit"]{text-decoration:underline}#suggestions,#answers{margin-top:20px}#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline}#suggestions form,#answers form,#infoboxes form{display:inline}#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#infoboxes .infobox br{clear:both}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both}#apis{margin-top:8px;clear:both}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.right{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis{display:none}#search_url{display:none}.result{border-top:1px solid #e8e7e6;margin:7px 0 6px 0}.image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff} \ No newline at end of file diff --git a/searx/static/default/less/style.less b/searx/static/default/less/style.less index c43c0fe72..286a1d045 100644 --- a/searx/static/default/less/style.less +++ b/searx/static/default/less/style.less @@ -126,6 +126,7 @@ fieldset { #categories { margin: 0 10px; + .user-select; } .checkbox_container { @@ -297,14 +298,14 @@ a { } .image_result { - float: left; + display: inline-block; margin: 10px 10px; position: relative; - height: 160px; + max-height: 160px; img { border: 0; - height: 160px; + max-height: 160px; } p { @@ -369,17 +370,17 @@ tr { #results { margin: auto; padding: 0; - width: @results-width; + width: @results-width; margin-bottom: 20px; } #sidebar { position: fixed; - bottom: 10px; - left: 10px; + bottom: 10px; + left: 10px; margin: 0 2px 5px 5px; padding: 0 2px 2px 2px; - width: 14em; + width: 14em; input { padding: 0; @@ -390,9 +391,9 @@ tr { color: @color-result-search-url-font; cursor: pointer; } - input[type="submit"] { + input[type="submit"] { text-decoration: underline; - } + } } #suggestions, #answers { @@ -501,7 +502,6 @@ tr { #pagination { clear: both; - width: 40em; } #apis { @@ -511,18 +511,19 @@ tr { @media screen and (max-width: @results-width) { - #results { - margin: auto; - padding: 0; - width: 90%; - } + #results { + margin: auto; + padding: 0; + width: 90%; + } + .github { display: none; } .checkbox_container { display: block; - width: 90%; + width: 90%; //float: left; label { @@ -591,6 +592,13 @@ tr { border-top: 1px solid @color-result-top-border; margin: 7px 0 6px 0; } + + .image_result { + max-width: 98%; + img { + max-width: 98%; + } + } } .favicon { From be4d219ae73240337fa25c8833b5fd91ddc1272b Mon Sep 17 00:00:00 2001 From: dalf Date: Sat, 25 Oct 2014 17:07:39 +0200 Subject: [PATCH 2/4] [mod] use pngcrush to reduce the size of png files --- searx/static/default/img/favicon.png | Bin 3208 -> 3064 bytes searx/static/default/img/preference-icon.png | Bin 837 -> 603 bytes searx/static/default/img/search-icon.png | Bin 3287 -> 2329 bytes searx/static/default/img/searx.png | Bin 7647 -> 4909 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/searx/static/default/img/favicon.png b/searx/static/default/img/favicon.png index cefbac4967296f0772e5483af67a187912de1c0a..28afb0111a770843148d90a669267af2323a44ff 100644 GIT binary patch delta 3001 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 diff --git a/searx/static/default/img/preference-icon.png b/searx/static/default/img/preference-icon.png index f74635788ee02d720cf77397b0680c7a57bbd4de..300279d2438d6fd52dc63125c18eb35f500174bb 100644 GIT binary patch delta 507 zcmX@gcAI5FRz2fwPZ!6Kid%2*8u}e}5NLfkNAVGtpsu^eVL=N<-tea2fQt%&MSTGU zZ5|>GqME4_oUXl|dGo!evTIS-%%6L|z3aIix3&WWG-l;(zdheLS3kQjLFTRRw?_vo zX7DgEaVRt}00|b4<1A^+K};WHPDV0$bOxG-H&rof7S?OdG4`}=oU+4ytKXH9oN~>U z|0)}fELoV^^sK4iP}$S8qPfBr)8AJ2*g1$9I6S(^3^J{wnnS~Rz3TynrDi?%0yg~! zl=2d-zvR5~O|X_iqyH3t+XCBPzYg*ldl}8GOp9P-W>JYKSnBS1?ZBE#%xqJSeGfdv zulY!3t(eHJfAywGg?SkYi^EnkTIxR&cVLrN1v?i^IQvzEVs(=1iS&d7!|iw8 zl^)7FaACozy9-`1JoVlloZzb$n%Y>w!!hO8;>A~UTIauI{`+A==|R?OK6SRY zSF394_ujPmZZ)|*ZteGdI(oA185$R*y_`d9HkbTpd(oMay>r^{Wmlj4xqQ*+`+?}A vfo}UQv2idmfslgW!V_^#OlpE4pt~r3^B;#*FFJm2WB>wBS3j3^P6Vww6o%hgi?r0+B@)RIXz3h@X^;>VH$aFZ z5sttGC`O80rHzym01})bqDhJ18YaLgz5d%yvVJR{+s~@uUlYAbxhmvt8-zqYs&`oytG}lD{DM0+5ab5Py?_lXijXVK;L-7P+L1{Ouj>&1DT;E*MCL5#mZ_mWv`Ha07R<jf~x%H9?$t`hHag3=&8pr}m*xyG<&fE2T`6p-KQ zfl~ecxPJ(cF{Lxr**nB|sk~loO;}HXQ#`O!N*rkudu%m%=yOUSh8RaPd)r#+%du!N zC|n#M28F9N#Gr7aoEQ{d;jW}pM*sl`0!aUox=4A5@!HJZcvVGRT%^3z%z>-M@6F6^ zZf`&B_xty+PESA7C{Me%YW!F;Q%&URbxQqS7hpHa%{5W`aZ<`h^+kQk09!ch>E$ET zHq+9{TMr+_gEPeV?U{+s-j$rU4|gEmRa|SCNn;2Q1Q38AfB;0VQ3D7t5kd$dgb+gW Z^#D09XJ}ty*v9|>002ovPDHLkV1hC4S`YvL diff --git a/searx/static/default/img/search-icon.png b/searx/static/default/img/search-icon.png index 1222421b293509aca43f8b01eab6e43ed114c3db..d70310b5d834ba3527f4f4822166735a550c0919 100644 GIT binary patch delta 2280 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 Q%m4rY07*qoM6N<$fw;MNHr>R0lA3oT{;jC@%Q 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 delta 7585 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 Date: Sun, 26 Oct 2014 11:14:05 +0100 Subject: [PATCH 3/4] [mod] default template modifications - more smartphone friendly - more text browser friendly - next button always on the right - in case of small screen supporting touch event, categories are displayed on one line with a scroll --- searx/static/default/css/style.css | 2 +- searx/static/default/js/searx.js | 4 + searx/static/default/less/style.less | 104 ++++++++++++++---- searx/templates/default/base.html | 8 +- searx/templates/default/categories.html | 8 +- searx/templates/default/index.html | 3 +- searx/templates/default/infobox.html | 2 +- .../default/result_templates/default.html | 11 +- .../default/result_templates/videos.html | 8 +- searx/templates/default/results.html | 6 +- searx/templates/default/search.html | 2 +- 11 files changed, 110 insertions(+), 48 deletions(-) diff --git a/searx/static/default/css/style.css b/searx/static/default/css/style.css index dcf7f08df..be98f6df9 100644 --- a/searx/static/default/css/style.css +++ b/searx/static/default/css/style.css @@ -1 +1 @@ -html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6}.search .checkbox_container label:hover{border-bottom:2px solid #3498db}.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx.png') no-repeat;width:100%;background-position:center}div.title h1{visibility:hidden}input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.result{margin:19px 0 18px 0;padding:0;clear:both}.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline}.result_title a:visited{color:#8e44ad}.cache_link{font-size:10px !important}.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0}.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .content br.last{clear:both}.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b}.result .published_date{font-size:.8em;color:#888;margin:5px 20px}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.definition_result{border-left:10px solid #808080;padding-left:3px}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#sidebar input[type="submit"]{text-decoration:underline}#suggestions,#answers{margin-top:20px}#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline}#suggestions form,#answers form,#infoboxes form{display:inline}#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#infoboxes .infobox br{clear:both}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both}#apis{margin-top:8px;clear:both}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.right{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis{display:none}#search_url{display:none}.result{border-top:1px solid #e8e7e6;margin:7px 0 6px 0}.image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff} \ No newline at end of file +html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6}.search .checkbox_container label:hover{border-bottom:2px solid #3498db}.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden}input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.result{margin:19px 0 18px 0;padding:0;clear:both}.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline}.result_title a:visited{color:#8e44ad}.cache_link{font-size:10px !important}.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0}.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .content br.last{clear:both}.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b}.result .published_date{font-size:.8em;color:#888;Margin:5px 20px}.result .thumbnail{width:400px}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.definition_result{border-left:10px solid #808080;padding-left:3px}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#sidebar input[type="submit"]{text-decoration:underline}#suggestions span{display:block}#suggestions,#answers{margin-top:20px}#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline}#suggestions form,#answers form,#infoboxes form{display:inline-block;min-width:210px}#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#infoboxes .infobox br{clear:both}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both}#pagination br{clear:both}#apis{margin-top:8px;clear:both}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#suggestions,#answers{margin-top:5px}#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis{display:none}#search_url{display:none}.result{border-top:1px solid #e8e7e6;margin:8px 0 8px 0}.result .thumbnail{max-width:98%}.image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff} \ No newline at end of file diff --git a/searx/static/default/js/searx.js b/searx/static/default/js/searx.js index c87dc30d4..9be969bb3 100644 --- a/searx/static/default/js/searx.js +++ b/searx/static/default/js/searx.js @@ -41,5 +41,9 @@ if(searx.autocompleter) { } }); + if (!!('ontouchstart' in window)) { + document.getElementsByTagName("html")[0].className += " touch"; + } + })(window, document); diff --git a/searx/static/default/less/style.less b/searx/static/default/less/style.less index 286a1d045..d72c92234 100644 --- a/searx/static/default/less/style.less +++ b/searx/static/default/less/style.less @@ -97,6 +97,7 @@ h1 { div.title { background: url('../img/searx.png') no-repeat; width: 100%; + min-height: 80px; background-position: center; h1 { @@ -261,8 +262,12 @@ a { .published_date { font-size: 0.8em; color: @color-result-publishdate-font; - margin: 5px 20px; + Margin: 5px 20px; } + + .thumbnail { + width: 400px; + } } .engines { @@ -396,6 +401,14 @@ tr { } } +#suggestions { + + span { + display: block; + } + +} + #suggestions, #answers { margin-top: 20px; @@ -419,7 +432,8 @@ tr { } form { - display: inline; + display: inline-block; + min-width: 210px; } } @@ -437,6 +451,7 @@ tr { border: 1px solid #ddd; padding: 5px; font-size: 0.8em; + /* box-shadow: 0px 0px 5px #CCC; */ img { max-width: 20em; @@ -502,6 +517,10 @@ tr { #pagination { clear: both; + + br { + clear: both; + } } #apis { @@ -531,7 +550,7 @@ tr { } } - .right { + .preferences_container { display: none; postion: fixed !important; top: 100px; @@ -542,20 +561,61 @@ tr { @media screen and (max-width: 75em) { - #infoboxes { - position: inherit; - max-width: inherit; - - .infobox { - clear:both; - - img { - float: left; - max-width: 10em; - } - } + div.title { - } + h1 { + font-size: 1em; + } + } + + html.touch #categories { + width: 95%; + height: 30px; + text-align: left; + overflow-x: scroll; + overflow-y: hidden; + -webkit-overflow-scrolling: touch; + + #categories_container { + width: 1000px; + width: -moz-max-content; + width: -webkit-max-content; + width: max-content; + + .checkbox_container { + display: inline-block; + width: auto; + } + } + } + + #categories { + font-size: 90%; + clear: both; + + .checkbox_container { + margin-top: 2px; + margin: auto; + } + } + + #suggestions, #answers { + margin-top: 5px; + } + + #infoboxes { + position: inherit; + max-width: inherit; + + .infobox { + clear:both; + + img { + float: left; + max-width: 10em; + } + } + } #categories { font-size: 90%; @@ -584,13 +644,17 @@ tr { display: none; } - #search_url { - display: none; - } + #search_url { + display: none; + } .result { border-top: 1px solid @color-result-top-border; - margin: 7px 0 6px 0; + margin: 8px 0 8px 0; + + .thumbnail { + max-width: 98%; + } } .image_result { diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html index da5ae905f..c231bf8cc 100644 --- a/searx/templates/default/base.html +++ b/searx/templates/default/base.html @@ -13,10 +13,6 @@ {% block head %} {% endblock %} -
@@ -26,6 +22,10 @@ {% endif %} +
diff --git a/searx/templates/default/categories.html b/searx/templates/default/categories.html index 57e63c85d..341e234a3 100644 --- a/searx/templates/default/categories.html +++ b/searx/templates/default/categories.html @@ -1,7 +1,9 @@
+
{% for category in categories %} -
- -
+
+ +
{% endfor %} +
diff --git a/searx/templates/default/index.html b/searx/templates/default/index.html index b4f55608b..72fbec8ca 100644 --- a/searx/templates/default/index.html +++ b/searx/templates/default/index.html @@ -1,6 +1,5 @@ {% extends "default/base.html" %} {% block content %} -{% include 'default/github_ribbon.html' %}

searx

{% include 'default/search.html' %} @@ -9,4 +8,6 @@ {{ _('preferences') }}

+{% include 'default/github_ribbon.html' %} {% endblock %} + diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html index f963e898c..d03b008f9 100644 --- a/searx/templates/default/infobox.html +++ b/searx/templates/default/infobox.html @@ -2,7 +2,7 @@

{{ infobox.infobox }}

{% if infobox.img_src %}{% endif %}

{{ infobox.entity }}

-

{{ infobox.content }}

+

{{ infobox.content | safe }}

{% if infobox.attributes %}
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 78221aa01..d0e725ac5 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,13 +1,6 @@
- - {% if result['favicon'] %} - - {% endif %} - -
-

{{ result.title|safe }}

+

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

- {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} + {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

-
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 8ceb0b180..233a6c021 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,12 +1,8 @@
- {% if result['favicon'] %} - - {% endif %} -

-

{{ result.title|safe }}

+

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} -  {{ result.title }} +  {{ result.title }}

{{ result.url }}

diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html index b66d6e2af..541983532 100644 --- a/searx/templates/default/results.html +++ b/searx/templates/default/results.html @@ -1,7 +1,7 @@ {% extends "default/base.html" %} {% block title %}{{ q }} - {% endblock %} {% block content %} - + @@ -80,7 +80,7 @@ {% endif %} -
+
{% for category in selected_categories %} {% endfor %} @@ -89,6 +89,8 @@
+ +
{% endif %} diff --git a/searx/templates/default/search.html b/searx/templates/default/search.html index 8a9965582..75cfa41d6 100644 --- a/searx/templates/default/search.html +++ b/searx/templates/default/search.html @@ -1,6 +1,6 @@
- +
{% include 'default/categories.html' %} From 8534d8b87a02cf7713d071fa0837734f7d620b51 Mon Sep 17 00:00:00 2001 From: dalf Date: Sun, 26 Oct 2014 12:01:54 +0100 Subject: [PATCH 4/4] [fix] test : the icon is included inside the

element --- searx/tests/test_webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index 9cf586180..7771567f0 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

First Test

', # noqa + '

First Test

', # noqa result.data ) self.assertIn(