[enh] oscar theme redesign added

The original code made by @logico-dev (#559)
This commit is contained in:
Adam Tauber 2016-06-26 01:57:43 +02:00
parent 237d251d14
commit f496dc353d
28 changed files with 511 additions and 101 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,88 +0,0 @@
html{position:relative;min-height:100%}
body{margin-bottom:80px}
.footer{position:absolute;bottom:0;width:100%;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}
.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}
.img-thumbnail{margin:5px;max-height:128px;min-height:128px}
.result-videos{clear:both}
.result-torrents{clear:both}
.result-map{clear:both}
.result-code{clear:both}
.suggestion_item{margin:2px 5px}
.result_download{margin-right:5px}
#pagination{margin-top:30px;padding-bottom:50px}
.label-default{color:#aaa;background:#fff}
.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}
.infobox .infobox_part:last-child{margin-bottom:0}
.search_categories{margin:10px 0;text-transform:capitalize}
.cursor-text{cursor:text !important}
.cursor-pointer{cursor:pointer !important}
.highlight .hll{background-color:#ffc}
.highlight{background:#f8f8f8}
.highlight .c{color:#408080;font-style:italic}
.highlight .err{border:1px solid #f00}
.highlight .k{color:#008000;font-weight:bold}
.highlight .o{color:#666}
.highlight .cm{color:#408080;font-style:italic}
.highlight .cp{color:#bc7a00}
.highlight .c1{color:#408080;font-style:italic}
.highlight .cs{color:#408080;font-style:italic}
.highlight .gd{color:#a00000}
.highlight .ge{font-style:italic}
.highlight .gr{color:#f00}
.highlight .gh{color:#000080;font-weight:bold}
.highlight .gi{color:#00a000}
.highlight .go{color:#888}
.highlight .gp{color:#000080;font-weight:bold}
.highlight .gs{font-weight:bold}
.highlight .gu{color:#800080;font-weight:bold}
.highlight .gt{color:#04d}
.highlight .kc{color:#008000;font-weight:bold}
.highlight .kd{color:#008000;font-weight:bold}
.highlight .kn{color:#008000;font-weight:bold}
.highlight .kp{color:#008000}
.highlight .kr{color:#008000;font-weight:bold}
.highlight .kt{color:#b00040}
.highlight .m{color:#666}
.highlight .s{color:#ba2121}
.highlight .na{color:#7d9029}
.highlight .nb{color:#008000}
.highlight .nc{color:#00f;font-weight:bold}
.highlight .no{color:#800}
.highlight .nd{color:#a2f}
.highlight .ni{color:#999;font-weight:bold}
.highlight .ne{color:#d2413a;font-weight:bold}
.highlight .nf{color:#00f}
.highlight .nl{color:#a0a000}
.highlight .nn{color:#00f;font-weight:bold}
.highlight .nt{color:#008000;font-weight:bold}
.highlight .nv{color:#19177c}
.highlight .ow{color:#a2f;font-weight:bold}
.highlight .w{color:#bbb}
.highlight .mf{color:#666}
.highlight .mh{color:#666}
.highlight .mi{color:#666}
.highlight .mo{color:#666}
.highlight .sb{color:#ba2121}
.highlight .sc{color:#ba2121}
.highlight .sd{color:#ba2121;font-style:italic}
.highlight .s2{color:#ba2121}
.highlight .se{color:#b62;font-weight:bold}
.highlight .sh{color:#ba2121}
.highlight .si{color:#b68;font-weight:bold}
.highlight .sx{color:#008000}
.highlight .sr{color:#b68}
.highlight .s1{color:#ba2121}
.highlight .ss{color:#19177c}
.highlight .bp{color:#008000}
.highlight .vc{color:#19177c}
.highlight .vg{color:#19177c}
.highlight .vi{color:#19177c}
.highlight .il{color:#666}
.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}.highlight .lineno::selection{background:transparent;}
.highlight .lineno::-moz-selection{background:transparent;}

View File

@ -0,0 +1 @@
html{position:relative;min-height:100%}body{margin-bottom:80px}.footer{position:absolute;bottom:0;width:100%;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}.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:700}.result-content{margin-top:5px;word-wrap:break-word}.result-content .highlight{font-weight:700}.result-default{clear:both}.result-images{float:left!important}.img-thumbnail{margin:5px;max-height:128px;min-height:128px}.result-videos{clear:both}.result-torrents{clear:both}.result-map{clear:both}.result-code{clear:both}.suggestion_item{margin:2px 5px}.result_download{margin-right:5px}#pagination{margin-top:30px;padding-bottom:50px}.label-default{color:#AAA;background:#FFF}.infobox .infobox_part{margin-bottom:20px;word-wrap:break-word;table-layout:fixed}.infobox .infobox_part:last-child{margin-bottom:0}.search_categories{margin:10px 0;text-transform:capitalize}.cursor-text{cursor:text!important}.cursor-pointer{cursor:pointer!important}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04d}.highlight .kc{color:green;font-weight:700}.highlight .kd{color:green;font-weight:700}.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177c}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#BA2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#ba2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:green}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.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}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}

View File

@ -36,18 +36,20 @@ module.exports = function(grunt) {
less: { less: {
development: { development: {
options: { options: {
paths: ["less/oscar"] paths: ["less/pointhi", "less/logicodev"]
//banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n' //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n'
}, },
files: {"css/oscar.css": "less/oscar/oscar.less"} files: {"css/pointhi.css": "less/pointhi/oscar.less",
"css/logicodev.css": "less/logicodev/oscar.less"}
}, },
production: { production: {
options: { options: {
paths: ["less/oscar"], paths: ["less/pointhi", "less/logicodev"],
//banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n', //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n',
cleancss: true cleancss: true
}, },
files: {"css/oscar.min.css": "less/oscar/oscar.less"} files: {"css/pointhi.min.css": "less/pointhi/oscar.less",
"css/logicodev.min.css": "less/logicodev/oscar.less"}
}, },
bootstrap: { bootstrap: {
options: { options: {
@ -63,7 +65,7 @@ module.exports = function(grunt) {
tasks: ['jshint', 'concat', 'uglify'] tasks: ['jshint', 'concat', 'uglify']
}, },
oscar_styles: { oscar_styles: {
files: ['less/oscar/**/*.less'], files: ['less/pointhi/**/*.less'],
tasks: ['less:development', 'less:production'] tasks: ['less:development', 'less:production']
}, },
bootstrap_styles: { bootstrap_styles: {

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,103 @@
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;
}

View File

@ -0,0 +1,30 @@
// Sticky footer styles
*{
border-radius: 0 !important;
}
html {
position: relative;
min-height: 100%;
color: @black;
}
body {
/* Margin bottom by footer height */
font-family: 'Roboto', Helvetica, Arial, sans-serif;
margin-bottom: 80px;
background-color: white;
a{
color: @blue;
}
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
height: 60px;
text-align: center;
color: #999;
}

View File

@ -0,0 +1,37 @@
.infobox {
.panel-heading{
background-color: @dim-gray;
.panel-title{
font-weight: 700;
}
}
p{
font-family: "DejaVu Serif", Georgia, Cambria, "Times New Roman", Times, serif !important;
font-style: italic;
}
.btn{
background-color: @green;
border: none;
a{
color: white;
margin: 5px;
}
}
.infobox_part {
margin-bottom: 20px;
word-wrap: break-word;
table-layout: fixed;
}
.infobox_part:last-child {
margin-bottom: 0;
}
}

View File

@ -0,0 +1,50 @@
.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus{
background: @black;
color: @light-green;
}
.navbar > li > a {
padding: 0;
margin: 0;
}
.navbar-nav > li > a {
background: @black;
padding: 0 8px;
margin: 0;
line-height: 30px;
}
.navbar, .navbar-default{
background-color: @black;
border: none;
border-top: 4px solid @light-green;
padding-top: 5px;
color: @dim-gray !important;
font-weight: 700;
font-size: 1.1em;
text-transform: lowercase;
margin-bottom: 24px;
height: 30px;
line-height: 30px;
.navbar-nav > li > a{
color: @dim-gray;
}
.navbar-brand{
font-weight: 700;
text-transform: capitalize;
color: @light-green;
line-height: 30px;
padding: 0 30px;
margin: 0;
}
}
// Hover color
// http://stackoverflow.com/users/114029/leniel-macaferi
.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
color: @light-green;
background: @black;
}

View File

@ -0,0 +1,17 @@
@import "variables.less";
@import "navbar.less";
@import "footer.less";
@import "checkbox.less";
@import "results.less";
@import "infobox.less";
@import "search.less";
@import "cursor.less";
@import "code.less";

View File

@ -0,0 +1,149 @@
.result_header {
margin-bottom:5px;
font-size: 16px;
.favicon {
margin-bottom:-3px;
}
a {
color: @black;
text-decoration: none;
&:hover{
color: @blue;
}
&:visited{
color: @violet;
}
.highlight {
background-color: @dim-gray;
// Chrome hack: bold is different size than normal
// https://stackoverflow.com/questions/20713988/weird-text-alignment-issue-in-css-when-bolded-lucida-sans
}
}
}
.result-content {
margin-top: 2px;
margin-bottom: 4px;
word-wrap: break-word;
color: @dark-gray;
font-size: 13px;
.highlight {
font-weight:bold;
}
}
.external-link, .external-link a{
color: @green;
a{
margin-right: 3px;
}
}
// default formating of results
.result-default, .result-code, .result-torrent, .result-videos, .result-map {
clear: both;
padding: 2px 4px;
&:hover{
background-color: @dim-gray;
}
}
// image formating of results
.result-images {
float: left !important;
width: 24%;
margin: .5%;
a{
display: block;
width: 100%;
height: 170px;
background-size: cover;
}
}
.img-thumbnail {
margin: 5px;
max-height: 128px;
min-height: 128px;
}
// video formating of results
.result-videos {
clear: both;
hr{
margin: 5px 0 15px 0;
}
.collapse{
width: 100%;
}
.in{
margin-bottom: 8px;
}
}
// torrent formating of results
.result-torrent {
clear: both;
b{
margin-right: 5px;
margin-left: 5px;
}
.seeders{
color: @green;
}
.leechers{
color: @red;
}
}
// map formating of results
.result-map {
clear: both;
}
// code formating of results
.result-code {
clear: both;
.code-fork, .code-fork a{
color: @dark-gray;
}
}
// suggestion
.suggestion_item {
margin: 2px 5px;
}
// download result
.result_download {
margin-right: 5px;
}
// page forward, backward
#pagination {
margin-top: 30px;
padding-bottom: 60px;
}
.label-default {
color: @gray;
background: transparent;
}

View File

@ -0,0 +1,59 @@
.search_categories, #categories {
margin: 15px 0 20px 0;
text-transform: capitalize;
label{
border: none;
box-shadow: none;
font-size: 13px;
padding-bottom: 2px;
color: @gray;
margin-bottom: 5px;
&:hover{
color: @black;
background-color: transparent;
}
&:active{
box-shadow: none;
}
}
.active, .btn-primary{
color: @black;
font-weight: 700;
border-bottom: 5px solid @light-green;
background-color: transparent;
}
}
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
background-color: transparent !important;
box-shadow: none;
}
#categories{
margin: 0;
}
#main-logo{
margin-top: 10vh;
margin-bottom: 25px;
}
#q{
box-shadow: none;
border-right: none;
border-color: @gray;
}
#search_form .input-group-btn .btn{
border-color: @gray;
}
#search_form .input-group-btn .btn:hover{
background-color: @green;
color: white;
}

View File

@ -0,0 +1,10 @@
@black: #29314D;
@gray: #A4A4A4;
@dim-gray: #F6F9FA;
@dark-gray: #666;
@blue: #0088CC;
@red: #F35E77;
@violet: #684898;
@green: #2ecc71;
@light-green: #01D7D4;
@orange: #FFA92F;

View File

@ -0,0 +1,9 @@
// Hide element if checkbox is checked
input[type=checkbox]:checked + .label_hide_if_checked, input[type=checkbox]:checked + .label_hide_if_not_checked + .label_hide_if_checked {
display:none;
}
// Hide element if checkbox is not checked
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;
}

View File

@ -0,0 +1,8 @@
// display cursor
.cursor-text {
cursor: text !important;
}
.cursor-pointer {
cursor: pointer !important;
}

View File

@ -12,7 +12,11 @@
<title>{% block title %}{% endblock %}{{ instance_name }}</title> <title>{% block title %}{% endblock %}{{ instance_name }}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" /> <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
<link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" /> {% if cookies['oscar-style'] %}
<link rel="stylesheet" href="{{ url_for('static', filename='css/'+cookies['oscar-style']+'.min.css') }}" type="text/css" />
{% else %}
<link rel="stylesheet" href="{{ url_for('static', filename='css/logicodev.min.css') }}" type="text/css" />
{% endif %}
<link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" /> <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
{% for css in styles %} {% for css in styles %}
<link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" /> <link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" />
@ -48,8 +52,8 @@
</noscript> </noscript>
</head> </head>
<body> <body>
<div class="container">
{% include 'oscar/navbar.html' %} {% include 'oscar/navbar.html' %}
<div class="container">
{% block site_alert_error %} {% block site_alert_error %}
{% endblock %} {% endblock %}
@ -75,7 +79,7 @@
<div class="container"> <div class="container">
{% block footer %} {% block footer %}
{% endblock %} {% endblock %}
<p class="text-muted">{{ _('Powered by') }} <a href="https://asciimoo.github.io/searx/">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}</p> <p class="text-muted"><small>{{ _('Powered by') }} <a href="https://asciimoo.github.io/searx/">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}</small></p>
</div> </div>
</div> </div>
<script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script> <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>

View File

@ -3,7 +3,14 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="text-center col-sm-12 col-md-12"> <div class="text-center col-sm-12 col-md-12">
{% if cookies['oscar-style'] == 'pointhi' %}
<h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searx_logo.png') }}" alt="searx logo"/>searx</h1> <h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searx_logo.png') }}" alt="searx logo"/>searx</h1>
{% else %}
<h1 class="text-hide center-block" id="main-logo">
<img class="center-block img-responsive" src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="searx logo" style="max-width: 350px"/>
searx
</h1>
{% endif %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">

View File

@ -17,7 +17,6 @@
<!-- Draw result sub header --> <!-- Draw result sub header -->
{% macro result_sub_header(result) -%} {% macro result_sub_header(result) -%}
{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %} {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ icon('link') }} {{ _('cached') }}</a></small>
{% if result.magnetlink %}<small> &bull; <a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} {{ _('magnet link') }}</a></small>{% endif %} {% if result.magnetlink %}<small> &bull; <a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} {{ _('magnet link') }}</a></small>{% endif %}
{% if result.torrentfile %}<small> &bull; <a href="{{ result.torrentfile }}" class="torrentfile" rel="noreferrer">{{ icon('download-alt') }} {{ _('torrent file') }}</a></small>{% endif %} {% if result.torrentfile %}<small> &bull; <a href="{{ result.torrentfile }}" class="torrentfile" rel="noreferrer">{{ icon('download-alt') }} {{ _('torrent file') }}</a></small>{% endif %}
{%- endmacro %} {%- endmacro %}
@ -29,15 +28,20 @@
{% for engine in result.engines %} {% for engine in result.engines %}
<span class="label label-default">{{ engine }}</span> <span class="label label-default">{{ engine }}</span>
{% endfor %} {% endfor %}
<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ icon('link') }} {{ _('cached') }}</a></small>
</div> </div>
<p class="text-muted">{{ result.pretty_url }}</p> <span class="text-muted"><small>{{ result.pretty_url }}</small></span>
{%- endmacro %} {%- endmacro %}
<!-- Draw result footer --> <!-- Draw result footer -->
{% macro result_footer_rtl(result) -%} {% macro result_footer_rtl(result) -%}
<div class="clearfix"></div> <div class="clearfix"></div>
<span class="label label-default pull-left">{{ result.engine }}</span> {% for engine in result.engines %}
<p class="text-muted">{{ result.pretty_url }}&lrm;</p> <span class="label label-default">{{ engine }}</span>
{% endfor %}
<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}" rel="noreferrer">{{ icon('link') }} {{ _('cached') }}</a></small>
</div>
<span class="text-muted"><small>{{ result.pretty_url }}</small></span>
{%- endmacro %} {%- endmacro %}
{% macro preferences_item_header(info, label, rtl) -%} {% macro preferences_item_header(info, label, rtl) -%}

View File

@ -110,6 +110,13 @@
{% endfor %} {% endfor %}
</select> </select>
{{ preferences_item_footer(theme_info, theme_label, rtl) }} {{ preferences_item_footer(theme_info, theme_label, rtl) }}
{{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }}
<select class="form-control" name='oscar-style'>
<option value="logicodev" >Logicodev</option>
<option value="pointhi" {% if cookies['oscar-style'] == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>
</select>
{{ preferences_item_footer(_('Choose style for this theme'), _('Style'), rtl) }}
</div> </div>
</fieldset> </fieldset>
</div> </div>