Skip to content

GitLab

Commit 1a3ff509 authored by Phil Höfer's avatar Phil Höfer
Browse files

altes design erstmal wieder hergerichtet (Zwecks merge auf master)

parent 18f4adf4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 54 deletions
public/css/themes/default.css
View file @ 1a3ff509
......@@ -1082,12 +1082,12 @@ textarea {
line-height: inherit;
}
a {
color: #ff8000;
color: #337ab7;
text-decoration: none;
}
a:hover,
a:focus {
color: #b35a00;
color: #23527c;
text-decoration: underline;
}
a:focus {
......@@ -1321,11 +1321,11 @@ mark,
color: #777777;
}
.text-primary {
color: #ff8000;
color: #337ab7;
}
a.text-primary:hover,
a.text-primary:focus {
color: #cc6600;
color: #286090;
}
.text-success {
color: #3c763d;
......@@ -1357,11 +1357,11 @@ a.text-danger:focus {
}
.bg-primary {
color: #fff;
background-color: #ff8000;
background-color: #337ab7;
}
a.bg-primary:hover,
a.bg-primary:focus {
background-color: #cc6600;
background-color: #286090;
}
.bg-success {
background-color: #dff0d8;
......@@ -3083,26 +3083,26 @@ fieldset[disabled] .btn-default.focus {
}
.btn-primary {
color: #fff;
background-color: #ff8000;
border-color: #e67300;
background-color: #337ab7;
border-color: #2e6da4;
}
.btn-primary:focus,
.btn-primary.focus {
color: #fff;
background-color: #cc6600;
border-color: #663300;
background-color: #286090;
border-color: #122b40;
}
.btn-primary:hover {
color: #fff;
background-color: #cc6600;
border-color: #a85400;
background-color: #286090;
border-color: #204d74;
}
.btn-primary:active,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
color: #fff;
background-color: #cc6600;
border-color: #a85400;
background-color: #286090;
border-color: #204d74;
}
.btn-primary:active:hover,
.btn-primary.active:hover,
......@@ -3114,8 +3114,8 @@ fieldset[disabled] .btn-default.focus {
.btn-primary.active.focus,
.open > .dropdown-toggle.btn-primary.focus {
color: #fff;
background-color: #a85400;
border-color: #663300;
background-color: #204d74;
border-color: #122b40;
}
.btn-primary:active,
.btn-primary.active,
......@@ -3131,11 +3131,11 @@ fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus {
background-color: #ff8000;
border-color: #e67300;
background-color: #337ab7;
border-color: #2e6da4;
}
.btn-primary .badge {
color: #ff8000;
color: #337ab7;
background-color: #fff;
}
.btn-success {
......@@ -3367,7 +3367,7 @@ fieldset[disabled] .btn-danger.focus {
background-color: #fff;
}
.btn-link {
color: #ff8000;
color: #337ab7;
font-weight: normal;
border-radius: 0;
}
......@@ -3387,7 +3387,7 @@ fieldset[disabled] .btn-link {
}
.btn-link:hover,
.btn-link:focus {
color: #b35a00;
color: #23527c;
text-decoration: underline;
background-color: transparent;
}
......@@ -3531,7 +3531,7 @@ tbody.collapse.in {
color: #fff;
text-decoration: none;
outline: 0;
background-color: #ff8000;
background-color: #337ab7;
}
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
......@@ -3963,7 +3963,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #eeeeee;
border-color: #ff8000;
border-color: #337ab7;
}
.nav .nav-divider {
height: 1px;
......@@ -4056,7 +4056,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #fff;
background-color: #ff8000;
background-color: #337ab7;
}
.nav-stacked > li {
float: none;
......@@ -4678,7 +4678,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
padding: 6px 12px;
line-height: 1.42857143;
text-decoration: none;
color: #ff8000;
color: #337ab7;
background-color: #fff;
border: 1px solid #ddd;
margin-left: -1px;
......@@ -4699,7 +4699,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > a:focus,
.pagination > li > span:focus {
z-index: 2;
color: #b35a00;
color: #23527c;
background-color: #eeeeee;
border-color: #ddd;
}
......@@ -4711,8 +4711,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:focus {
z-index: 3;
color: #fff;
background-color: #ff8000;
border-color: #ff8000;
background-color: #337ab7;
border-color: #337ab7;
cursor: default;
}
.pagination > .disabled > span,
......@@ -4829,11 +4829,11 @@ a.label:focus {
background-color: #5e5e5e;
}
.label-primary {
background-color: #ff8000;
background-color: #337ab7;
}
.label-primary[href]:hover,
.label-primary[href]:focus {
background-color: #cc6600;
background-color: #286090;
}
.label-success {
background-color: #5cb85c;
......@@ -4897,7 +4897,7 @@ a.badge:focus {
}
.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #ff8000;
color: #337ab7;
background-color: #fff;
}
.list-group-item > .badge {
......@@ -4971,7 +4971,7 @@ a.badge:focus {
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
border-color: #ff8000;
border-color: #337ab7;
}
.thumbnail .caption {
padding: 9px;
......@@ -5084,7 +5084,7 @@ a.thumbnail.active {
line-height: 20px;
color: #fff;
text-align: center;
background-color: #ff8000;
background-color: #337ab7;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-transition: width 0.6s ease;
transition: width 0.6s ease;
......@@ -5239,8 +5239,8 @@ button.list-group-item {
.list-group-item.active:focus {
z-index: 2;
color: #fff;
background-color: #ff8000;
border-color: #ff8000;
background-color: #337ab7;
border-color: #337ab7;
}
.list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading,
......@@ -5256,7 +5256,7 @@ button.list-group-item {
.list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text {
color: #ffe6cc;
color: #c7ddef;
}
.list-group-item-success {
color: #3c763d;
......@@ -5635,22 +5635,22 @@ button.list-group-item-danger.active:focus {
border-bottom-color: #ddd;
}
.panel-primary {
border-color: #ff8000;
border-color: #337ab7;
}
.panel-primary > .panel-heading {
color: #fff;
background-color: #ff8000;
border-color: #ff8000;
background-color: #337ab7;
border-color: #337ab7;
}
.panel-primary > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #ff8000;
border-top-color: #337ab7;
}
.panel-primary > .panel-heading .badge {
color: #ff8000;
color: #337ab7;
background-color: #fff;
}
.panel-primary > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #ff8000;
border-bottom-color: #337ab7;
}
.panel-success {
border-color: #d6e9c6;
......@@ -6672,6 +6672,9 @@ button.close {
display: none !important;
}
}
body.quicktips {
background-color: white;
}
/*
......
public/css/themes/default.css.map
View file @ 1a3ff509
This diff is collapsed.
resources/assets/less/default.less
View file @ 1a3ff509
......@@ -13,32 +13,32 @@
*/
#mglogo > a {
background-color: @brand-primary;
background-color: rgb(255, 128, 0);
color: white;
}
.logo h1 {
color: @brand-primary;
color: rgb(255, 128, 0);
}
.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus {
background-color: @brand-primary;
border-color: @brand-primary;
background-color: rgb(255, 128, 0);
border-color: rgb(255, 128, 0);
}
.pagination > li > a, .pagination > li > span {
color: @brand-primary;
color: rgb(255, 128, 0);
}
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus {
color: @brand-primary;
color: rgb(255, 128, 0);
}
.navbar {
border-bottom: 3px solid @brand-primary;
border-bottom: 3px solid rgb(255, 128, 0);
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
}
.lSPrev > span, .lSNext > span {
color: @brand-primary;
color: rgb(255, 128, 0);
}
\ No newline at end of file
resources/assets/less/metager/metager.less
View file @ 1a3ff509
//@import "./result-page.less";
body.quicktips {
background-color: white;
}
/*
......
resources/assets/less/variables-default.less
View file @ 1a3ff509
@brand-primary: rgb(255, 128, 0);
//@brand-primary: rgb(255, 128, 0);
@brand-success: #5cb85c;
@brand-info: #FB0;
@brand-warning: #f0ad4e;
@brand-danger: #d9534f;
@body-bg: rgb(250, 250, 250);
@input-border-focus: @brand-primary;
@input-border-focus: rgb(255, 128, 0);
@font-family-sans-serif: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@container-tablet: (720px + @grid-gutter-width);
@container-desktop: (940px + @grid-gutter-width);
......
resources/views/quicktip.blade.php
View file @ 1a3ff509
......@@ -3,7 +3,7 @@
<title>{!! trans('quicktip.title') !!}</title>
<link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
</head>
<body>
<body class="quicktips">
@if( $spruch !== "" )
<blockquote id="spruch">{!! $spruch !!}</blockquote>
@endif
......
Markdown is supported
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