Skip to content
Snippets Groups Projects
Commit 9637685a authored by Karl's avatar Karl
Browse files

Das erste alternative Design ist jetzt soweit fertig.

parent d0f728f6
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
public/css/themeDark.css
+ 92
− 52
View file @ 9637685a
......@@ -3,10 +3,12 @@
color: antiquewhite;
}
a {
color: #90a0f0;
a, a:link, a:visited {
color: #f5a25c;
text-decoration: none;
}
#foki input:checked + label{
background-color: #707070;
}
......@@ -23,16 +25,10 @@ a {
}
.navbar-default .navbar-nav > .active > a {
background-color: #707070!important;
background-color: #707070 !important;
}
.btn-default {
background-color: #707070;
border-color: transparent;
color: antiquewhite;
}
.form-control {
background-color: #707070;
border-color: #909090;
color: antiquewhite;
......@@ -63,8 +59,8 @@ a {
color: antiquewhite;
}
.mutelink {
color: antiquewhite
a:link.mutelink, a:visited.mutelink{
color: antiquewhite;
}
div#right {
......@@ -83,6 +79,11 @@ div#right p {
background-color: #505050;
}
#foki input + label:hover {
cursor: pointer;
background-color: #707070;
}
.tab-content {
background-color: #505050;
}
......@@ -95,10 +96,6 @@ div#right p {
border-bottom: none;
}
#foki li.active a {
background-color: #505050;
}
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
border: none;
}
......@@ -109,8 +106,8 @@ pre {
}
.alert-warning {
background-color: #8B8B60;
color: #3D3D30;
background-color: #656433;
color: antiquewhite;
border-color: #979750;
}
......@@ -124,12 +121,18 @@ pre {
background-color: #707070;
}
.form-control {
background-color: #707070;
border-color: #909090;
color: antiquewhite;
}
.form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: #404040;
color: #antiquewhite;
}
.form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: #404040;
color: #antiquewhite;
opacity: 1;
}
......@@ -139,7 +142,7 @@ pre {
}
.form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: #404040;
color: #antiquewhite;
}
.panel-default {
......@@ -152,6 +155,18 @@ pre {
border-color: #909090;
}
.btn-primary {
color: antiquewhite;
background-color: #6C7233;
border-color: #4D4D14;
}
.btn-danger {
color: antiquewhite;
background-color: #b07534;
border-color: #68491c;
}
/* Result Page */
.result .description {
......@@ -159,11 +174,17 @@ pre {
font-size: 16px;
}
/*
a:link, a:visited {
color: #90a0f0;
.result.ad .description {
color: #8ccf55;
}
.result.ad .title {
color: #63b715;
}
.resultInformation .link a:link, .resultInformation .link a:visited {
color: #f5a25c;
}
*/
.result:not(.ad) .hoster {
font-size: 14px;
......@@ -179,19 +200,23 @@ a:link, a:visited {
}
.result .title {
color: burlywood;
color: #e18d20;
font-size: 18px;
}
.pager li > a, .pager li > span {
background-color: #909090;
border-color: #c0c0c0;
background-color: #707070;
border-color: #909090;
color: antiquewhite;
}
.pager li > a:hover {
background-color: #909090;
}
.pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span {
color: antiquewhite;
background-color: #909090;
background-color: #707070;
}
footer a {
......@@ -213,29 +238,61 @@ footer a {
a:hover {
cursor: pointer;
color: #6771AB;
color: #9c6232;
}
.text-muted {
color: #b0b0b0;
}
.result.ad .description {
color: #95cf5e;
.alert-danger, .alert-danger a, .alert-danger ul, .alert-danger li {
background-color: #707070;
border-color: #909090;
}
.result.ad .title {
color: #95cf5e;
.result.ad .hoster {
color: #b0b0b0;
}
.result.ad .hoster {
color: #95cf5e;
.nav > li > a:hover, .nav > li > a:focus {
text-decoration: none;
background-color: #707070;
}
#searchplugin > div > a {
color: antiquewhite;
background-color: #707070;
border-color: #909090;
}
#searchplugin div {
background-color: #656433;
}
#foki li.active a {
background-color: #707070;
}
#foki li.active a span {
background-color: #707070;
}
#foki li.active a:hover span {
background-color: #707070;
}
#foki li a:hover {
border-color: #909090;
border: none;
}
#foki li a:hover span {
background-color: #707070;
}
.glyphicon-search {
background-color: transparent;
}
/* Aus der theme.css */
......@@ -266,20 +323,3 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
.logo h1{
color: antiquewhite;
}
.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus{
background-color: #909;
border-color: #909;
}
.pagination > li > a, .pagination > li > span{
color: #909;
}
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus{
color: #909;
}
.lSPrev > span, .lSNext > span {
color: #909;
}
resources/views/index.blade.php
+ 3
− 3
View file @ 9637685a
......@@ -149,7 +149,7 @@
<label id="anpassen-label" for="angepasst">
<span class="glyphicon glyphicon-cog"></span>
<span class="content">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/settings") }}">
<a class="mutelink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/settings") }}">
@if ($focus === 'angepasst')
{{ trans('index.foki.angepasst') }}
@else
......@@ -208,14 +208,14 @@
</fieldset>
<ul class="list-inline">
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank" id="foerdershops" class="btn btn-default" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }}
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank" id="foerdershops" class="btn btn-default mutelink" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }}
</a>
</li>
<li class="hidden-xs seperator">|
</li>
<li id="plug" @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari')
class="hidden" @endunless >
<a href="#" id="plugin" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default" title="{{ trans('index.plugintitle') }}">{{ trans('index.plugin') }}</a>
<a href="#" id="plugin" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default mutelink" title="{{ trans('index.plugintitle') }}">{{ trans('index.plugin') }}</a>
</li>
</ul>
</figure>
......
resources/views/widget/sitesearch.blade.php
+ 6
− 1
View file @ 9637685a
......@@ -8,7 +8,12 @@
<p>{{ trans('sitesearch.head.2') }}</p>
<h2>{{ trans('sitesearch.head.3') }}</h2>
<form method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/sitesearch/") }}" accept-charset="UTF-8">
<input class="metager-searchinput" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}"><button class="metager-searchbutton" type="submit">{{ trans('sitesearch.head.5') }}</button>
<div class="input-group">
<input type="text" class="form-control" name="site" placeholder="{{ trans('sitesearch.head.4') }}" required="" value="{{ $site }}">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">{{ trans('sitesearch.head.5') }}</button>
</span>
</div>
</form>
@if ($site !== '')
<h2>{{ trans('sitesearch.generated.1') }}</h2>
......
resources/views/widget/widget.blade.php
+ 2
− 2
View file @ 9637685a
......@@ -5,6 +5,6 @@
@section('content')
<h1>{{ trans('widget.head') }}</h1>
<p>{{ trans('widget.body.1') }}</p>
<p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
<p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
<p>{{ trans('widget.body.4') }}</p>
@endsection
\ No newline at end of file
@endsection
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment