diff --git a/public/css/style.css b/public/css/style.css index ab51f618f7c033fa746804a1476c0563209394e4..b0a1c9f104c90a71ed57b5a26bc324de27068cd3 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -295,7 +295,7 @@ By Class margin-top: 20px; padding: 10px 20px; margin-bottom: 0; - background-color: white; + /*! background-color: white; */ -webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); -moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3); @@ -362,7 +362,7 @@ By Class } .mutelink { - color: grey; + color: inherit; } .dotlist { @@ -639,13 +639,8 @@ nav h1 { white-space: nowrap; } -header nav a { - text-decoration: none; - color: rgb(119, 119, 119); -} - body > div { - background-color: transparent; + /*! background-color: transparent; */ padding-top: 70px; } diff --git a/public/css/theme.css.php b/public/css/theme.css.php index 6b51fd2243ccf97cddafab4affaa07f1e1d401d4..4aa847d53631a846ea09e6cf675671837ad351cc 100644 --- a/public/css/theme.css.php +++ b/public/css/theme.css.php @@ -57,7 +57,4 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel] .lSPrev > span, .lSNext > span { color: <?=$color?>; -} - - - +} \ No newline at end of file diff --git a/public/css/themeDark.css b/public/css/themeDark.css new file mode 100644 index 0000000000000000000000000000000000000000..edd536694ef32344069464de1c2299d32bf1fdc3 --- /dev/null +++ b/public/css/themeDark.css @@ -0,0 +1,325 @@ +* { + background-color: #505050; + color: antiquewhite; +} + +a, a:link, a:visited { + color: #f5a25c; + text-decoration: none; +} + + +#foki input:checked + label{ + background-color: #707070; +} + +.navbar { + background-color: #505050; + border-color: #505050; + border-bottom: 3px solid #707070; + box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2); +} + +.navbar li a { + color: antiquewhite !important; +} + +.navbar-default .navbar-nav > .active > a { + background-color: #707070 !important; +} + +.btn-default { + background-color: #707070; + border-color: #909090; + color: antiquewhite; +} + +.dropdown-menu { + background-color: #505050; +} + +.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover { + background-color: #707070; +} + +.caret { + background-color: transparent; +} + +.input-group-addon { + background-color: #707070; + border: 1px solid #909090; +} + +#moreInformation ul li { + color: antiquewhite; +} + +#moreInformation h2 { + color: antiquewhite; +} + +a:link.mutelink, a:visited.mutelink{ + color: antiquewhite; +} + +div#right { + background-color: #606060; +} + +div#right h3 { + background-color: #606060; +} + +div#right p { + background-color: #606060; +} + +#foki { + background-color: #505050; +} + +#foki input + label:hover { + cursor: pointer; + background-color: #707070; +} + +.tab-content { + background-color: #505050; +} + +.content-wrapper { + background-color: #505050; +} + +.nav-tabs { + border-bottom: none; +} + +.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { + border: none; +} + +pre { + background-color: #505050; + border: 1px solid antiquewhite; +} + +.alert-warning { + background-color: #656433; + color: antiquewhite; + border-color: #979750; +} + +.well { + background-color: #606060; + border-color: #909090; +} + +.panel-title { + color: antiquewhite; + background-color: #707070; +} + +.form-control { + background-color: #707070; + border-color: #909090; + color: antiquewhite; +} + +.form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */ + color: #antiquewhite; +} + +.form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ + color: #antiquewhite; + opacity: 1; +} + +.form-control::-moz-placeholder { /* Mozilla Firefox 19+ */ + color: antiquewhite; + opacity: 1; +} + +.form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: #antiquewhite; +} + +.panel-default { + border-color: #909090; +} + +.panel-default > .panel-heading { + color: antiquewhite; + background-color: #707070; + 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 { + color: antiquewhite; + font-size: 16px; +} + +.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; + color: #b0b0b0; +} + +.result:not(.ad) .hoster a { + color: #b0b0b0; +} + +.result > .number { + color: burlywood !important; /* Wird normalerweise inline gesetzt */ +} + +.result .title { + color: #e18d20; + font-size: 18px; +} + +.pager li > a, .pager li > span { + 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: #707070; +} + +footer a { + color: antiquewhite !important; +} + +.quicktip { + font-family: Georgia, "Times New Roman", Palatino, Times, serif; + color: antiquewhite; + border-color: #909090; + font-size: 16px; +} + +.btn-default:focus, .btn-default.focus, .btn-default:hover, .btn-default:active { + color: antiquewhite; + background-color: #909090; + border-color: #909090; +} + +a:hover { + cursor: pointer; + color: #9c6232; +} + +.text-muted { + color: #b0b0b0; +} + +.alert-danger, .alert-danger a, .alert-danger ul, .alert-danger li { + background-color: #707070; + border-color: #909090; +} + +.result.ad .hoster { + color: #b0b0b0; +} + +.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 */ + +body{ + background-color: #505050; + background-attachment: fixed; +} + +body#resultBody{ + background-image: inherit; +} + + +input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus, .form-control:focus { + outline-color: #909090; + -webkit-box-shadow: 0px 0px 2px 2px #909090; + -moz-box-shadow: 0px 0px 2px 2px #909090; + box-shadow: 0px 0px 2px 2px909090; + border: 1px solid #c0c0c0; +} + +#mglogo > a { + background-image: linear-gradient(#707070 0%, #707070 250%); + background-color: transparent; + color: antiquewhite; +} + +.logo h1{ + color: antiquewhite; +} diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 84e30eb79f343817f18cad81a7d8b0f67fbb1def..603b4fa27943f131982f7888b2a0f5307a7d8dc0 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -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&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&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> diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php index b8a198999bb5533f8407a50957cd8a70a4bf96fe..2fe88510b6f923f54abd793fe12e52c68a65c050 100644 --- a/resources/views/layouts/resultPage.blade.php +++ b/resources/views/layouts/resultPage.blade.php @@ -21,7 +21,8 @@ @endif <link type="text/css" rel="stylesheet" href="/css/lightslider.css" /> - + <!-- In Erprobung --> + <!-- <link href="/css/themeDark.css" rel="stylesheet" /> --> </head> <body id="resultBody"> @if( !isset($suspendheader) ) diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index d656954b56fd3aa78677b8b40b7b59348398d0ec..7a6d13db7496d2ed6236465177783254227432ca 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -27,6 +27,8 @@ @endif @endif <link id="theme" href="/css/theme.css.php" rel="stylesheet" /> + <!-- In Erprobung --> + <!-- <link href="/css/themeDark.css" rel="stylesheet" /> --> </head> <body> diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php index 892d2bc0afa71be0fd6a6dd9f581d8c7f316fc10..d64cbce5ab3a739dfd585b7e000b1d05126114f0 100644 --- a/resources/views/quicktip.blade.php +++ b/resources/views/quicktip.blade.php @@ -4,6 +4,9 @@ <link rel="stylesheet" type="text/css" href="/css/bootstrap.css" /> <link rel="stylesheet" type="text/css" href="/css/style.css" /> </head> + + <!-- In Erprobung --> + <!-- <link href="/css/themeDark.css" rel="stylesheet" /> --> <body> @if( $spruch !== "" ) <blockquote id="spruch">{!! $spruch !!}</blockquote> diff --git a/resources/views/widget/sitesearch.blade.php b/resources/views/widget/sitesearch.blade.php index dd0b99cf1a4af6a8de684cfe4a8a53b54dc62ecc..d194f64a76616c12a20fc4f460a80ce4fb4bd2e1 100644 --- a/resources/views/widget/sitesearch.blade.php +++ b/resources/views/widget/sitesearch.blade.php @@ -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> diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php index c8a558bae64e690f38fc1e6eebdc5897b6e5b179..b07307cc87cc6d6773131c55bf4e8805893f454c 100644 --- a/resources/views/widget/widget.blade.php +++ b/resources/views/widget/widget.blade.php @@ -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