diff options
Diffstat (limited to 'searx/static/themes/oscar')
63 files changed, 1328 insertions, 730 deletions
diff --git a/searx/static/themes/oscar/README.rst b/searx/static/themes/oscar/README.rst index e7daa87..1a226bc 100644 --- a/searx/static/themes/oscar/README.rst +++ b/searx/static/themes/oscar/README.rst @@ -15,3 +15,42 @@ run this command in the directory ``searx/static/themes/oscar`` or in the root directory: ``make grunt`` + +directory structure +~~~~~~~~~~~~~~~~~~~ + +see: + +- gruntfile.js +- package.json + +************* +css directory +************* + +- ``bootstrap*``: bootstrap NPM package, +- ``leaflet.*``: leaflet NPM package +- ``leaflet.min.css``: minimized version of ``leaflet.css`` (see gruntfile.js) +- ``logicodev.*``: compiled from ``src/less/logicodev`` +- ``logicodev-dark*``: compiled from ``src/less/logicodev-dark`` +- ``pointhi*``: compiled from ``src/less/pointhi`` +- ``images``: leaflet NPM package + +************** +font directory +************** + +- from bootstrap NPM package + +************ +js directory +************ + +- ``searx.*``: compiled from ``src/js`` +- other files are from NPM packages + +************* +img directory +************* + +- images for the oscar theme diff --git a/searx/static/themes/oscar/css/images/layers-2x.png b/searx/static/themes/oscar/css/images/layers-2x.png Binary files differnew file mode 100644 index 0000000..200c333 --- /dev/null +++ b/searx/static/themes/oscar/css/images/layers-2x.png diff --git a/searx/static/themes/oscar/css/images/layers.png b/searx/static/themes/oscar/css/images/layers.png Binary files differnew file mode 100644 index 0000000..1a72e57 --- /dev/null +++ b/searx/static/themes/oscar/css/images/layers.png diff --git a/searx/static/themes/oscar/css/images/marker-icon-2x.png b/searx/static/themes/oscar/css/images/marker-icon-2x.png Binary files differnew file mode 100644 index 0000000..88f9e50 --- /dev/null +++ b/searx/static/themes/oscar/css/images/marker-icon-2x.png diff --git a/searx/static/themes/oscar/css/images/marker-icon.png b/searx/static/themes/oscar/css/images/marker-icon.png Binary files differnew file mode 100644 index 0000000..950edf2 --- /dev/null +++ b/searx/static/themes/oscar/css/images/marker-icon.png diff --git a/searx/static/themes/oscar/css/images/marker-shadow.png b/searx/static/themes/oscar/css/images/marker-shadow.png Binary files differnew file mode 100644 index 0000000..9fd2979 --- /dev/null +++ b/searx/static/themes/oscar/css/images/marker-shadow.png diff --git a/searx/static/themes/oscar/css/pointhi.css b/searx/static/themes/oscar/css/pointhi.css new file mode 100644 index 0000000..c648f2b --- /dev/null +++ b/searx/static/themes/oscar/css/pointhi.css @@ -0,0 +1,693 @@ +html { + position: relative; + min-height: 100%; +} +body { + /* Margin bottom by footer height */ + margin-bottom: 80px; +} +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: 60px; +} +input[type=checkbox]:checked + .label_hide_if_checked, +input[type=checkbox]:checked + .label_hide_if_not_checked + .label_hide_if_checked { + display: none; +} +input[type=checkbox]:not(:checked) + .label_hide_if_not_checked, +input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not_checked { + display: none; +} +.onoff-checkbox { + width: 15%; +} +.onoffswitch { + position: relative; + width: 110px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; +} +.onoffswitch-checkbox { + display: none; +} +.onoffswitch-label { + display: block; + overflow: hidden; + cursor: pointer; + border: 2px solid #FFFFFF !important; + border-radius: 50px !important; +} +.onoffswitch-inner { + display: block; + transition: margin 0.3s ease-in 0s; +} +.onoffswitch-inner:before, +.onoffswitch-inner:after { + display: block; + float: left; + width: 50%; + height: 30px; + padding: 0; + line-height: 40px; + font-size: 20px; + box-sizing: border-box; + content: ""; + background-color: #EEEEEE; +} +.onoffswitch-switch { + display: block; + width: 37px; + background-color: #00CC00; + position: absolute; + top: 0; + bottom: 0; + right: 0px; + border: 2px solid #FFFFFF !important; + border-radius: 50px !important; + transition: all 0.3s ease-in 0s; +} +.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner { + margin-right: 0; +} +.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch { + right: 71px; + background-color: #A1A1A1; +} +.result_header { + margin-bottom: 5px; + margin-top: 20px; +} +.result_header .favicon { + margin-bottom: -3px; +} +.result_header a { + vertical-align: bottom; +} +.result_header a .highlight { + font-weight: bold; +} +.result-content { + margin-top: 5px; + word-wrap: break-word; +} +.result-content .highlight { + font-weight: bold; +} +.result-default { + clear: both; +} +.result-images { + float: left !important; + height: 138px; +} +.img-thumbnail { + margin: 5px; + max-height: 128px; +} +.result-videos { + clear: both; +} +.result-torrents { + clear: both; +} +.result-map { + clear: both; +} +.result-code { + clear: both; +} +.suggestion_item { + margin: 2px 5px; + max-width: 100%; +} +.suggestion_item .btn { + max-width: 100%; + white-space: normal; + word-wrap: break-word; + text-align: left; +} +.result_download { + margin-right: 5px; +} +#pagination { + margin-top: 30px; + padding-bottom: 50px; +} +.label-default { + color: #AAA; + background: #FFF; +} +.result .text-muted small { + word-wrap: break-word; +} +.modal-wrapper { + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); +} +.modal-wrapper { + background-clip: padding-box; + background-color: #fff; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + outline: 0 none; + position: relative; +} +.highlight { + font-weight: 700; +} +.infobox img { + max-height: 250px; +} +.infobox .infobox_part { + margin-bottom: 20px; + word-wrap: break-word; + table-layout: fixed; +} +.infobox .infobox_part:last-child { + margin-bottom: 0; +} +.infobox .header_url { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: block; +} +.infobox .infobox_toggle { + width: 100%; + text-align: center; + margin-bottom: 0px; +} +.infobox .infobox_checkbox ~ .infobox_body { + max-height: 300px; + overflow: hidden; +} +.infobox .infobox_checkbox:checked ~ .infobox_body { + max-height: none; +} +.infobox .infobox_checkbox ~ .infobox_toggle .infobox_label_down { + display: block; +} +.infobox .infobox_checkbox ~ .infobox_toggle .infobox_label_up { + display: none; +} +.infobox .infobox_checkbox:checked ~ .infobox_toggle .infobox_label_up { + display: block; +} +.infobox .infobox_checkbox:checked ~ .infobox_toggle .infobox_label_down { + display: none; +} +.infobox .infobox_checkbox ~ .infobox_body img.infobox_part { + display: none; +} +.infobox .infobox_checkbox:checked ~ .infobox_body img.infobox_part { + display: block; +} +.search_categories, +#categories { + text-transform: capitalize; + margin-bottom: 1.5rem; + margin-top: 1.5rem; + display: flex; + flex-wrap: wrap; + align-content: stretch; +} +.search_categories label, +#categories label, +.search_categories .input-group-addon, +#categories .input-group-addon { + flex-grow: 1; + flex-basis: auto; + font-size: 1.3rem; + font-weight: normal; + background-color: white; + border: #DDD 1px solid; + border-right: none; + color: #333; + padding-bottom: 0.8rem; + padding-top: 0.8rem; + text-align: center; + min-width: 50px; +} +.search_categories label:last-child, +#categories label:last-child, +.search_categories .input-group-addon:last-child, +#categories .input-group-addon:last-child { + border-right: #DDD 1px solid; +} +.search_categories input[type="checkbox"]:checked + label, +#categories input[type="checkbox"]:checked + label { + color: black; + font-weight: bold; + background-color: #EEE; +} +.visually-hidden { + position: absolute !important; + height: 1px; + width: 1px; + overflow: hidden; + clip: rect(1px 1px 1px 1px); + /* IE6, IE7 */ + clip: rect(1px, 1px, 1px, 1px); + white-space: nowrap; + /* added line */ +} +#advanced-search-container { + display: none; + text-align: center; + margin-bottom: 1rem; + clear: both; +} +#advanced-search-container label, +#advanced-search-container .input-group-addon { + font-size: 1.3rem; + font-weight: normal; + background-color: white; + border: #DDD 1px solid; + border-right: none; + color: #333; + padding-bottom: 0.8rem; + padding-left: 1.2rem; + padding-right: 1.2rem; +} +#advanced-search-container label:last-child, +#advanced-search-container .input-group-addon:last-child { + border-right: #DDD 1px solid; +} +#advanced-search-container input[type="radio"] { + display: none; +} +#advanced-search-container input[type="radio"]:checked + label { + color: black; + font-weight: bold; + background-color: #EEE; +} +#check-advanced { + display: none; +} +#check-advanced:checked ~ #advanced-search-container { + display: block; +} +.advanced { + padding: 0; + margin-top: 0.3rem; + text-align: right; +} +.advanced label, +.advanced select { + cursor: pointer; +} +.cursor-text { + cursor: text !important; +} +.cursor-pointer { + cursor: pointer !important; +} +/* + this file is generated automatically by searx_extra/update/update_pygments.py + using pygments version 2.8.0 +*/ +.code-highlight .linenos { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: default; + margin-right: 8px; + text-align: right; +} +.code-highlight .linenos::selection { + background: transparent; + /* WebKit/Blink Browsers */ +} +.code-highlight .linenos::-moz-selection { + background: transparent; + /* Gecko Browsers */ +} +.code-highlight pre { + line-height: 125%; +} +.code-highlight td.linenos .normal { + color: inherit; + background-color: transparent; + padding-left: 5px; + padding-right: 5px; +} +.code-highlight span.linenos { + color: inherit; + background-color: transparent; + padding-left: 5px; + padding-right: 5px; +} +.code-highlight td.linenos .special { + color: #000000; + background-color: #ffffc0; + padding-left: 5px; + padding-right: 5px; +} +.code-highlight span.linenos.special { + color: #000000; + background-color: #ffffc0; + padding-left: 5px; + padding-right: 5px; +} +.code-highlight .hll { + background-color: #ffffcc; +} +.code-highlight { + background: #f8f8f8; +} +.code-highlight .c { + color: #408080; + font-style: italic; +} +/* Comment */ +.code-highlight .err { + border: 1px solid #FF0000; +} +/* Error */ +.code-highlight .k { + color: #008000; + font-weight: bold; +} +/* Keyword */ +.code-highlight .o { + color: #666666; +} +/* Operator */ +.code-highlight .ch { + color: #408080; + font-style: italic; +} +/* Comment.Hashbang */ +.code-highlight .cm { + color: #408080; + font-style: italic; +} +/* Comment.Multiline */ +.code-highlight .cp { + color: #BC7A00; +} +/* Comment.Preproc */ +.code-highlight .cpf { + color: #408080; + font-style: italic; +} +/* Comment.PreprocFile */ +.code-highlight .c1 { + color: #408080; + font-style: italic; +} +/* Comment.Single */ +.code-highlight .cs { + color: #408080; + font-style: italic; +} +/* Comment.Special */ +.code-highlight .gd { + color: #A00000; +} +/* Generic.Deleted */ +.code-highlight .ge { + font-style: italic; +} +/* Generic.Emph */ +.code-highlight .gr { + color: #FF0000; +} +/* Generic.Error */ +.code-highlight .gh { + color: #000080; + font-weight: bold; +} +/* Generic.Heading */ +.code-highlight .gi { + color: #00A000; +} +/* Generic.Inserted */ +.code-highlight .go { + color: #888888; +} +/* Generic.Output */ +.code-highlight .gp { + color: #000080; + font-weight: bold; +} +/* Generic.Prompt */ +.code-highlight .gs { + font-weight: bold; +} +/* Generic.Strong */ +.code-highlight .gu { + color: #800080; + font-weight: bold; +} +/* Generic.Subheading */ +.code-highlight .gt { + color: #0044DD; +} +/* Generic.Traceback */ +.code-highlight .kc { + color: #008000; + font-weight: bold; +} +/* Keyword.Constant */ +.code-highlight .kd { + color: #008000; + font-weight: bold; +} +/* Keyword.Declaration */ +.code-highlight .kn { + color: #008000; + font-weight: bold; +} +/* Keyword.Namespace */ +.code-highlight .kp { + color: #008000; +} +/* Keyword.Pseudo */ +.code-highlight .kr { + color: #008000; + font-weight: bold; +} +/* Keyword.Reserved */ +.code-highlight .kt { + color: #B00040; +} +/* Keyword.Type */ +.code-highlight .m { + color: #666666; +} +/* Literal.Number */ +.code-highlight .s { + color: #BA2121; +} +/* Literal.String */ +.code-highlight .na { + color: #7D9029; +} +/* Name.Attribute */ +.code-highlight .nb { + color: #008000; +} +/* Name.Builtin */ +.code-highlight .nc { + color: #0000FF; + font-weight: bold; +} +/* Name.Class */ +.code-highlight .no { + color: #880000; +} +/* Name.Constant */ +.code-highlight .nd { + color: #AA22FF; +} +/* Name.Decorator */ +.code-highlight .ni { + color: #999999; + font-weight: bold; +} +/* Name.Entity */ +.code-highlight .ne { + color: #D2413A; + font-weight: bold; +} +/* Name.Exception */ +.code-highlight .nf { + color: #0000FF; +} +/* Name.Function */ +.code-highlight .nl { + color: #A0A000; +} +/* Name.Label */ +.code-highlight .nn { + color: #0000FF; + font-weight: bold; +} +/* Name.Namespace */ +.code-highlight .nt { + color: #008000; + font-weight: bold; +} +/* Name.Tag */ +.code-highlight .nv { + color: #19177C; +} +/* Name.Variable */ +.code-highlight .ow { + color: #AA22FF; + font-weight: bold; +} +/* Operator.Word */ +.code-highlight .w { + color: #bbbbbb; +} +/* Text.Whitespace */ +.code-highlight .mb { + color: #666666; +} +/* Literal.Number.Bin */ +.code-highlight .mf { + color: #666666; +} +/* Literal.Number.Float */ +.code-highlight .mh { + color: #666666; +} +/* Literal.Number.Hex */ +.code-highlight .mi { + color: #666666; +} +/* Literal.Number.Integer */ +.code-highlight .mo { + color: #666666; +} +/* Literal.Number.Oct */ +.code-highlight .sa { + color: #BA2121; +} +/* Literal.String.Affix */ +.code-highlight .sb { + color: #BA2121; +} +/* Literal.String.Backtick */ +.code-highlight .sc { + color: #BA2121; +} +/* Literal.String.Char */ +.code-highlight .dl { + color: #BA2121; +} +/* Literal.String.Delimiter */ +.code-highlight .sd { + color: #BA2121; + font-style: italic; +} +/* Literal.String.Doc */ +.code-highlight .s2 { + color: #BA2121; +} +/* Literal.String.Double */ +.code-highlight .se { + color: #BB6622; + font-weight: bold; +} +/* Literal.String.Escape */ +.code-highlight .sh { + color: #BA2121; +} +/* Literal.String.Heredoc */ +.code-highlight .si { + color: #BB6688; + font-weight: bold; +} +/* Literal.String.Interpol */ +.code-highlight .sx { + color: #008000; +} +/* Literal.String.Other */ +.code-highlight .sr { + color: #BB6688; +} +/* Literal.String.Regex */ +.code-highlight .s1 { + color: #BA2121; +} +/* Literal.String.Single */ +.code-highlight .ss { + color: #19177C; +} +/* Literal.String.Symbol */ +.code-highlight .bp { + color: #008000; +} +/* Name.Builtin.Pseudo */ +.code-highlight .fm { + color: #0000FF; +} +/* Name.Function.Magic */ +.code-highlight .vc { + color: #19177C; +} +/* Name.Variable.Class */ +.code-highlight .vg { + color: #19177C; +} +/* Name.Variable.Global */ +.code-highlight .vi { + color: #19177C; +} +/* Name.Variable.Instance */ +.code-highlight .vm { + color: #19177C; +} +/* Name.Variable.Magic */ +.code-highlight .il { + color: #666666; +} +/* Literal.Number.Integer.Long */ +.searx-navbar { + background: #eee; + color: #aaa; + height: 2.3rem; + font-size: 1.3rem; + line-height: 1.3rem; + padding: 0.5rem; + font-weight: bold; + margin-bottom: 1.3rem; +} +.searx-navbar a, +.searx-navbar a:hover { + margin-right: 2rem; + text-decoration: none; +} +.searx-navbar .instance a { + color: #444; + margin-left: 2rem; +} +.table > tbody > tr > td, +.table > tbody > tr > th { + vertical-align: middle !important; +} +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} +th:hover .engine-tooltip, +.engine-tooltip:hover { + display: inline-block; +} diff --git a/searx/static/themes/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js index b18c0bc..7c1f552 100644 --- a/searx/static/themes/oscar/gruntfile.js +++ b/searx/static/themes/oscar/gruntfile.js @@ -1,13 +1,66 @@ +/*jshint esversion: 6 */ module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), + copy: { + js: { + expand: true, + cwd: './node_modules', + dest: './js/', + flatten: true, + filter: 'isFile', + timestamp: true, + src: [ + './bootstrap/dist/js/bootstrap.min.js', + './corejs-typeahead/dist/typeahead.bundle.min.js', + './jquery/dist/jquery.min.js', + './leaflet/dist/leaflet.js', + ] + }, + css: { + expand: true, + cwd: './node_modules', + dest: './css/', + flatten: true, + filter: 'isFile', + timestamp: true, + src: [ + './bootstrap/dist/css/bootstrap-theme.css', + './bootstrap/dist/css/bootstrap-theme.min.css', + './bootstrap/dist/css/bootstrap-theme.min.css.map', + './leaflet/dist/leaflet.css', + ] + }, + fonts: { + expand: true, + cwd: './node_modules', + dest: './fonts/', + flatten: true, + filter: 'isFile', + timestamp: true, + src: [ + './bootstrap/dist/fonts/glyphicons-*.*', + ] + }, + leaflet_images: { + expand: true, + cwd: './node_modules', + dest: './css/images/', + flatten: true, + filter: 'isFile', + timestamp: true, + src: [ + './leaflet/dist/images/*.png', + ] + } + }, concat: { options: { separator: ';' }, dist: { - src: ['js/searx_src/*.js'], + src: ['src/js/*.js'], dest: 'js/searx.js' } }, @@ -36,33 +89,36 @@ module.exports = function(grunt) { } }, less: { - development: { - options: { - paths: ["less/pointhi", "less/logicodev", "less/logicodev-dark"] - }, - files: {"css/pointhi.css": "less/pointhi/oscar.less", - "css/logicodev.css": "less/logicodev-dark/oscar.less", - "css/logicodev-dark.css": "less/logicodev/oscar.less"} - }, - production: { - options: { - paths: ["less/pointhi", "less/logicodev", "less/logicodev-dark"], - cleancss: true - }, - files: {"css/pointhi.min.css": "less/pointhi/oscar.less", - "css/logicodev.min.css": "less/logicodev/oscar.less", - "css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"} + development: { + options: { + paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark", "src/less/bootstrap"] }, - /* - // built with ./manage.sh styles - bootstrap: { - options: { - paths: ["less/bootstrap"], - cleancss: true - }, - files: {"css/bootstrap.min.css": "less/bootstrap/bootstrap.less"} + files: { + "css/bootstrap.css": "src/less/bootstrap/bootstrap.less", + "css/pointhi.css": "src/less/pointhi/oscar.less", + "css/logicodev.css": "src/less/logicodev-dark/oscar.less", + "css/logicodev-dark.css": "src/less/logicodev/oscar.less" + } + }, + production: { + options: { + paths: ["src/less/pointhi", "src/less/logicodev", "src/less/logicodev-dark", "src/less/bootstrap"], + plugins: [ + new (require('less-plugin-clean-css'))() + ], + sourceMap: true, + sourceMapURL: (name) => { const s = name.split('/'); return s[s.length - 1] + '.map';}, + outputSourceFiles: false, + sourceMapRootpath: '../' }, - */ + files: { + "css/bootstrap.min.css": "css/bootstrap.css", + "css/leaflet.min.css": "css/leaflet.css", + "css/pointhi.min.css": "src/less/pointhi/oscar.less", + "css/logicodev.min.css": "src/less/logicodev/oscar.less", + "css/logicodev-dark.min.css": "src/less/logicodev-dark/oscar.less" + } + }, }, watch: { scripts: { @@ -70,7 +126,7 @@ module.exports = function(grunt) { tasks: ['jshint', 'concat', 'uglify'] }, oscar_styles: { - files: ['less/pointhi/**/*.less'], + files: ['src/less/pointhi/**/*.less'], tasks: ['less:development', 'less:production'] }, bootstrap_styles: { @@ -80,6 +136,7 @@ module.exports = function(grunt) { } }); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-watch'); @@ -88,7 +145,7 @@ module.exports = function(grunt) { grunt.registerTask('test', ['jshint']); - grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']); + grunt.registerTask('default', ['copy', 'jshint', 'concat', 'uglify', 'less']); grunt.registerTask('styles', ['less']); diff --git a/searx/static/themes/oscar/img/map/layers-2x.png b/searx/static/themes/oscar/img/map/layers-2x.png Binary files differdeleted file mode 100644 index 0b30da6..0000000 --- a/searx/static/themes/oscar/img/map/layers-2x.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/layers.png b/searx/static/themes/oscar/img/map/layers.png Binary files differdeleted file mode 100644 index 4297fd9..0000000 --- a/searx/static/themes/oscar/img/map/layers.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-green.png b/searx/static/themes/oscar/img/map/marker-icon-2x-green.png Binary files differdeleted file mode 100644 index 7446bb0..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-2x-green.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png b/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png Binary files differdeleted file mode 100644 index ecd6773..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-2x-orange.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x-red.png b/searx/static/themes/oscar/img/map/marker-icon-2x-red.png Binary files differdeleted file mode 100644 index 1d2e197..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-2x-red.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-2x.png b/searx/static/themes/oscar/img/map/marker-icon-2x.png Binary files differdeleted file mode 100644 index 0015b64..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-2x.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-green.png b/searx/static/themes/oscar/img/map/marker-icon-green.png Binary files differdeleted file mode 100644 index f48ef41..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-green.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-orange.png b/searx/static/themes/oscar/img/map/marker-icon-orange.png Binary files differdeleted file mode 100644 index d0d2220..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-orange.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon-red.png b/searx/static/themes/oscar/img/map/marker-icon-red.png Binary files differdeleted file mode 100644 index 7a92b9e..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon-red.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-icon.png b/searx/static/themes/oscar/img/map/marker-icon.png Binary files differdeleted file mode 100644 index e2e9f75..0000000 --- a/searx/static/themes/oscar/img/map/marker-icon.png +++ /dev/null diff --git a/searx/static/themes/oscar/img/map/marker-shadow.png b/searx/static/themes/oscar/img/map/marker-shadow.png Binary files differdeleted file mode 100644 index d1e773c..0000000 --- a/searx/static/themes/oscar/img/map/marker-shadow.png +++ /dev/null diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js deleted file mode 100644 index 8208ce4..0000000 --- a/searx/static/themes/oscar/js/searx.js +++ /dev/null @@ -1,401 +0,0 @@ -/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -requirejs.config({ - baseUrl: './static/themes/oscar/js', - paths: { - app: '../app' - } -}); -;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2019 by Alexandre Flament - */ -window.searx = (function(d) { - 'use strict'; - - // add data- properties - var script = d.currentScript || (function() { - var scripts = d.getElementsByTagName('script'); - return scripts[scripts.length - 1]; - })(); - - return { - autocompleter: script.getAttribute('data-autocompleter') === 'true', - method: script.getAttribute('data-method') - }; -})(document); -;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -if(searx.autocompleter) { - searx.searchResults = new Bloodhound({ - datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), - queryTokenizer: Bloodhound.tokenizers.whitespace, - remote: './autocompleter?q=%QUERY' - }); - searx.searchResults.initialize(); -} - -$(document).ready(function(){ - var original_search_value = ''; - if(searx.autocompleter) { - $("#q").on('keydown', function(e) { - if(e.which == 13) { - original_search_value = $('#q').val(); - } - }); - $('#q').typeahead(null, { - name: 'search-results', - displayKey: function(result) { - return result; - }, - source: searx.searchResults.ttAdapter() - }); - $('#q').bind('typeahead:selected', function(ev, suggestion) { - if(original_search_value) { - $('#q').val(original_search_value); - } - $("#search_form").submit(); - }); - } -}); -;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -$(document).ready(function(){ - /** - * focus element if class="autofocus" and id="q" - */ - $('#q.autofocus').focus(); - - /** - * Empty search bar when click on reset button - */ - $("#clear_search").click(function () { - document.getElementById("q").value = ""; - }); - - /** - * select full content on click if class="select-all-on-click" - */ - $(".select-all-on-click").click(function () { - $(this).select(); - }); - - /** - * change text during btn-collapse click if possible - */ - $('.btn-collapse').click(function() { - var btnTextCollapsed = $(this).data('btn-text-collapsed'); - var btnTextNotCollapsed = $(this).data('btn-text-not-collapsed'); - - if(btnTextCollapsed !== '' && btnTextNotCollapsed !== '') { - if($(this).hasClass('collapsed')) { - new_html = $(this).html().replace(btnTextCollapsed, btnTextNotCollapsed); - } else { - new_html = $(this).html().replace(btnTextNotCollapsed, btnTextCollapsed); - } - $(this).html(new_html); - } - }); - - /** - * change text during btn-toggle click if possible - */ - $('.btn-toggle .btn').click(function() { - var btnClass = 'btn-' + $(this).data('btn-class'); - var btnLabelDefault = $(this).data('btn-label-default'); - var btnLabelToggled = $(this).data('btn-label-toggled'); - if(btnLabelToggled !== '') { - if($(this).hasClass('btn-default')) { - new_html = $(this).html().replace(btnLabelDefault, btnLabelToggled); - } else { - new_html = $(this).html().replace(btnLabelToggled, btnLabelDefault); - } - $(this).html(new_html); - } - $(this).toggleClass(btnClass); - $(this).toggleClass('btn-default'); - }); - - /** - * change text during btn-toggle click if possible - */ - $('.media-loader').click(function() { - var target = $(this).data('target'); - var iframe_load = $(target + ' > iframe'); - var srctest = iframe_load.attr('src'); - if(srctest === undefined || srctest === false){ - iframe_load.attr('src', iframe_load.data('src')); - } - }); - - /** - * Select or deselect every categories on double clic - */ - $(".btn-sm").dblclick(function() { - var btnClass = 'btn-' + $(this).data('btn-class'); // primary - if($(this).hasClass('btn-default')) { - $(".btn-sm > input").attr('checked', 'checked'); - $(".btn-sm > input").prop("checked", true); - $(".btn-sm").addClass(btnClass); - $(".btn-sm").addClass('active'); - $(".btn-sm").removeClass('btn-default'); - } else { - $(".btn-sm > input").attr('checked', ''); - $(".btn-sm > input").removeAttr('checked'); - $(".btn-sm > input").checked = false; - $(".btn-sm").removeClass(btnClass); - $(".btn-sm").removeClass('active'); - $(".btn-sm").addClass('btn-default'); - } - }); - $(".nav-tabs").click(function(a) { - var tabs = $(a.target).parents("ul"); - tabs.children().attr("aria-selected", "false"); - $(a.target).parent().attr("aria-selected", "true"); - }); -}); -;window.addEventListener('load', function() { - // Hide infobox toggle if shrunk size already fits all content. - $('.infobox').each(function() { - var infobox_body = $(this).find('.infobox_body'); - var total_height = infobox_body.prop('scrollHeight') + infobox_body.find('img.infobox_part').height(); - var max_height = infobox_body.css('max-height').replace('px', ''); - if (total_height <= max_height) { - $(this).find('.infobox_toggle').hide(); - } - }); -}); -;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -$(document).ready(function(){ - $(".searx_overpass_request").on( "click", function( event ) { - var overpass_url = "https://overpass-api.de/api/interpreter?data="; - var query_start = overpass_url + "[out:json][timeout:25];("; - var query_end = ");out meta;"; - - var osm_id = $(this).data('osm-id'); - var osm_type = $(this).data('osm-type'); - var result_table = $(this).data('result-table'); - var result_table_loadicon = "#" + $(this).data('result-table-loadicon'); - - // tags which can be ignored - var osm_ignore_tags = [ "addr:city", "addr:country", "addr:housenumber", "addr:postcode", "addr:street" ]; - - if(osm_id && osm_type && result_table) { - result_table = "#" + result_table; - var query = null; - switch(osm_type) { - case 'node': - query = query_start + "node(" + osm_id + ");" + query_end; - break; - case 'way': - query = query_start + "way(" + osm_id + ");" + query_end; - break; - case 'relation': - query = query_start + "relation(" + osm_id + ");" + query_end; - break; - default: - break; - } - if(query) { - //alert(query); - var ajaxRequest = $.ajax( query ) - .done(function( html) { - if(html && html.elements && html.elements[0]) { - var element = html.elements[0]; - var newHtml = $(result_table).html(); - for (var row in element.tags) { - if(element.tags.name === null || osm_ignore_tags.indexOf(row) == -1) { - newHtml += "<tr><td>" + row + "</td><td>"; - switch(row) { - case "phone": - case "fax": - newHtml += "<a href=\"tel:" + element.tags[row].replace(/ /g,'') + "\">" + element.tags[row] + "</a>"; - break; - case "email": - newHtml += "<a href=\"mailto:" + element.tags[row] + "\">" + element.tags[row] + "</a>"; - break; - case "website": - case "url": - newHtml += "<a href=\"" + element.tags[row] + "\">" + element.tags[row] + "</a>"; - break; - case "wikidata": - newHtml += "<a href=\"https://www.wikidata.org/wiki/" + element.tags[row] + "\">" + element.tags[row] + "</a>"; - break; - case "wikipedia": - if(element.tags[row].indexOf(":") != -1) { - newHtml += "<a href=\"https://" + element.tags[row].substring(0,element.tags[row].indexOf(":")) + ".wikipedia.org/wiki/" + element.tags[row].substring(element.tags[row].indexOf(":")+1) + "\">" + element.tags[row] + "</a>"; - break; - } - /* jshint ignore:start */ - default: - /* jshint ignore:end */ - newHtml += element.tags[row]; - break; - } - newHtml += "</td></tr>"; - } - } - $(result_table).html(newHtml); - $(result_table).removeClass('hidden'); - $(result_table_loadicon).addClass('hidden'); - } - }) - .fail(function() { - $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>"); - }); - } - } - - // this event occour only once per element - $( this ).off( event ); - }); - - $(".searx_init_map").on( "click", function( event ) { - var leaflet_target = $(this).data('leaflet-target'); - var map_lon = $(this).data('map-lon'); - var map_lat = $(this).data('map-lat'); - var map_zoom = $(this).data('map-zoom'); - var map_boundingbox = $(this).data('map-boundingbox'); - var map_geojson = $(this).data('map-geojson'); - - require(['leaflet-0.7.3.min'], function(leaflet) { - if(map_boundingbox) { - southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); - northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); - map_bounds = L.latLngBounds(southWest, northEast); - } - - // TODO hack - // change default imagePath - L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; - - // init map - var map = L.map(leaflet_target); - - // create the tile layer with correct attribution - var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; - var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; - var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); - - var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'; - var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; - var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib}); - - // init map view - if(map_bounds) { - // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021 - setTimeout(function () { - map.fitBounds(map_bounds, { - maxZoom:17 - }); - }, 0); - } else if (map_lon && map_lat) { - if(map_zoom) - map.setView(new L.LatLng(map_lat, map_lon),map_zoom); - else - map.setView(new L.LatLng(map_lat, map_lon),8); - } - - map.addLayer(osmMapnik); - - var baseLayers = { - "OSM Mapnik": osmMapnik/*, - "OSM Wikimedia": osmWikimedia*/ - }; - - L.control.layers(baseLayers).addTo(map); - - - if(map_geojson) - L.geoJson(map_geojson).addTo(map); - /*else if(map_bounds) - L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ - }); - - // this event occour only once per element - $( this ).off( event ); - }); -}); -;$(document).ready(function(){ - $("#allow-all-engines").click(function() { - $(".onoffswitch-checkbox").each(function() { this.checked = false;}); - }); - - $("#disable-all-engines").click(function() { - $(".onoffswitch-checkbox").each(function() { this.checked = true;}); - }); -}); - diff --git a/searx/static/themes/oscar/js/searx.min.js.map b/searx/static/themes/oscar/js/searx.min.js.map deleted file mode 100644 index 4dd22d6..0000000 --- a/searx/static/themes/oscar/js/searx.min.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["searx.js"],"names":["requirejs","config","baseUrl","paths","app","window","searx","d","script","currentScript","scripts","getElementsByTagName","length","autocompleter","getAttribute","method","document","searchResults","Bloodhound","datumTokenizer","tokenizers","obj","whitespace","queryTokenizer","remote","initialize","$","ready","original_search_value","on","e","which","val","typeahead","name","displayKey","result","source","ttAdapter","bind","ev","suggestion","submit","focus","click","getElementById","value","this","select","btnTextCollapsed","data","btnTextNotCollapsed","hasClass","new_html","html","replace","btnClass","btnLabelDefault","btnLabelToggled","toggleClass","target","iframe_load","srctest","attr","undefined","dblclick","prop","addClass","removeClass","removeAttr","checked","a","parents","children","parent","addEventListener","each","infobox_body","find","height","css","hide","event","overpass_url","query_start","query_end","osm_id","osm_type","result_table","result_table_loadicon","osm_ignore_tags","query","ajax","done","elements","element","newHtml","row","tags","indexOf","substring","fail","could_not_load","off","leaflet_target","map_lon","map_lat","map_zoom","map_boundingbox","map_geojson","require","leaflet","southWest","L","latLng","northEast","map_bounds","latLngBounds","Icon","Default","imagePath","map","osmMapnikUrl","osmMapnikAttrib","osmMapnik","TileLayer","minZoom","maxZoom","attribution","osmWikimediaUrl","osmWikimediaAttrib","setTimeout","fitBounds","setView","LatLng","addLayer","baseLayers","OSM Mapnik","control","layers","addTo","geoJson"],"mappings":"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","file":"searx.min.js"}
\ No newline at end of file diff --git a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js deleted file mode 100644 index e7c2abd..0000000 --- a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -requirejs.config({ - baseUrl: './static/themes/oscar/js', - paths: { - app: '../app' - } -}); diff --git a/searx/static/themes/oscar/less/logicodev/code.less b/searx/static/themes/oscar/less/logicodev/code.less deleted file mode 100644 index 491b30e..0000000 --- a/searx/static/themes/oscar/less/logicodev/code.less +++ /dev/null @@ -1,101 +0,0 @@ -pre, code{ - font-family: 'Ubuntu Mono', 'Courier New', 'Lucida Console', monospace !important; -} - -.lineno{ - margin-right: 5px; -} - -.highlight .hll { background-color: #ffffcc } -.highlight { background: #f8f8f8; } -.highlight .c { color: #556366; font-style: italic } /* Comment */ -.highlight .err { border: 1px solid @orange } /* Error */ -.highlight .k { color: #BE74D5; font-weight: bold } /* Keyword */ -.highlight .o { color: #D19A66 } /* Operator */ -.highlight .cm { color: #556366; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #BC7A00 } /* Comment.Preproc */ -.highlight .c1 { color: #556366; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #556366; font-style: italic } /* Comment.Special */ -.highlight .gd { color: #A00000 } /* Generic.Deleted */ -.highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #FF0000 } /* Generic.Error */ -.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.highlight .gi { color: #00A000 } /* Generic.Inserted */ -.highlight .go { color: #888888 } /* Generic.Output */ -.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ -.highlight .gs { font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.highlight .gt { color: #0044DD } /* Generic.Traceback */ -.highlight .kc { color: #BE74D5; font-weight: bold } /* Keyword.Constant */ -.highlight .kd { color: #BE74D5; font-weight: bold } /* Keyword.Declaration */ -.highlight .kn { color: #BE74D5; font-weight: bold } /* Keyword.Namespace */ -.highlight .kp { color: #BE74D5 } /* Keyword.Pseudo */ -.highlight .kr { color: #BE74D5; font-weight: bold } /* Keyword.Reserved */ -.highlight .kt { color: #D46C72 } /* Keyword.Type */ -.highlight .m { color: #D19A66 } /* Literal.Number */ -.highlight .s { color: #86C372 } /* Literal.String */ -.highlight .na { color: #7D9029 } /* Name.Attribute */ -.highlight .nb { color: #BE74D5 } /* Name.Builtin */ -.highlight .nc { color: #61AFEF; font-weight: bold } /* Name.Class */ -.highlight .no { color: #D19A66 } /* Name.Constant */ -.highlight .nd { color: #AA22FF } /* Name.Decorator */ -.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ -.highlight .nf { color: #61AFEF } /* Name.Function */ -.highlight .nl { color: #A0A000 } /* Name.Label */ -.highlight .nn { color: #61AFEF; font-weight: bold } /* Name.Namespace */ -.highlight .nt { color: #BE74D5; font-weight: bold } /* Name.Tag */ -.highlight .nv { color: #DFC06F } /* Name.Variable */ -.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ -.highlight .w { color: #D7DAE0 } /* Text.Whitespace */ -.highlight .mf { color: #D19A66 } /* Literal.Number.Float */ -.highlight .mh { color: #D19A66 } /* Literal.Number.Hex */ -.highlight .mi { color: #D19A66 } /* Literal.Number.Integer */ -.highlight .mo { color: #D19A66 } /* Literal.Number.Oct */ -.highlight .sb { color: #86C372 } /* Literal.String.Backtick */ -.highlight .sc { color: #86C372 } /* Literal.String.Char */ -.highlight .sd { color: #86C372; font-style: italic } /* Literal.String.Doc */ -.highlight .s2 { color: #86C372 } /* Literal.String.Double */ -.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ -.highlight .sh { color: #86C372 } /* Literal.String.Heredoc */ -.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ -.highlight .sx { color: #BE74D5 } /* Literal.String.Other */ -.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ -.highlight .s1 { color: #86C372 } /* Literal.String.Single */ -.highlight .ss { color: #DFC06F } /* Literal.String.Symbol */ -.highlight .bp { color: #BE74D5 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #DFC06F } /* Name.Variable.Class */ -.highlight .vg { color: #DFC06F } /* Name.Variable.Global */ -.highlight .vi { color: #DFC06F } /* Name.Variable.Instance */ -.highlight .il { color: #D19A66 } /* Literal.Number.Integer.Long */ - -.highlight .lineno { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - cursor: default; - color: #556366; - - &::selection { - background: transparent; /* WebKit/Blink Browsers */ - } - &::-moz-selection { - background: transparent; /* Gecko Browsers */ - } -} - -.highlight pre { - background-color: #282C34; - color: #D7DAE0; - border: none; - margin-bottom: 25px; - font-size: 15px; - padding: 20px 10px; -} - -.highlight { - font-weight: 700; -} diff --git a/searx/static/themes/oscar/less/logicodev/preferences.less b/searx/static/themes/oscar/less/logicodev/preferences.less deleted file mode 100644 index 82ce163..0000000 --- a/searx/static/themes/oscar/less/logicodev/preferences.less +++ /dev/null @@ -1,15 +0,0 @@ -.table > tbody > tr > td, .table > tbody > tr > th { - vertical-align: middle !important; -} - -.nav-tabs.nav-justified{ - margin-bottom: 20px; -} - -p { - margin: 10px 0; -} - -input.cursor-text { - margin: 10px 0; -} diff --git a/searx/static/themes/oscar/less/pointhi/code.less b/searx/static/themes/oscar/less/pointhi/code.less deleted file mode 100644 index 70a2a5d..0000000 --- a/searx/static/themes/oscar/less/pointhi/code.less +++ /dev/null @@ -1,79 +0,0 @@ -.highlight .hll { background-color: #ffffcc } -.highlight { background: #f8f8f8; } -.highlight .c { color: #408080; font-style: italic } /* Comment */ -.highlight .err { border: 1px solid #FF0000 } /* Error */ -.highlight .k { color: #008000; font-weight: bold } /* Keyword */ -.highlight .o { color: #666666 } /* Operator */ -.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #BC7A00 } /* Comment.Preproc */ -.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ -.highlight .gd { color: #A00000 } /* Generic.Deleted */ -.highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #FF0000 } /* Generic.Error */ -.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.highlight .gi { color: #00A000 } /* Generic.Inserted */ -.highlight .go { color: #888888 } /* Generic.Output */ -.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ -.highlight .gs { font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.highlight .gt { color: #0044DD } /* Generic.Traceback */ -.highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ -.highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ -.highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ -.highlight .kp { color: #008000 } /* Keyword.Pseudo */ -.highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ -.highlight .kt { color: #B00040 } /* Keyword.Type */ -.highlight .m { color: #666666 } /* Literal.Number */ -.highlight .s { color: #BA2121 } /* Literal.String */ -.highlight .na { color: #7D9029 } /* Name.Attribute */ -.highlight .nb { color: #008000 } /* Name.Builtin */ -.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */ -.highlight .no { color: #880000 } /* Name.Constant */ -.highlight .nd { color: #AA22FF } /* Name.Decorator */ -.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ -.highlight .nf { color: #0000FF } /* Name.Function */ -.highlight .nl { color: #A0A000 } /* Name.Label */ -.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ -.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ -.highlight .nv { color: #19177C } /* Name.Variable */ -.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ -.highlight .w { color: #bbbbbb } /* Text.Whitespace */ -.highlight .mf { color: #666666 } /* Literal.Number.Float */ -.highlight .mh { color: #666666 } /* Literal.Number.Hex */ -.highlight .mi { color: #666666 } /* Literal.Number.Integer */ -.highlight .mo { color: #666666 } /* Literal.Number.Oct */ -.highlight .sb { color: #BA2121 } /* Literal.String.Backtick */ -.highlight .sc { color: #BA2121 } /* Literal.String.Char */ -.highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ -.highlight .s2 { color: #BA2121 } /* Literal.String.Double */ -.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ -.highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ -.highlight .sx { color: #008000 } /* Literal.String.Other */ -.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ -.highlight .s1 { color: #BA2121 } /* Literal.String.Single */ -.highlight .ss { color: #19177C } /* Literal.String.Symbol */ -.highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #19177C } /* Name.Variable.Class */ -.highlight .vg { color: #19177C } /* Name.Variable.Global */ -.highlight .vi { color: #19177C } /* Name.Variable.Instance */ -.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ - -.highlight .lineno { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - cursor: default; - - &::selection { - background: transparent; /* WebKit/Blink Browsers */ - } - &::-moz-selection { - background: transparent; /* Gecko Browsers */ - } -} diff --git a/searx/static/themes/oscar/less/pointhi/preferences.less b/searx/static/themes/oscar/less/pointhi/preferences.less deleted file mode 100644 index 9672d50..0000000 --- a/searx/static/themes/oscar/less/pointhi/preferences.less +++ /dev/null @@ -1,3 +0,0 @@ -.table > tbody > tr > td, .table > tbody > tr > th { - vertical-align: middle !important; -} diff --git a/searx/static/themes/oscar/package.json b/searx/static/themes/oscar/package.json index 5c01ef9..8a3d487 100644 --- a/searx/static/themes/oscar/package.json +++ b/searx/static/themes/oscar/package.json @@ -1,11 +1,13 @@ { "devDependencies": { - "grunt": "^0.4.5", - "grunt-contrib-concat": "~0.5.0", - "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-less": "~0.11.0", - "grunt-contrib-uglify": "~0.6.0", - "grunt-contrib-watch": "~0.6.1" + "grunt": "^1.3.0", + "grunt-cli": "^1.3.2", + "grunt-contrib-concat": "~1.0.1", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-jshint": "~3.0.0", + "grunt-contrib-less": "~3.0.0", + "grunt-contrib-uglify": "~5.0.0", + "grunt-contrib-watch": "~1.1.0" }, "scripts": { "build": "npm install && grunt", @@ -13,6 +15,9 @@ "test": "grunt" }, "dependencies": { - "grunt-cli": "^1.3.2" + "bootstrap": "^3.4.1", + "corejs-typeahead": "^1.3.1", + "jquery": "^3.6.0", + "leaflet": "^1.7.1" } } diff --git a/searx/static/themes/oscar/js/searx_src/01_init.js b/searx/static/themes/oscar/src/js/01_init.js index 690365c..dd8de4d 100644 --- a/searx/static/themes/oscar/js/searx_src/01_init.js +++ b/searx/static/themes/oscar/src/js/01_init.js @@ -25,6 +25,7 @@ window.searx = (function(d) { return { autocompleter: script.getAttribute('data-autocompleter') === 'true', - method: script.getAttribute('data-method') + method: script.getAttribute('data-method'), + translations: JSON.parse(script.getAttribute('data-translations')) }; })(document); diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/src/js/autocompleter.js index 26d5675..56293f4 100644 --- a/searx/static/themes/oscar/js/searx_src/autocompleter.js +++ b/searx/static/themes/oscar/src/js/autocompleter.js @@ -15,31 +15,42 @@ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> */ -if(searx.autocompleter) { - searx.searchResults = new Bloodhound({ - datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), - queryTokenizer: Bloodhound.tokenizers.whitespace, - remote: './autocompleter?q=%QUERY' - }); - searx.searchResults.initialize(); -} - $(document).ready(function(){ var original_search_value = ''; if(searx.autocompleter) { - $("#q").on('keydown', function(e) { + var searchResults = new Bloodhound({ + datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), + queryTokenizer: Bloodhound.tokenizers.whitespace, + remote: { + url: './autocompleter?q=%QUERY', + wildcard: '%QUERY' + } + }); + searchResults.initialize(); + + $("#q").on('keydown', function(e) { if(e.which == 13) { original_search_value = $('#q').val(); } }); - $('#q').typeahead(null, { + $('#q').typeahead({ name: 'search-results', + highlight: false, + hint: true, displayKey: function(result) { return result; }, - source: searx.searchResults.ttAdapter() + classNames: { + input: 'tt-input', + hint: 'tt-hint', + menu: 'tt-dropdown-menu', + dataset: 'tt-dataset-search-results', + }, + }, { + name: 'autocomplete', + source: searchResults, }); - $('#q').bind('typeahead:selected', function(ev, suggestion) { + $('#q').bind('typeahead:select', function(ev, suggestion) { if(original_search_value) { $('#q').val(original_search_value); } diff --git a/searx/static/themes/oscar/js/searx_src/element_modifiers.js b/searx/static/themes/oscar/src/js/element_modifiers.js index a113df9..a113df9 100644 --- a/searx/static/themes/oscar/js/searx_src/element_modifiers.js +++ b/searx/static/themes/oscar/src/js/element_modifiers.js diff --git a/searx/static/themes/oscar/js/searx_src/infobox.js b/searx/static/themes/oscar/src/js/infobox.js index cb7f1ee..cb7f1ee 100644 --- a/searx/static/themes/oscar/js/searx_src/infobox.js +++ b/searx/static/themes/oscar/src/js/infobox.js diff --git a/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/src/js/leaflet_map.js index 06931b4..83364b0 100644 --- a/searx/static/themes/oscar/js/searx_src/leaflet_map.js +++ b/searx/static/themes/oscar/src/js/leaflet_map.js @@ -90,7 +90,7 @@ $(document).ready(function(){ } }) .fail(function() { - $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>"); + $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+searx.translations.could_not_load+"</p>"); }); } } @@ -107,59 +107,54 @@ $(document).ready(function(){ var map_boundingbox = $(this).data('map-boundingbox'); var map_geojson = $(this).data('map-geojson'); - require(['leaflet-0.7.3.min'], function(leaflet) { - if(map_boundingbox) { - southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); - northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); - map_bounds = L.latLngBounds(southWest, northEast); - } + if(map_boundingbox) { + southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); + northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); + map_bounds = L.latLngBounds(southWest, northEast); + } - // TODO hack - // change default imagePath - L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; + // change default imagePath + L.Icon.Default.imagePath = "./static/themes/oscar/css/images/"; - // init map - var map = L.map(leaflet_target); + // init map + var map = L.map(leaflet_target); - // create the tile layer with correct attribution - var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; - var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; - var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); + // create the tile layer with correct attribution + var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; + var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; + var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); - var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'; - var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; - var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib}); + var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'; + var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; + var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib}); - // init map view + // init map view + setTimeout(function() { if(map_bounds) { - // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021 - setTimeout(function () { - map.fitBounds(map_bounds, { - maxZoom:17 - }); - }, 0); + map.fitBounds(map_bounds, { + maxZoom:17 + }); } else if (map_lon && map_lat) { if(map_zoom) map.setView(new L.LatLng(map_lat, map_lon),map_zoom); else map.setView(new L.LatLng(map_lat, map_lon),8); - } - - map.addLayer(osmMapnik); + } + }, 0); - var baseLayers = { - "OSM Mapnik": osmMapnik/*, - "OSM Wikimedia": osmWikimedia*/ - }; + map.addLayer(osmMapnik); - L.control.layers(baseLayers).addTo(map); + var baseLayers = { + "OSM Mapnik": osmMapnik/*, + "OSM Wikimedia": osmWikimedia*/ + }; + L.control.layers(baseLayers).addTo(map); - if(map_geojson) - L.geoJson(map_geojson).addTo(map); - /*else if(map_bounds) - L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ - }); + if(map_geojson) + L.geoJson(map_geojson).addTo(map); + /*else if(map_bounds) + L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ // this event occour only once per element $( this ).off( event ); diff --git a/searx/static/themes/oscar/js/searx_src/toggleall.js b/searx/static/themes/oscar/src/js/toggleall.js index b6c484e..b6c484e 100644 --- a/searx/static/themes/oscar/js/searx_src/toggleall.js +++ b/searx/static/themes/oscar/src/js/toggleall.js diff --git a/searx/static/themes/oscar/src/less/bootstrap/bootstrap.less b/searx/static/themes/oscar/src/less/bootstrap/bootstrap.less new file mode 100644 index 0000000..d6145eb --- /dev/null +++ b/searx/static/themes/oscar/src/less/bootstrap/bootstrap.less @@ -0,0 +1,3 @@ +@import "../../../node_modules/bootstrap/less/bootstrap.less"; + +@import "typeahead.less"; diff --git a/searx/static/themes/oscar/src/less/bootstrap/typeahead.less b/searx/static/themes/oscar/src/less/bootstrap/typeahead.less new file mode 100644 index 0000000..de1c6ef --- /dev/null +++ b/searx/static/themes/oscar/src/less/bootstrap/typeahead.less @@ -0,0 +1,154 @@ +/* + * typehead.js-bootstrap3.less + * @version 0.2.3 + * https://github.com/hyspace/typeahead.js-bootstrap3.less + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +//custom mixin for .form-control-validation +.typeahead-form-control(@border-color: #ccc;) { + border-color: @border-color; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + &:focus { + border-color: darken(@border-color, 10%); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); + .box-shadow(@shadow); + } + } + + //main styles for control + .tt-input, + .tt-hint { + .twitter-typeahead &{ + //validation states + .has-warning &{ + .typeahead-form-control(@state-warning-text); + } + .has-error &{ + .typeahead-form-control(@state-danger-text); + } + .has-success &{ + .typeahead-form-control(@state-success-text); + } + } + + //border + .input-group .twitter-typeahead:first-child &{ + .border-left-radius(@border-radius-base); + } + .input-group .twitter-typeahead:last-child &{ + .border-right-radius(@border-radius-base); + } + + //sizing - small:size and border + .input-group.input-group-sm .twitter-typeahead &{ + .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); + } + .input-group.input-group-sm .twitter-typeahead:not(:first-child):not(:last-child) &{ + border-radius: 0; + } + .input-group.input-group-sm .twitter-typeahead:first-child &{ + .border-left-radius(@border-radius-small); + .border-right-radius(0); + } + .input-group.input-group-sm .twitter-typeahead:last-child &{ + .border-left-radius(0); + .border-right-radius(@border-radius-small); + } + + //sizing - large:size and border + .input-group.input-group-lg .twitter-typeahead &{ + .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); + } + .input-group.input-group-lg .twitter-typeahead:not(:first-child):not(:last-child) &{ + border-radius: 0; + } + .input-group.input-group-lg .twitter-typeahead:first-child &{ + .border-left-radius(@border-radius-large); + .border-right-radius(0); + } + .input-group.input-group-lg .twitter-typeahead:last-child &{ + .border-left-radius(0); + .border-right-radius(@border-radius-large); + } + } + + //for wrapper + .twitter-typeahead { + width: 100%; + .input-group &{ + //overwrite `display:inline-block` style + display: table-cell!important; + float: left; + } + } + + //particular style for each other + .twitter-typeahead .tt-hint { + color: @text-muted;//color - hint + } + .twitter-typeahead .tt-input { + z-index: 2; + //disabled status + //overwrite inline styles of .tt-query + &[disabled], + &[readonly], + fieldset[disabled] & { + cursor: not-allowed; + //overwirte inline style + background-color: @input-bg-disabled!important; + } + } + + //dropdown styles + .tt-dropdown-menu { + //dropdown menu + position: absolute; + top: 100%; + left: 0; + z-index: @zindex-dropdown; + min-width: 160px; + width: 100%; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + font-size: @font-size-base; + background-color: @dropdown-bg; + border: 1px solid @dropdown-fallback-border; + border: 1px solid @dropdown-border; + border-radius: @border-radius-base; + .box-shadow(0 6px 12px rgba(0,0,0,.175)); + background-clip: padding-box; + *border-right-width: 2px; + *border-bottom-width: 2px; + + .tt-suggestion { + //item + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: @line-height-base; + color: @dropdown-link-color; + white-space: nowrap; + text-align: left; + cursor: pointer !important; + &.tt-cursor { + //item selected + text-decoration: none; + outline: 0; + background-color: @dropdown-link-hover-bg; + color: @dropdown-link-hover-color; + a { + //link in item selected + color: @dropdown-link-hover-color; + } + } + p { + margin: 0; + } + } + } +
\ No newline at end of file diff --git a/searx/static/themes/oscar/less/logicodev-dark/oscar.less b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less index e788b8c..2b26c50 100644 --- a/searx/static/themes/oscar/less/logicodev-dark/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less @@ -71,10 +71,6 @@ ul.nav li a { border-color: #4d3f43 !important; } -.highlight { - background: #333333 !important; -} - /*nav*/ .navbar{ background:#1d1f21 none; @@ -243,3 +239,9 @@ p.btn.btn-default{ .highlight { background-color: transparent !important; } + +/* engine tooltip */ +.engine-tooltip { + border: 1px solid #3d3f43; + background: #1d1f21 ; +} diff --git a/searx/static/themes/oscar/less/logicodev/advanced.less b/searx/static/themes/oscar/src/less/logicodev/advanced.less index b8e10de..b8e10de 100644 --- a/searx/static/themes/oscar/less/logicodev/advanced.less +++ b/searx/static/themes/oscar/src/less/logicodev/advanced.less diff --git a/searx/static/themes/oscar/less/logicodev/checkbox.less b/searx/static/themes/oscar/src/less/logicodev/checkbox.less index 6428b36..6428b36 100644 --- a/searx/static/themes/oscar/less/logicodev/checkbox.less +++ b/searx/static/themes/oscar/src/less/logicodev/checkbox.less diff --git a/searx/static/themes/oscar/src/less/logicodev/code.less b/searx/static/themes/oscar/src/less/logicodev/code.less new file mode 100644 index 0000000..3aef968 --- /dev/null +++ b/searx/static/themes/oscar/src/less/logicodev/code.less @@ -0,0 +1,14 @@ +pre, code { + font-family: 'Ubuntu Mono', 'Courier New', 'Lucida Console', monospace !important; +} + +@import "pygments.less"; + +.code-highlight pre { + margin-bottom: 25px; + padding: 20px 10px; + background-color: inherit; + color: inherit; + border: inherit; + color: #D7DAE0; +} diff --git a/searx/static/themes/oscar/less/logicodev/cursor.less b/searx/static/themes/oscar/src/less/logicodev/cursor.less index cbc1ea6..cbc1ea6 100644 --- a/searx/static/themes/oscar/less/logicodev/cursor.less +++ b/searx/static/themes/oscar/src/less/logicodev/cursor.less diff --git a/searx/static/themes/oscar/less/logicodev/footer.less b/searx/static/themes/oscar/src/less/logicodev/footer.less index d23a0cc..d23a0cc 100644 --- a/searx/static/themes/oscar/less/logicodev/footer.less +++ b/searx/static/themes/oscar/src/less/logicodev/footer.less diff --git a/searx/static/themes/oscar/less/logicodev/infobox.less b/searx/static/themes/oscar/src/less/logicodev/infobox.less index e3582df..e3582df 100644 --- a/searx/static/themes/oscar/less/logicodev/infobox.less +++ b/searx/static/themes/oscar/src/less/logicodev/infobox.less diff --git a/searx/static/themes/oscar/less/logicodev/navbar.less b/searx/static/themes/oscar/src/less/logicodev/navbar.less index 6e4f9ee..6e4f9ee 100644 --- a/searx/static/themes/oscar/less/logicodev/navbar.less +++ b/searx/static/themes/oscar/src/less/logicodev/navbar.less diff --git a/searx/static/themes/oscar/less/logicodev/onoff.less b/searx/static/themes/oscar/src/less/logicodev/onoff.less index fbd2983..fbd2983 100644 --- a/searx/static/themes/oscar/less/logicodev/onoff.less +++ b/searx/static/themes/oscar/src/less/logicodev/onoff.less diff --git a/searx/static/themes/oscar/less/logicodev/oscar.less b/searx/static/themes/oscar/src/less/logicodev/oscar.less index da80d1e..da80d1e 100644 --- a/searx/static/themes/oscar/less/logicodev/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev/oscar.less diff --git a/searx/static/themes/oscar/src/less/logicodev/preferences.less b/searx/static/themes/oscar/src/less/logicodev/preferences.less new file mode 100644 index 0000000..ccd0b02 --- /dev/null +++ b/searx/static/themes/oscar/src/less/logicodev/preferences.less @@ -0,0 +1,31 @@ +.table > tbody > tr > td, .table > tbody > tr > th { + vertical-align: middle !important; +} + +.nav-tabs.nav-justified{ + margin-bottom: 20px; +} + +p { + margin: 10px 0; +} + +input.cursor-text { + margin: 10px 0; +} + +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} + +th:hover .engine-tooltip, .engine-tooltip:hover { + display: inline-block; +}
\ No newline at end of file diff --git a/searx/static/themes/oscar/src/less/logicodev/pygments.less b/searx/static/themes/oscar/src/less/logicodev/pygments.less new file mode 100644 index 0000000..301c94e --- /dev/null +++ b/searx/static/themes/oscar/src/less/logicodev/pygments.less @@ -0,0 +1,99 @@ +/* + this file is generated automatically by searx_extra/update/update_pygments.py + using pygments version 2.8.0 +*/ + +.code-highlight .linenos { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: default; + + &::selection { + background: transparent; /* WebKit/Blink Browsers */ + } + &::-moz-selection { + background: transparent; /* Gecko Browsers */ + } + + margin-right: 8px; + text-align: right; +} + +.code-highlight pre { line-height: 125%; } +.code-highlight td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +.code-highlight span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +.code-highlight td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +.code-highlight span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +.code-highlight .hll { background-color: #ffffcc } +.code-highlight { background: #282C34; } +.code-highlight .c { color: #556366; font-style: italic } /* Comment */ +.code-highlight .err { border: 1px solid #ff0000 } /* Error */ +.code-highlight .k { color: #BE74D5; font-weight: bold } /* Keyword */ +.code-highlight .o { color: #D19A66 } /* Operator */ +.code-highlight .ch { color: #556366; font-style: italic } /* Comment.Hashbang */ +.code-highlight .cm { color: #556366; font-style: italic } /* Comment.Multiline */ +.code-highlight .cp { color: #BC7A00; font-style: italic } /* Comment.Preproc */ +.code-highlight .cpf { color: #556366; font-style: italic } /* Comment.PreprocFile */ +.code-highlight .c1 { color: #556366; font-style: italic } /* Comment.Single */ +.code-highlight .cs { color: #556366; font-style: italic } /* Comment.Special */ +.code-highlight .gd { color: #A00000 } /* Generic.Deleted */ +.code-highlight .ge { font-style: italic } /* Generic.Emph */ +.code-highlight .gr { color: #FF0000 } /* Generic.Error */ +.code-highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.code-highlight .gi { color: #00A000 } /* Generic.Inserted */ +.code-highlight .go { color: #888888 } /* Generic.Output */ +.code-highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.code-highlight .gs { font-weight: bold } /* Generic.Strong */ +.code-highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.code-highlight .gt { color: #0044DD } /* Generic.Traceback */ +.code-highlight .kc { color: #BE74D5; font-weight: bold } /* Keyword.Constant */ +.code-highlight .kd { color: #BE74D5; font-weight: bold } /* Keyword.Declaration */ +.code-highlight .kn { color: #BE74D5; font-weight: bold } /* Keyword.Namespace */ +.code-highlight .kp { color: #BE74D5; font-weight: bold } /* Keyword.Pseudo */ +.code-highlight .kr { color: #BE74D5; font-weight: bold } /* Keyword.Reserved */ +.code-highlight .kt { color: #D46C72; font-weight: bold } /* Keyword.Type */ +.code-highlight .m { color: #D19A66 } /* Literal.Number */ +.code-highlight .s { color: #86C372 } /* Literal.String */ +.code-highlight .na { color: #7D9029 } /* Name.Attribute */ +.code-highlight .nb { color: #BE74D5 } /* Name.Builtin */ +.code-highlight .nc { color: #61AFEF; font-weight: bold } /* Name.Class */ +.code-highlight .no { color: #D19A66 } /* Name.Constant */ +.code-highlight .nd { color: #AA22FF } /* Name.Decorator */ +.code-highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.code-highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.code-highlight .nf { color: #61AFEF } /* Name.Function */ +.code-highlight .nl { color: #A0A000 } /* Name.Label */ +.code-highlight .nn { color: #61AFEF; font-weight: bold } /* Name.Namespace */ +.code-highlight .nt { color: #BE74D5; font-weight: bold } /* Name.Tag */ +.code-highlight .nv { color: #DFC06F } /* Name.Variable */ +.code-highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.code-highlight .w { color: #D7DAE0 } /* Text.Whitespace */ +.code-highlight .mb { color: #D19A66 } /* Literal.Number.Bin */ +.code-highlight .mf { color: #D19A66 } /* Literal.Number.Float */ +.code-highlight .mh { color: #D19A66 } /* Literal.Number.Hex */ +.code-highlight .mi { color: #D19A66 } /* Literal.Number.Integer */ +.code-highlight .mo { color: #D19A66 } /* Literal.Number.Oct */ +.code-highlight .sa { color: #86C372 } /* Literal.String.Affix */ +.code-highlight .sb { color: #86C372 } /* Literal.String.Backtick */ +.code-highlight .sc { color: #86C372 } /* Literal.String.Char */ +.code-highlight .dl { color: #86C372 } /* Literal.String.Delimiter */ +.code-highlight .sd { color: #86C372; font-style: italic } /* Literal.String.Doc */ +.code-highlight .s2 { color: #86C372 } /* Literal.String.Double */ +.code-highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.code-highlight .sh { color: #86C372 } /* Literal.String.Heredoc */ +.code-highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.code-highlight .sx { color: #BE74D5 } /* Literal.String.Other */ +.code-highlight .sr { color: #BB6688 } /* Literal.String.Regex */ +.code-highlight .s1 { color: #86C372 } /* Literal.String.Single */ +.code-highlight .ss { color: #DFC06F } /* Literal.String.Symbol */ +.code-highlight .bp { color: #BE74D5 } /* Name.Builtin.Pseudo */ +.code-highlight .fm { color: #61AFEF } /* Name.Function.Magic */ +.code-highlight .vc { color: #DFC06F } /* Name.Variable.Class */ +.code-highlight .vg { color: #DFC06F } /* Name.Variable.Global */ +.code-highlight .vi { color: #DFC06F } /* Name.Variable.Instance */ +.code-highlight .vm { color: #DFC06F } /* Name.Variable.Magic */ +.code-highlight .il { color: #D19A66 } /* Literal.Number.Integer.Long */ diff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/src/less/logicodev/results.less index 33965fb..ce62cd3 100644 --- a/searx/static/themes/oscar/less/logicodev/results.less +++ b/searx/static/themes/oscar/src/less/logicodev/results.less @@ -33,12 +33,10 @@ word-wrap: break-word; color: @dark-gray; font-size: 13px; +} - - .highlight { - font-weight:bold; - } - +.result .highlight { + font-weight: bold; } .result-source { diff --git a/searx/static/themes/oscar/less/logicodev/search.less b/searx/static/themes/oscar/src/less/logicodev/search.less index 0142287..e99ba12 100644 --- a/searx/static/themes/oscar/less/logicodev/search.less +++ b/searx/static/themes/oscar/src/less/logicodev/search.less @@ -65,14 +65,8 @@ background-color: white; border: @semidark-gray 1px solid; color: @dark-gray; - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ -cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn -sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8 -6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0 -ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w -Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb -7jwaAAAAAElFTkSuQmCC) 96% no-repeat; + // Warning: multi-line base64 URL adds "$stdin" in the source map: https://github.com/jakubpawlowicz/clean-css/issues/593 + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGnsAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW86/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNy0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC) 96% no-repeat; } .custom-select-rtl { @@ -88,9 +82,8 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb height: 1px; width: 1px; overflow: hidden; - clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px, 1px, 1px, 1px); - white-space: nowrap; /* added line */ + white-space: nowrap; } .label-danger, .btn-danger { background: @dark-red; diff --git a/searx/static/themes/oscar/less/logicodev/variables.less b/searx/static/themes/oscar/src/less/logicodev/variables.less index 4ee8df8..4ee8df8 100644 --- a/searx/static/themes/oscar/less/logicodev/variables.less +++ b/searx/static/themes/oscar/src/less/logicodev/variables.less diff --git a/searx/static/themes/oscar/less/pointhi/advanced.less b/searx/static/themes/oscar/src/less/pointhi/advanced.less index 23bfdb0..23bfdb0 100644 --- a/searx/static/themes/oscar/less/pointhi/advanced.less +++ b/searx/static/themes/oscar/src/less/pointhi/advanced.less diff --git a/searx/static/themes/oscar/less/pointhi/checkbox.less b/searx/static/themes/oscar/src/less/pointhi/checkbox.less index 6428b36..6428b36 100644 --- a/searx/static/themes/oscar/less/pointhi/checkbox.less +++ b/searx/static/themes/oscar/src/less/pointhi/checkbox.less diff --git a/searx/static/themes/oscar/src/less/pointhi/code.less b/searx/static/themes/oscar/src/less/pointhi/code.less new file mode 100644 index 0000000..86fe153 --- /dev/null +++ b/searx/static/themes/oscar/src/less/pointhi/code.less @@ -0,0 +1,2 @@ +@import "pygments.less"; + diff --git a/searx/static/themes/oscar/less/pointhi/cursor.less b/searx/static/themes/oscar/src/less/pointhi/cursor.less index cbc1ea6..cbc1ea6 100644 --- a/searx/static/themes/oscar/less/pointhi/cursor.less +++ b/searx/static/themes/oscar/src/less/pointhi/cursor.less diff --git a/searx/static/themes/oscar/less/pointhi/footer.less b/searx/static/themes/oscar/src/less/pointhi/footer.less index 0b25e73..0b25e73 100644 --- a/searx/static/themes/oscar/less/pointhi/footer.less +++ b/searx/static/themes/oscar/src/less/pointhi/footer.less diff --git a/searx/static/themes/oscar/less/pointhi/infobox.less b/searx/static/themes/oscar/src/less/pointhi/infobox.less index e6a55e9..e6a55e9 100644 --- a/searx/static/themes/oscar/less/pointhi/infobox.less +++ b/searx/static/themes/oscar/src/less/pointhi/infobox.less diff --git a/searx/static/themes/oscar/less/pointhi/navbar.less b/searx/static/themes/oscar/src/less/pointhi/navbar.less index a057f82..a057f82 100644 --- a/searx/static/themes/oscar/less/pointhi/navbar.less +++ b/searx/static/themes/oscar/src/less/pointhi/navbar.less diff --git a/searx/static/themes/oscar/less/pointhi/onoff.less b/searx/static/themes/oscar/src/less/pointhi/onoff.less index 72b289a..72b289a 100644 --- a/searx/static/themes/oscar/less/pointhi/onoff.less +++ b/searx/static/themes/oscar/src/less/pointhi/onoff.less diff --git a/searx/static/themes/oscar/less/pointhi/oscar.less b/searx/static/themes/oscar/src/less/pointhi/oscar.less index fc1c525..037bfa5 100644 --- a/searx/static/themes/oscar/less/pointhi/oscar.less +++ b/searx/static/themes/oscar/src/less/pointhi/oscar.less @@ -18,4 +18,6 @@ @import "navbar.less"; +@import "code.less"; + @import "preferences.less"; diff --git a/searx/static/themes/oscar/src/less/pointhi/preferences.less b/searx/static/themes/oscar/src/less/pointhi/preferences.less new file mode 100644 index 0000000..f3a6bee --- /dev/null +++ b/searx/static/themes/oscar/src/less/pointhi/preferences.less @@ -0,0 +1,19 @@ +.table > tbody > tr > td, .table > tbody > tr > th { + vertical-align: middle !important; +} + +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} + +th:hover .engine-tooltip, .engine-tooltip:hover { + display: inline-block; +} diff --git a/searx/static/themes/oscar/src/less/pointhi/pygments.less b/searx/static/themes/oscar/src/less/pointhi/pygments.less new file mode 100644 index 0000000..25a921c --- /dev/null +++ b/searx/static/themes/oscar/src/less/pointhi/pygments.less @@ -0,0 +1,99 @@ +/* + this file is generated automatically by searx_extra/update/update_pygments.py + using pygments version 2.8.0 +*/ + +.code-highlight .linenos { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: default; + + &::selection { + background: transparent; /* WebKit/Blink Browsers */ + } + &::-moz-selection { + background: transparent; /* Gecko Browsers */ + } + + margin-right: 8px; + text-align: right; +} + +.code-highlight pre { line-height: 125%; } +.code-highlight td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +.code-highlight span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +.code-highlight td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +.code-highlight span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +.code-highlight .hll { background-color: #ffffcc } +.code-highlight { background: #f8f8f8; } +.code-highlight .c { color: #408080; font-style: italic } /* Comment */ +.code-highlight .err { border: 1px solid #FF0000 } /* Error */ +.code-highlight .k { color: #008000; font-weight: bold } /* Keyword */ +.code-highlight .o { color: #666666 } /* Operator */ +.code-highlight .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ +.code-highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.code-highlight .cp { color: #BC7A00 } /* Comment.Preproc */ +.code-highlight .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ +.code-highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ +.code-highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ +.code-highlight .gd { color: #A00000 } /* Generic.Deleted */ +.code-highlight .ge { font-style: italic } /* Generic.Emph */ +.code-highlight .gr { color: #FF0000 } /* Generic.Error */ +.code-highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.code-highlight .gi { color: #00A000 } /* Generic.Inserted */ +.code-highlight .go { color: #888888 } /* Generic.Output */ +.code-highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.code-highlight .gs { font-weight: bold } /* Generic.Strong */ +.code-highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.code-highlight .gt { color: #0044DD } /* Generic.Traceback */ +.code-highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.code-highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.code-highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.code-highlight .kp { color: #008000 } /* Keyword.Pseudo */ +.code-highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.code-highlight .kt { color: #B00040 } /* Keyword.Type */ +.code-highlight .m { color: #666666 } /* Literal.Number */ +.code-highlight .s { color: #BA2121 } /* Literal.String */ +.code-highlight .na { color: #7D9029 } /* Name.Attribute */ +.code-highlight .nb { color: #008000 } /* Name.Builtin */ +.code-highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.code-highlight .no { color: #880000 } /* Name.Constant */ +.code-highlight .nd { color: #AA22FF } /* Name.Decorator */ +.code-highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.code-highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.code-highlight .nf { color: #0000FF } /* Name.Function */ +.code-highlight .nl { color: #A0A000 } /* Name.Label */ +.code-highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.code-highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ +.code-highlight .nv { color: #19177C } /* Name.Variable */ +.code-highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.code-highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.code-highlight .mb { color: #666666 } /* Literal.Number.Bin */ +.code-highlight .mf { color: #666666 } /* Literal.Number.Float */ +.code-highlight .mh { color: #666666 } /* Literal.Number.Hex */ +.code-highlight .mi { color: #666666 } /* Literal.Number.Integer */ +.code-highlight .mo { color: #666666 } /* Literal.Number.Oct */ +.code-highlight .sa { color: #BA2121 } /* Literal.String.Affix */ +.code-highlight .sb { color: #BA2121 } /* Literal.String.Backtick */ +.code-highlight .sc { color: #BA2121 } /* Literal.String.Char */ +.code-highlight .dl { color: #BA2121 } /* Literal.String.Delimiter */ +.code-highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.code-highlight .s2 { color: #BA2121 } /* Literal.String.Double */ +.code-highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.code-highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */ +.code-highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.code-highlight .sx { color: #008000 } /* Literal.String.Other */ +.code-highlight .sr { color: #BB6688 } /* Literal.String.Regex */ +.code-highlight .s1 { color: #BA2121 } /* Literal.String.Single */ +.code-highlight .ss { color: #19177C } /* Literal.String.Symbol */ +.code-highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ +.code-highlight .fm { color: #0000FF } /* Name.Function.Magic */ +.code-highlight .vc { color: #19177C } /* Name.Variable.Class */ +.code-highlight .vg { color: #19177C } /* Name.Variable.Global */ +.code-highlight .vi { color: #19177C } /* Name.Variable.Instance */ +.code-highlight .vm { color: #19177C } /* Name.Variable.Magic */ +.code-highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/src/less/pointhi/results.less index 13266c0..f6a2a02 100644 --- a/searx/static/themes/oscar/less/pointhi/results.less +++ b/searx/static/themes/oscar/src/less/pointhi/results.less @@ -107,3 +107,7 @@ outline: 0 none; position: relative; } + +.highlight { + font-weight: 700; +} diff --git a/searx/static/themes/oscar/less/pointhi/search.less b/searx/static/themes/oscar/src/less/pointhi/search.less index ac0a7a0..ac0a7a0 100644 --- a/searx/static/themes/oscar/less/pointhi/search.less +++ b/searx/static/themes/oscar/src/less/pointhi/search.less |
