Skip to content

GitLab

Commit 000fd311 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch '286-gulp-fur-less-einrichten' into 'development' 

Mergefähige Version



See merge request !495
parents c5741be8 08f854fe
Hide whitespace changes
Inline Side-by-side
Showing with 629 additions and 77 deletions
public/css/themes/default.css
View file @ 000fd311
......@@ -1067,11 +1067,11 @@ html {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 1.42857143;
color: #333333;
background-color: #fff;
background-color: #fafafa;
}
input,
button,
......@@ -1115,7 +1115,7 @@ img {
.img-thumbnail {
padding: 4px;
line-height: 1.42857143;
background-color: #fff;
background-color: #fafafa;
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
......@@ -1581,7 +1581,7 @@ pre code {
}
@media (min-width: 1200px) {
.container {
width: 1170px;
width: 1370px;
}
}
.container-fluid {
......@@ -2274,7 +2274,7 @@ th {
border-top: 2px solid #ddd;
}
.table .table {
background-color: #fff;
background-color: #fafafa;
}
.table-condensed > thead > tr > th,
.table-condensed > tbody > tr > th,
......@@ -2543,9 +2543,9 @@ output {
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control:focus {
border-color: #66afe9;
border-color: #ff8000;
outline: 0;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(255, 128, 0, 0.6);
}
.form-control::-moz-placeholder {
color: #999;
......@@ -3197,26 +3197,26 @@ fieldset[disabled] .btn-success.focus {
}
.btn-info {
color: #fff;
background-color: #5bc0de;
border-color: #46b8da;
background-color: #FB0;
border-color: #e6a800;
}
.btn-info:focus,
.btn-info.focus {
color: #fff;
background-color: #31b0d5;
border-color: #1b6d85;
background-color: #cc9600;
border-color: #664b00;
}
.btn-info:hover {
color: #fff;
background-color: #31b0d5;
border-color: #269abc;
background-color: #cc9600;
border-color: #a87b00;
}
.btn-info:active,
.btn-info.active,
.open > .dropdown-toggle.btn-info {
color: #fff;
background-color: #31b0d5;
border-color: #269abc;
background-color: #cc9600;
border-color: #a87b00;
}
.btn-info:active:hover,
.btn-info.active:hover,
......@@ -3228,8 +3228,8 @@ fieldset[disabled] .btn-success.focus {
.btn-info.active.focus,
.open > .dropdown-toggle.btn-info.focus {
color: #fff;
background-color: #269abc;
border-color: #1b6d85;
background-color: #a87b00;
border-color: #664b00;
}
.btn-info:active,
.btn-info.active,
......@@ -3245,11 +3245,11 @@ fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus {
background-color: #5bc0de;
border-color: #46b8da;
background-color: #FB0;
border-color: #e6a800;
}
.btn-info .badge {
color: #5bc0de;
color: #FB0;
background-color: #fff;
}
.btn-warning {
......@@ -3994,7 +3994,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus {
color: #555555;
background-color: #fff;
background-color: #fafafa;
border: 1px solid #ddd;
border-bottom-color: transparent;
cursor: default;
......@@ -4040,7 +4040,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
border-bottom-color: #fff;
border-bottom-color: #fafafa;
}
}
.nav-pills > li {
......@@ -4108,7 +4108,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > .active > a,
.nav-tabs-justified > .active > a:hover,
.nav-tabs-justified > .active > a:focus {
border-bottom-color: #fff;
border-bottom-color: #fafafa;
}
}
.tab-content > .tab-pane {
......@@ -4843,11 +4843,11 @@ a.label:focus {
background-color: #449d44;
}
.label-info {
background-color: #5bc0de;
background-color: #FB0;
}
.label-info[href]:hover,
.label-info[href]:focus {
background-color: #31b0d5;
background-color: #cc9600;
}
.label-warning {
background-color: #f0ad4e;
......@@ -4957,7 +4957,7 @@ a.badge:focus {
padding: 4px;
margin-bottom: 20px;
line-height: 1.42857143;
background-color: #fff;
background-color: #fafafa;
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: border 0.2s ease-in-out;
......@@ -5108,7 +5108,7 @@ a.thumbnail.active {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.progress-bar-info {
background-color: #5bc0de;
background-color: #FB0;
}
.progress-striped .progress-bar-info {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
......@@ -5917,7 +5917,7 @@ button.close {
position: absolute;
z-index: 1070;
display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-style: normal;
font-weight: normal;
letter-spacing: normal;
......@@ -6035,7 +6035,7 @@ button.close {
display: none;
max-width: 276px;
padding: 1px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Liberation Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-style: normal;
font-weight: normal;
letter-spacing: normal;
......@@ -6672,6 +6672,9 @@ button.close {
display: none !important;
}
}
body.quicktips {
background-color: white;
}
/*
......@@ -7198,25 +7201,16 @@ nav h1 {
body > div {
padding-top: 70px;
}
body {
background-color: #fafafa;
background-attachment: fixed;
}
body#resultBody {
background-image: inherit;
}
input[type=text]:focus,
textarea:focus,
input[type=email]:focus,
input[type=tel]:focus {
outline-color: #ff8000;
box-shadow: 0px 0px 2px 2px #ff8000;
border: 1px solid #ff8000;
/*input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus {
outline-color: rgb(255, 128, 0);
-webkit-box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
-moz-box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
border: 1px solid rgba(255, 128, 0, 1);
}
*/
#mglogo > a {
background-image: -webkit-linear-gradient(#ff8000 0%, #ff8000 250%);
background-image: linear-gradient(#ff8000 0%, #ff8000 250%);
background-color: transparent;
background-color: #ff8000;
color: white;
}
.logo h1 {
......
public/css/themes/default.css.map
View file @ 000fd311
This source diff could not be displayed because it is too large. You can view the blob instead.
resources/assets/less/default.less
View file @ 000fd311
@import "./bootstrap/bootstrap.less";
@import "./metager/metager.less";
@import "./bootstrap/variables.less";
@import "./variables-default.less";
body{
background-color: rgb(250, 250, 250);
background-attachment: fixed;
}
body#resultBody{
background-image: inherit;
}
input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus {
/*input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]:focus {
outline-color: rgb(255, 128, 0);
-webkit-box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
-moz-box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
-moz-box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
box-shadow: 0px 0px 2px 2px rgba(255, 128, 0, 1);
border: 1px solid rgba(255, 128, 0, 1);
}
*/
#mglogo > a {
background-image: linear-gradient(rgb(255, 128, 0) 0%, rgb(255, 128, 0) 250%);
background-color: transparent;
background-color: rgb(255, 128, 0);
color: white;
}
.logo h1{
color: rgb(255, 128, 0);
.logo h1 {
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: rgb(255, 128, 0);
border-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: rgb(255, 128, 0);
border-color: rgb(255, 128, 0);
}
.pagination > li > a, .pagination > li > span{
color: rgb(255, 128, 0);
.pagination > li > a, .pagination > li > span {
color: rgb(255, 128, 0);
}
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus{
color: rgb(255, 128, 0);
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus {
color: rgb(255, 128, 0);
}
.navbar {
border-bottom: 3px solid rgb(255, 128, 0);
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
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: rgb(255, 128, 0);
color: rgb(255, 128, 0);
}
\ No newline at end of file
resources/assets/less/metager/metager.less
View file @ 000fd311
//@import "./result-page.less";
body.quicktips {
background-color: white;
}
/*
......
resources/assets/less/metager/result-page.less 0 → 100644
View file @ 000fd311
.hostlabel a:link, .hostlabel a:visited {
color: #FFFFFF;
}
.hostlabel {
display: none;
position: relative;
margin-top: -14px;
background-color: #333;
}
.img:hover .hostlabel {
display: block;
}
.row {
margin: 10px 15px;
margin-top: 0;
}
.nav-tabs > li.active {}
nav-tabs > li.active {
border-bottom: 0;
}
.tab-pane.active {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
padding: 10px 0;
padding-top: 0;
}
/* Hier der Style für unsere Suchleiste */
.tab-pane .alert {
margin: 10px 0;
padding: 5px 15px;
}
.alert ul {
list-style-type: none;
padding-left: 49px;
}
/* Logo */
.logo {
height: 35px;
padding: 5px 0;
}
.logo > a {
line-height: 100%;
height: 100%;
display: block;
}
#research ul.list-inline {
margin-left: 0;
width: 100%;
}
@media (max-width: 767px) {
#research .visible-xs {
display: inline-block!important;
}
}
.input-group-addon {
padding: 0;
}
input#eingabeTop {
height: 35px;
}
nav .input-group {
height: 35px;
padding: 5px 0;
}
header nav {
height: 100%;
}
header ul {
height: 100%;
vertical-align: middle;
}
#research nav ul > li {
width: 20%;
height: 45px;
vertical-align: middle;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul > li.visible-xs {
width: 10%;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul li + li + li {
width: 80%;
}
#research {
background-color: white;
position: fixed;
top: 0;
width: 100%;
height: 45px;
z-index: 500;
width: 80%;
left: 50%;
margin-left: -40%;
}
.logo h1 {
font-family: Liberation Sans, sans-serif;
font-style: italic;
margin: 0;
font-weight: bold;
line-height: 1;
white-space: nowrap;
}
#search {
background-color: inherit;
border: 0;
width: 50px;
height: 100%;
}
#reSearch a {
color: black;
}
.content-wrapper {
width: 80%;
margin: 0 auto;
padding-top: 60px;
/* padding: 10px; */
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);
}
#helpButton {
color: black;
}
body {
height: 100%;
background-image: inherit;
background-color: rgba(2, 93, 140, .03);
}
a#donation:hover {}
a#donation, a#donation:visited {
color: inherit;
}
a#donation:hover {
color: red;
}
a:visited {
color: #792ea1;
}
a:hover {
text-decoration: none;
color: red;
}
/* Hier der Style für unsere Tabliste */
#foki {
background-color: white;
}
#foki a {
color: grey;
}
#foki li.active a {
color: black;
background-color: white;
}
#foki li.active span + span {
display: inline!important;
}
#spenden {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
#spruch .author {
font-size: 80%;
font-weight: normal;
font-style: italic;
color: #333333;
}
#spruch > p {
margin-bottom: 0;
}
#spruch > p + p {
margin-top: 4px;
}
/* Hier der Style für die einzelnen Ergebnisboxen */
.result {
margin-bottom: 10px;
width: 100%
}
.result > .number {
font-size: 15px;
line-height: 1;
text-align: right;
}
.result > .resultInformation {
border-radius: 5px;
}
.result .title {
color: black;
text-decoration: none;
font-size: 14px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
line-height: 1.1;
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
}
.result.ad .title {
color: green;
}
.result .link {
font-size: 13px;
margin: 0;
line-height: 1.5;
}
.result .link-link {
white-space: nowrap;
max-width: 60%;
overflow: hidden;
text-overflow: ellipsis;
float: left;
}
.result:not(.ad) .link > div {
white-space: nowrap;
}
.result:not(.ad) .link > span {
white-space: nowrap;
margin: 0 5px;
}
.result:not(.ad) .link .options {
color: #333;
float: left;
}
.result:not(.ad) .link:hover {
cursor: pointer;
}
.result:not(.ad) .link .options > a {
color: #333;
display: block;
padding-left: 5px;
padding-right: 5px;
}
.result:not(.ad) .link .options > a > span {
font-size: 10px;
}
.result .description {
margin-bottom: 3px;
color: black;
font-size: 14px;
line-height: 1.3;
clear: both;
}
.result .description p {
margin: 0;
margin-bottom: 4px;
}
.result .description img {
margin: 5px;
margin-left: 0;
margin-right: 15px;
height: auto;
width: auto;
max-width: 120px;