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

Merge branch '259-neue-designs' into 'development' 

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



See merge request !466
parents 29243e6f ea04ceab
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 @ 19644608
......@@ -8,8 +8,7 @@ a, a:link, a:visited {
text-decoration: none;
}
#foki input:checked + label{
#foki input:checked + label {
background-color: #707070;
}
......@@ -17,7 +16,7 @@ a, a:link, a:visited {
background-color: #505050;
border-color: #505050;
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 {
......@@ -59,7 +58,7 @@ a, a:link, a:visited {
color: antiquewhite;
}
a:link.mutelink, a:visited.mutelink{
a:link.mutelink, a:visited.mutelink {
color: antiquewhite;
}
......@@ -127,22 +126,26 @@ pre {
color: antiquewhite;
}
.form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */
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 4 to 18 */
color: #antiquewhite;
opacity: 1;
}
.form-control::-moz-placeholder { /* Mozilla Firefox 19+ */
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;
.form-control:-ms-input-placeholder {
/* Internet Explorer 10-11 */
color: #antiquewhite;
}
.panel-default {
......@@ -167,6 +170,7 @@ pre {
border-color: #68491c;
}
/* Result Page */
.result .description {
......@@ -196,7 +200,8 @@ pre {
}
.result > .number {
color: burlywood !important; /* Wird normalerweise inline gesetzt */
color: burlywood !important;
/* Wird normalerweise inline gesetzt */
}
.result .title {
......@@ -294,32 +299,32 @@ a:hover {
background-color: transparent;
}
/* Aus der theme.css */
body{
background-color: #505050;
background-attachment: fixed;
body {
background-color: #505050;
background-attachment: fixed;
}
body#resultBody{
background-image: inherit;
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;
-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-image: linear-gradient(#707070 0%, #707070 250%);
background-color: transparent;
color: antiquewhite;
}
.logo h1{
color: antiquewhite;
}
.logo h1 {
color: antiquewhite;
}
\ No newline at end of file
resources/views/layouts/resultPage.blade.php
+ 3
− 7
View file @ 19644608
<!DOCTYPE html>
<html>
<head>
<title>{{ $metager->getQ() }} - MetaGer</title>
<link href="/css/bootstrap.css" rel="stylesheet" />
......@@ -16,13 +15,10 @@
<meta content="{{ $eingabe }}" name="q" />
<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()))])) }}">
@if( isset($metager->theme) && $metager->theme != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ $metager->theme }}.css" />
@endif
@if( app('request')->input('theme', 'none') != "none" )
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'none') }}.css" />
@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) )
......
resources/views/layouts/staticPages.blade.php
+ 4
− 2
View file @ 19644608
......@@ -26,9 +26,11 @@
<link href="/css/{{ $css }}" rel="stylesheet" />
@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" />
<!-- In Erprobung -->
<!-- <link href="/css/themeDark.css" rel="stylesheet" /> -->
@endif
</head>
<body>
......
resources/views/quicktip.blade.php
+ 3
− 3
View file @ 19644608
......@@ -3,10 +3,10 @@
<title>{!! trans('quicktip.title') !!}</title>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.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>
<!-- In Erprobung -->
<!-- <link href="/css/themeDark.css" rel="stylesheet" /> -->
<body>
@if( $spruch !== "" )
<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