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

Die dark.css lässt sich jetzt mittels Url-Parameter theme=dark einbinden

parent 699d3327
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 → public/css/themes/dark.css
+ 32
− 27
View file @ ea04ceab
...@@ -8,8 +8,7 @@ a, a:link, a:visited { ...@@ -8,8 +8,7 @@ a, a:link, a:visited {
text-decoration: none; text-decoration: none;
} }
#foki input:checked + label {
#foki input:checked + label{
background-color: #707070; background-color: #707070;
} }
...@@ -17,7 +16,7 @@ a, a:link, a:visited { ...@@ -17,7 +16,7 @@ a, a:link, a:visited {
background-color: #505050; background-color: #505050;
border-color: #505050; border-color: #505050;
border-bottom: 3px solid #707070; border-bottom: 3px solid #707070;
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2); box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
} }
.navbar li a { .navbar li a {
...@@ -59,7 +58,7 @@ a, a:link, a:visited { ...@@ -59,7 +58,7 @@ a, a:link, a:visited {
color: antiquewhite; color: antiquewhite;
} }
a:link.mutelink, a:visited.mutelink{ a:link.mutelink, a:visited.mutelink {
color: antiquewhite; color: antiquewhite;
} }
...@@ -127,22 +126,26 @@ pre { ...@@ -127,22 +126,26 @@ pre {
color: antiquewhite; color: antiquewhite;
} }
.form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */ .form-control::-webkit-input-placeholder {
color: #antiquewhite; /* WebKit, Blink, Edge */
color: #antiquewhite;
} }
.form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ .form-control:-moz-placeholder {
color: #antiquewhite; /* Mozilla Firefox 4 to 18 */
opacity: 1; color: #antiquewhite;
opacity: 1;
} }
.form-control::-moz-placeholder { /* Mozilla Firefox 19+ */ .form-control::-moz-placeholder {
color: antiquewhite; /* Mozilla Firefox 19+ */
opacity: 1; color: antiquewhite;
opacity: 1;
} }
.form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */ .form-control:-ms-input-placeholder {
color: #antiquewhite; /* Internet Explorer 10-11 */
color: #antiquewhite;
} }
.panel-default { .panel-default {
...@@ -167,6 +170,7 @@ pre { ...@@ -167,6 +170,7 @@ pre {
border-color: #68491c; border-color: #68491c;
} }
/* Result Page */ /* Result Page */
.result .description { .result .description {
...@@ -196,7 +200,8 @@ pre { ...@@ -196,7 +200,8 @@ pre {
} }
.result > .number { .result > .number {
color: burlywood !important; /* Wird normalerweise inline gesetzt */ color: burlywood !important;
/* Wird normalerweise inline gesetzt */
} }
.result .title { .result .title {
...@@ -294,32 +299,32 @@ a:hover { ...@@ -294,32 +299,32 @@ a:hover {
background-color: transparent; background-color: transparent;
} }
/* Aus der theme.css */ /* Aus der theme.css */
body{ body {
background-color: #505050; background-color: #505050;
background-attachment: fixed; background-attachment: fixed;
} }
body#resultBody{ body#resultBody {
background-image: inherit; background-image: inherit;
} }
input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus, .form-control:focus { input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus, .form-control:focus {
outline-color: #909090; outline-color: #909090;
-webkit-box-shadow: 0px 0px 2px 2px #909090; -webkit-box-shadow: 0px 0px 2px 2px #909090;
-moz-box-shadow: 0px 0px 2px 2px #909090; -moz-box-shadow: 0px 0px 2px 2px #909090;
box-shadow: 0px 0px 2px 2px909090; box-shadow: 0px 0px 2px 2px909090;
border: 1px solid #c0c0c0; border: 1px solid #c0c0c0;
} }
#mglogo > a { #mglogo > a {
background-image: linear-gradient(#707070 0%, #707070 250%); background-image: linear-gradient(#707070 0%, #707070 250%);
background-color: transparent; background-color: transparent;
color: antiquewhite; color: antiquewhite;
} }
.logo h1{ .logo h1 {
color: antiquewhite; color: antiquewhite;
} }
\ No newline at end of file
resources/views/layouts/resultPage.blade.php
+ 3
− 7
View file @ ea04ceab
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>{{ $metager->getQ() }} - MetaGer</title> <title>{{ $metager->getQ() }} - MetaGer</title>
<link href="/css/bootstrap.css" rel="stylesheet" /> <link href="/css/bootstrap.css" rel="stylesheet" />
...@@ -16,13 +15,10 @@ ...@@ -16,13 +15,10 @@
<meta content="{{ $eingabe }}" name="q" /> <meta content="{{ $eingabe }}" name="q" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}"> <link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
@if( isset($metager->theme) && $metager->theme != "none" ) @if( app('request')->input('theme', 'none') != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ $metager->theme }}.css" /> <link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@endif @endif
<link type="text/css" rel="stylesheet" href="/css/lightslider.css" /> <link type="text/css" rel="stylesheet" href="/css/lightslider.css" />
<!-- In Erprobung -->
<!-- <link href="/css/themeDark.css" rel="stylesheet" /> -->
</head> </head>
<body id="resultBody"> <body id="resultBody">
@if( !isset($suspendheader) ) @if( !isset($suspendheader) )
......
resources/views/layouts/staticPages.blade.php
+ 4
− 2
View file @ ea04ceab
...@@ -26,9 +26,11 @@ ...@@ -26,9 +26,11 @@
<link href="/css/{{ $css }}" rel="stylesheet" /> <link href="/css/{{ $css }}" rel="stylesheet" />
@endif @endif
@endif @endif
@if( app('request')->input('theme', 'none') != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@else
<link id="theme" href="/css/theme.css.php" rel="stylesheet" /> <link id="theme" href="/css/theme.css.php" rel="stylesheet" />
<!-- In Erprobung --> @endif
<!-- <link href="/css/themeDark.css" rel="stylesheet" /> -->
</head> </head>
<body> <body>
......
resources/views/quicktip.blade.php
+ 3
− 3
View file @ ea04ceab
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<title>{!! trans('quicktip.title') !!}</title> <title>{!! trans('quicktip.title') !!}</title>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.css" /> <link rel="stylesheet" type="text/css" href="/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/css/style.css" /> <link rel="stylesheet" type="text/css" href="/css/style.css" />
@if( app('request')->input('theme', 'none') != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@endif
</head> </head>
<!-- In Erprobung -->
<!-- <link href="/css/themeDark.css" rel="stylesheet" /> -->
<body> <body>
@if( $spruch !== "" ) @if( $spruch !== "" )
<blockquote id="spruch">{!! $spruch !!}</blockquote> <blockquote id="spruch">{!! $spruch !!}</blockquote>
......
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