Merge branch 'colour-contrast'

This commit is contained in:
Adam Tauber 2020-07-02 16:27:09 +02:00
commit c21220c671
9 changed files with 67 additions and 33 deletions

View File

@ -176,7 +176,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
float: right; float: right;
} }
.external-link { .external-link {
color: #069025; color: #068922;
font-size: 12px; font-size: 12px;
margin-bottom: 15px; margin-bottom: 15px;
} }
@ -266,7 +266,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
padding-bottom: 60px; padding-bottom: 60px;
} }
.label-default { .label-default {
color: #a4a4a4; color: #666666;
background: transparent; background: transparent;
} }
.result .text-muted small { .result .text-muted small {
@ -300,7 +300,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
font-style: italic; font-style: italic;
} }
.infobox .btn { .infobox .btn {
background-color: #2ecc71; background-color: #007ab8;
border: none; border: none;
} }
.infobox .btn a { .infobox .btn a {
@ -364,13 +364,13 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
#q { #q {
box-shadow: none; box-shadow: none;
border-right: none; border-right: none;
border-color: #a4a4a4; border-color: #888888;
} }
#search_form .input-group-btn .btn { #search_form .input-group-btn .btn {
border-color: #a4a4a4; border-color: #888888;
} }
#search_form .input-group-btn .btn:hover { #search_form .input-group-btn .btn:hover {
background-color: #2ecc71; background-color: #068922;
color: white; color: white;
} }
.custom-select { .custom-select {
@ -380,7 +380,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
font-size: 1.2rem; font-size: 1.2rem;
font-weight: normal; font-weight: normal;
background-color: white; background-color: white;
border: #dddddd 1px solid; border: #888888 1px solid;
color: #666666; color: #666666;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
@ -405,6 +405,17 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
white-space: nowrap; white-space: nowrap;
/* added line */ /* added line */
} }
.label-danger,
.btn-danger {
background: #c9432f;
}
.label-success,
.btn-success {
background: #068922;
}
select.form-control {
border-color: #888888 !important;
}
#advanced-search-container { #advanced-search-container {
display: none; display: none;
text-align: left; text-align: left;

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

@ -15,7 +15,7 @@
} }
.btn{ .btn{
background-color: @green; background-color: @dark-blue;
border: none; border: none;
a{ a{

View File

@ -164,7 +164,7 @@
} }
.label-default { .label-default {
color: @gray; color: @dark-gray;
background: transparent; background: transparent;
} }

View File

@ -44,15 +44,15 @@
#q{ #q{
box-shadow: none; box-shadow: none;
border-right: none; border-right: none;
border-color: @gray; border-color: @semidark-gray;
} }
#search_form .input-group-btn .btn{ #search_form .input-group-btn .btn{
border-color: @gray; border-color: @semidark-gray;
} }
#search_form .input-group-btn .btn:hover{ #search_form .input-group-btn .btn:hover{
background-color: @green; background-color: @dark-green;
color: white; color: white;
} }
@ -63,7 +63,7 @@
font-size: 1.2rem; font-size: 1.2rem;
font-weight:normal; font-weight:normal;
background-color: white; background-color: white;
border: @mild-gray 1px solid; border: @semidark-gray 1px solid;
color: @dark-gray; color: @dark-gray;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
@ -88,3 +88,12 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
clip: rect(1px, 1px, 1px, 1px); clip: rect(1px, 1px, 1px, 1px);
white-space: nowrap; /* added line */ 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;
}

View File

@ -2,12 +2,15 @@
@gray: #A4A4A4; @gray: #A4A4A4;
@dim-gray: #F6F9FA; @dim-gray: #F6F9FA;
@dark-gray: #666; @dark-gray: #666;
@semidark-gray: #888;
@middle-gray: #F5F5F5; @middle-gray: #F5F5F5;
@mild-gray: #DDD; @mild-gray: #DDD;
@blue: #0088CC; @dark-blue: #007AB8;
@blue: #0088CC;
@red: #F35E77; @red: #F35E77;
@violet: #684898; @violet: #684898;
@dark-green: #069025; @dark-green: #068922;
@green: #2ecc71; @green: #2ecc71;
@light-green: #01D7D4; @light-green: #01D7D4;
@orange: #FFA92F; @orange: #FFA92F;
@dark-red: #c9432f;

View File

@ -264,18 +264,18 @@
</p> </p>
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Name') }}</th> <th{% if rtl %} class="text-right"{% endif %}>{{ _('Name') }}</th>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Keywords') }}</th> <th{% if rtl %} class="text-right"{% endif %}>{{ _('Keywords') }}</th>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Description') }}</th> <th{% if rtl %} class="text-right"{% endif %}>{{ _('Description') }}</th>
<th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Examples') }}</th> <th{% if rtl %} class="text-right"{% endif %}>{{ _('Examples') }}</th>
</tr> </tr>
{% for answerer in answerers %} {% for answerer in answerers %}
<tr> <tr>
<td class="text-muted">{{ answerer.info.name }}</td> <td>{{ answerer.info.name }}</td>
<td class="text-muted">{{ answerer.keywords|join(', ') }}</td> <td>{{ answerer.keywords|join(', ') }}</td>
<td class="text-muted">{{ answerer.info.description }}</td> <td>{{ answerer.info.description }}</td>
<td class="text-muted">{{ answerer.info.examples|join(', ') }}</td> <td>{{ answerer.info.examples|join(', ') }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>