From e181fd8f56fbc29f01aa6efa0d2de78c5d533166 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Thu, 20 Mar 2014 11:08:55 +0100 Subject: [PATCH] edit style of autcompleter --- searx/static/css/style.css | 23 +++---- searx/static/less/autocompleter.less | 32 +++++---- searx/static/less/definitions.less | 14 ++++ searx/static/less/style.less | 99 +++------------------------- 4 files changed, 50 insertions(+), 118 deletions(-) diff --git a/searx/static/css/style.css b/searx/static/css/style.css index 40b58d669..ac1ae0f07 100644 --- a/searx/static/css/style.css +++ b/searx/static/css/style.css @@ -1,10 +1,15 @@ -ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #7c7c7c;border-left-color:#c3c3c3;border-right-color:#c3c3c3;border-bottom-color:#ddd;background-color:#fff;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff}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} -.autocompleter-loading{background-repeat:no-repeat;background-position:right 50%} -textarea.autocompleter-loading{background-position:right bottom} 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{background:#ecf0f1;padding:0;margin:0}.search .checkbox_container label{border-bottom:4px solid #e8e7e6} +.search .checkbox_container label:hover{border-bottom:4px solid #3498db} +.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:4px solid #2980b9} +#search_wrapper{position:relative;max-width:600px;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:680px){#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} @@ -24,9 +29,6 @@ fieldset{margin:8px;border:1px solid #3498db} .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} -.search .checkbox_container label{border-bottom:4px solid #e8e7e6} -.search .checkbox_container label:hover{border-bottom:4px solid #3498db} -.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:4px solid #2980b9} .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} @@ -43,7 +45,6 @@ a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad} .engines{color:#888} .small_font{font-size:.8em} .small p{margin:2px 0} -.search{background:#ecf0f1;padding:0;margin:0} .right{float:right} .invisible{display:none} .left{float:left} @@ -56,10 +57,6 @@ a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad} table{width:100%} td{padding:0 4px} tr:hover{background:#ddd} -#search_wrapper{position:relative;max-width:600px;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} #results{margin:10px;padding:0;margin-bottom:20px} #sidebar{position:absolute;left:54em;width:15em;margin:0 2px 5px 5px;padding:0 2px 2px 2px} #suggestions span{display:block;margin:0 2px 2px 2px;padding:0} @@ -69,5 +66,5 @@ tr:hover{background:#ddd} #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:60em){#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto} #suggestions span{display:inline;font-size:.8em} #suggestions form{display:inline} #suggestions input{padding:2px 6px;margin:2px 4px;font-size:.8em;display:inline-block;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}}@media screen and (max-width:680px){#search_wrapper{width:90%;clear:both;overflow:hidden} .right{display:none;postion:fixed !important;top:100px;right:0} #apis{display:none} #categories{font-size:80%;clear:both}#categories .checkbox_container{margin-top:2px;margin:0 2px} .checkbox_container{display:block;width:100%}.checkbox_container label{border-bottom:0} .result{border-top:1px solid #e8e7e6;margin:7px 0 6px 0}.result img{max-width:90%;width:auto;height:auto}}.favicon{float:left;margin-right:4px;margin-top:2px} +@media screen and (max-width:60em){#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto} #suggestions span{display:inline;font-size:.8em} #suggestions form{display:inline} #suggestions input{padding:2px 6px;margin:2px 4px;font-size:.8em;display:inline-block;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}}@media screen and (max-width:680px){.right{display:none;postion:fixed !important;top:100px;right:0} #apis{display:none} #categories{font-size:80%;clear:both}#categories .checkbox_container{margin-top:2px;margin:0 2px} .checkbox_container{display:block;width:100%}.checkbox_container label{border-bottom:0} .result{border-top:1px solid #e8e7e6;margin:7px 0 6px 0}.result img{max-width:90%;width:auto;height:auto}}.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} diff --git a/searx/static/less/autocompleter.less b/searx/static/less/autocompleter.less index 2633facb9..db9601aeb 100644 --- a/searx/static/less/autocompleter.less +++ b/searx/static/less/autocompleter.less @@ -1,19 +1,23 @@ +/* + * searx, A privacy-respecting, hackable metasearch engine + */ + ul { &.autocompleter-choices { position: absolute; margin: 0; padding: 0; list-style: none; - border: 1px solid #7c7c7c; - border-left-color: #c3c3c3; - border-right-color: #c3c3c3; - border-bottom-color: #ddd; - background-color: #fff; + border: 1px solid @color-autocompleter-choices-border; + border-left-color: @color-autocompleter-choices-border-left-right; + border-right-color: @color-autocompleter-choices-border-left-right; + border-bottom-color: @color-autocompleter-choices-border-bottom; text-align: left; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; z-index: 50; - background-color: #fff; - + background-color: @color-autocompleter-choices-background; + color: @color-autocompleter-choices-font; + li { position: relative; margin: -2px 0 0 0; @@ -27,11 +31,11 @@ ul { line-height: 1.5em; &.autocompleter-selected { - background-color: #444; - color: #fff; + background-color: @color-autocompleter-selected-background; + color: @color-autocompleter-selected-font; span.autocompleter-queried { - color: #9FCFFF; + color: @color-autocompleter-selected-queried-font; } } } @@ -46,12 +50,12 @@ ul { } } -.autocompleter-loading { +/*.autocompleter-loading { //background-image: url(images/spinner.gif); background-repeat: no-repeat; background-position: right 50%; -} +}*/ -textarea.autocompleter-loading { +/*textarea.autocompleter-loading { background-position: right bottom; -} +}*/ diff --git a/searx/static/less/definitions.less b/searx/static/less/definitions.less index 2d85f7815..289b8cbc2 100644 --- a/searx/static/less/definitions.less +++ b/searx/static/less/definitions.less @@ -33,6 +33,20 @@ @color-search-background: #FFF; @color-search-font: #222; +/// Autocompleter + +@color-autocompleter-choices-background: #FFF; +@color-autocompleter-choices-border: @color-base; +@color-autocompleter-choices-border-left-right: @color-base; +@color-autocompleter-choices-border-bottom: @color-base; + +@color-autocompleter-choices-font: #444; + +// Selected +@color-autocompleter-selected-background: #444; +@color-autocompleter-selected-font: #FFF; +@color-autocompleter-selected-queried-font: #9FCFFF; + /// Categories @color-categories-item-selected: @color-base; diff --git a/searx/static/less/style.less b/searx/static/less/style.less index 0b663fa03..8653e6e68 100644 --- a/searx/static/less/style.less +++ b/searx/static/less/style.less @@ -8,10 +8,6 @@ @import "mixins.less"; -// Autocompleter - -@import "autocompleter.less"; - // Main LESS-Code html { @@ -34,6 +30,14 @@ body, #container { top: 0; } +// Search-Field + +@import "search.less"; + +// Autocompleter + +@import "autocompleter.less"; + .row { max-width: 800px; margin: 20px auto; @@ -149,20 +153,6 @@ fieldset { color: @color-categories-item-selected-font; } -.search { - .checkbox_container label { - border-bottom: 4px solid @color-categories-item-border-unselected; - } - - .checkbox_container label:hover { - border-bottom: 4px solid @color-categories-item-border-unselected-hover; - } - - .checkbox_container input[type="checkbox"]:checked + label { - border-bottom: 4px solid @color-categories-item-border-selected; - } -} - .engine_checkbox { padding: 4px; } @@ -272,12 +262,6 @@ a { margin: 2px 0; } -.search { - background: @color-result-search-background; - padding: 0; - margin: 0 -} - .right { float: right; } @@ -360,46 +344,6 @@ tr { } } -#search_wrapper { - position: relative; - max-width: 600px; - padding: 10px; -} - -.center #search_wrapper { - margin-left: auto; - margin-right: auto; -} - -.q { - background: none repeat scroll 0 0 @color-search-background; - border: 1px solid @color-search-border; - color: @color-search-font; - font-size: 16px; - height: 28px; - margin: 0; - outline: medium none; - padding: 2px; - padding-left: 8px; - padding-right: 0px !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: 0.8; - width: 24px; - height: 30px; - font-size: 0; -} - #results { margin: 10px; padding: 0; @@ -510,12 +454,6 @@ tr { } @media screen and (max-width: 680px) { - #search_wrapper { - width: 90%; - clear:both; - overflow: hidden - } - .right { display: none; postion: fixed !important; @@ -578,24 +516,3 @@ tr { color: @color-settings-return-font; } } - -/*#search_autocompleter { - border: 1px solid #3498DB; - position: absolute; - top: 43px; - width:100%; - background:#FFF; - z-index:2; - - p { - border-bottom: 1px solid #ccc; - } -}*/ - -/*#search_input { -position: relative; -} - -#search_form { - -}*/