Merge branch 'new-colors' into develop
This commit is contained in:
@@ -1,7 +1,18 @@
|
||||
$color-red: #cd1013;
|
||||
@use "sass:color";
|
||||
|
||||
$color-blue: #193f78;
|
||||
|
||||
$color-blue-light: color.adjust($color-blue, $lightness: 40%);
|
||||
$color-blue-super-light: color.adjust($color-blue, $lightness: 60%);
|
||||
$color-blue-thin: color.adjust($color-blue, $lightness: 65%);
|
||||
$color-blue-super-thin: color.adjust($color-blue, $lightness: 69%);
|
||||
|
||||
$color-background-mobile-menu: #f5f5f5;
|
||||
$color-background-mobile-menu: $color-blue-super-thin;
|
||||
$color-background-mobile-menu-header: #e0e0e0;
|
||||
$color-hor-line: #a5a5a5;
|
||||
$color-background-mobile-menu-header: $color-blue-super-light;
|
||||
|
||||
$color-hor-line: $color-blue-light;
|
||||
$color-vh-vorne: #ddcb55;
|
||||
$color-vh-mitte: #c98879;
|
||||
$color-vh-hinten: #0082c9;
|
||||
|
||||
@@ -13,11 +13,12 @@ $left-menu-width: 180px;
|
||||
|
||||
@mixin menu-style() {
|
||||
font-family: 'Open Sans Condensed', sans-serif;
|
||||
color: black;
|
||||
color: $color-blue;
|
||||
text-decoration: none;
|
||||
|
||||
&.active, &:hover {
|
||||
color: $color-red;
|
||||
background-color: $color-blue;
|
||||
color: white
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +34,7 @@ body {
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
color: $color-red;
|
||||
color: $color-blue;
|
||||
font-family: 'Droid Serif',serif;
|
||||
font-weight: normal;
|
||||
}
|
||||
@@ -71,7 +72,7 @@ h1 {
|
||||
|
||||
.announcements {
|
||||
margin-top: 20px;
|
||||
background-color: #ececec;
|
||||
background-color: $color-blue-thin;
|
||||
|
||||
.entry {
|
||||
margin: 25px 0;
|
||||
@@ -110,10 +111,10 @@ h1 {
|
||||
padding: 0 15px;
|
||||
font: 1.5em 'Open Sans Condensed', sans-serif;
|
||||
color: black;
|
||||
background-color: #ececec;
|
||||
background-color: $color-blue-thin;
|
||||
|
||||
&.active, &:hover {
|
||||
background-color: $color-red;
|
||||
background-color: $color-blue;
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
@@ -190,7 +191,7 @@ table {
|
||||
}
|
||||
|
||||
thead > tr {
|
||||
background-color: $color-red;
|
||||
background-color: $color-blue;
|
||||
color: white;
|
||||
text-align: left;
|
||||
}
|
||||
@@ -199,7 +200,7 @@ table {
|
||||
// @include schedule.legacy;
|
||||
|
||||
#header {
|
||||
border-bottom: 2px solid rgba(173, 173, 173, 50%);
|
||||
border-bottom: 1px solid $color-blue;
|
||||
margin: 0 auto 30px;
|
||||
width: 100%;
|
||||
|
||||
@@ -232,8 +233,8 @@ table {
|
||||
// height: 250px;
|
||||
display: none;
|
||||
padding: 0 10px;
|
||||
border-right: 20px solid $color-red;
|
||||
border-left: 20px solid $color-red;
|
||||
border-right: 20px solid $color-blue;
|
||||
border-left: 20px solid $color-blue;
|
||||
position: relative;
|
||||
|
||||
@include r.media-large {
|
||||
@@ -279,11 +280,11 @@ table {
|
||||
margin: 0 10px 0 0;
|
||||
border-radius: 5px;
|
||||
background-color: #eee;
|
||||
border: 1.5px solid #444;
|
||||
border: 1.5px solid $color-blue;
|
||||
|
||||
&.active {
|
||||
background-color: #444;
|
||||
border: 1.5px solid #ccc;
|
||||
background-color: $color-blue-light;
|
||||
border: 1.5px solid #eee;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -307,7 +308,8 @@ table {
|
||||
align-items: center;
|
||||
|
||||
a {
|
||||
margin: 0 40px 0 0;
|
||||
margin: 0 15px 0 0;
|
||||
padding: 0 12.5px;
|
||||
|
||||
// height: 100%;
|
||||
@include menu-style;
|
||||
@@ -326,6 +328,7 @@ table {
|
||||
align-items: center;
|
||||
border-top: 1px solid $color-hor-line;
|
||||
box-sizing: border-box;
|
||||
color: $color-blue;
|
||||
|
||||
.first-entry {
|
||||
font: 1em 'Open Sans Condensed', sans-serif;
|
||||
@@ -355,6 +358,7 @@ table {
|
||||
|
||||
a {
|
||||
@include menu-style;
|
||||
color: $color-blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -591,7 +595,7 @@ table {
|
||||
|
||||
&.active {
|
||||
color: white;
|
||||
background-color: $color-red;
|
||||
background-color: $color-blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user