Skip to content
This repository has been archived by the owner on Sep 7, 2023. It is now read-only.

Commit

Permalink
Merge branch 'colour-contrast'
Browse files Browse the repository at this point in the history
  • Loading branch information
@asciimoo
asciimoo committed Jul 2, 2020
2 parents 6163bd6 + 223114c commit c21220c
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 33 deletions.
25 changes: 18 additions & 7 deletions searx/static/themes/oscar/css/logicodev-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
float: right;
}
.external-link {
color: #069025;
color: #068922;
font-size: 12px;
margin-bottom: 15px;
}
Expand Down Expand Up @@ -266,7 +266,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
padding-bottom: 60px;
}
.label-default {
color: #a4a4a4;
color: #666666;
background: transparent;
}
.result .text-muted small {
Expand Down Expand Up @@ -300,7 +300,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
font-style: italic;
}
.infobox .btn {
background-color: #2ecc71;
background-color: #007ab8;
border: none;
}
.infobox .btn a {
Expand Down Expand Up @@ -364,13 +364,13 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
#q {
box-shadow: none;
border-right: none;
border-color: #a4a4a4;
border-color: #888888;
}
#search_form .input-group-btn .btn {
border-color: #a4a4a4;
border-color: #888888;
}
#search_form .input-group-btn .btn:hover {
background-color: #2ecc71;
background-color: #068922;
color: white;
}
.custom-select {
Expand All @@ -380,7 +380,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
font-size: 1.2rem;
font-weight: normal;
background-color: white;
border: #dddddd 1px solid;
border: #888888 1px solid;
color: #666666;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
Expand All @@ -405,6 +405,17 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
white-space: nowrap;
/* added line */
}
.label-danger,
.btn-danger {
background: #c9432f;
}
.label-success,
.btn-success {
background: #068922;
}
select.form-control {
border-color: #888888 !important;
}
#advanced-search-container {
display: none;
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion searx/static/themes/oscar/css/logicodev-dark.min.css
View file

Large diffs are not rendered by default.

25 changes: 18 additions & 7 deletions searx/static/themes/oscar/css/logicodev.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
float: right;
}
.external-link {
color: #069025;
color: #068922;
font-size: 12px;
margin-bottom: 15px;
}
Expand Down Expand Up @@ -239,7 +239,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
padding-bottom: 60px;
}
.label-default {
color: #a4a4a4;
color: #666666;
background: transparent;
}
.result .text-muted small {
Expand Down Expand Up @@ -273,7 +273,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
font-style: italic;
}
.infobox .btn {
background-color: #2ecc71;
background-color: #007ab8;
border: none;
}
.infobox .btn a {
Expand Down Expand Up @@ -337,13 +337,13 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
#q {
box-shadow: none;
border-right: none;
border-color: #a4a4a4;
border-color: #888888;
}
#search_form .input-group-btn .btn {
border-color: #a4a4a4;
border-color: #888888;
}
#search_form .input-group-btn .btn:hover {
background-color: #2ecc71;
background-color: #068922;
color: white;
}
.custom-select {
Expand All @@ -353,7 +353,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
font-size: 1.2rem;
font-weight: normal;
background-color: white;
border: #dddddd 1px solid;
border: #888888 1px solid;
color: #666666;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
Expand All @@ -378,6 +378,17 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
white-space: nowrap;
/* added line */
}
.label-danger,
.btn-danger {
background: #c9432f;
}
.label-success,
.btn-success {
background: #068922;
}
select.form-control {
border-color: #888888 !important;
}
#advanced-search-container {
display: none;
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion searx/static/themes/oscar/css/logicodev.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion searx/static/themes/oscar/less/logicodev/infobox.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

.btn{
background-color: @green;
background-color: @dark-blue;
border: none;

a{
Expand Down
2 changes: 1 addition & 1 deletion searx/static/themes/oscar/less/logicodev/results.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
}

.label-default {
color: @gray;
color: @dark-gray;
background: transparent;
}

Expand Down
17 changes: 13 additions & 4 deletions searx/static/themes/oscar/less/logicodev/search.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
#q{
box-shadow: none;
border-right: none;
border-color: @gray;
border-color: @semidark-gray;
}

#search_form .input-group-btn .btn{
border-color: @gray;
border-color: @semidark-gray;
}

#search_form .input-group-btn .btn:hover{
background-color: @green;
background-color: @dark-green;
color: white;
}

Expand All @@ -63,7 +63,7 @@
font-size: 1.2rem;
font-weight:normal;
background-color: white;
border: @mild-gray 1px solid;
border: @semidark-gray 1px solid;
color: @dark-gray;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
Expand All @@ -88,3 +88,12 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
clip: rect(1px, 1px, 1px, 1px);
white-space: nowrap; /* added line */
}
.label-danger, .btn-danger {
background: @dark-red;
}
.label-success, .btn-success {
background: @dark-green;
}
select.form-control {
border-color: @semidark-gray !important;
}
9 changes: 6 additions & 3 deletions searx/static/themes/oscar/less/logicodev/variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
@gray: #A4A4A4;
@dim-gray: #F6F9FA;
@dark-gray: #666;
@semidark-gray: #888;
@middle-gray: #F5F5F5;
@mild-gray: #DDD;
@blue: #0088CC;
@dark-blue: #007AB8;
@blue: #0088CC;
@red: #F35E77;
@violet: #684898;
@dark-green: #069025;
@dark-green: #068922;
@green: #2ecc71;
@light-green: #01D7D4;
@light-green: #01D7D4;
@orange: #FFA92F;
@dark-red: #c9432f;
16 changes: 8 additions & 8 deletions searx/templates/oscar/preferences.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,18 +264,18 @@ <h3>{{ _('Answerers') }}</h3>
</p>
<table class="table table-striped">
<tr>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Name') }}</th>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Keywords') }}</th>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Description') }}</th>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Examples') }}</th>
<th{% if rtl %} class="text-right"{% endif %}>{{ _('Name') }}</th>
<th{% if rtl %} class="text-right"{% endif %}>{{ _('Keywords') }}</th>
<th{% if rtl %} class="text-right"{% endif %}>{{ _('Description') }}</th>
<th{% if rtl %} class="text-right"{% endif %}>{{ _('Examples') }}</th>
</tr>

{% for answerer in answerers %}
<tr>
<td class="text-muted">{{ answerer.info.name }}</td>
<td class="text-muted">{{ answerer.keywords|join(', ') }}</td>
<td class="text-muted">{{ answerer.info.description }}</td>
<td class="text-muted">{{ answerer.info.examples|join(', ') }}</td>
<td>{{ answerer.info.name }}</td>
<td>{{ answerer.keywords|join(', ') }}</td>
<td>{{ answerer.info.description }}</td>
<td>{{ answerer.info.examples|join(', ') }}</td>
</tr>
{% endfor %}
</table>
Expand Down

0 comments on commit c21220c

Please sign in to comment.