Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a central color definition css #1

Open
wants to merge 2 commits into
base: 4.0.0
Choose a base branch
from
Open

use a central color definition css #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b51d5bb
use a color definition css to make overwriting the color values more …
ChristianWitzler Jul 6, 2023
34cd650
Rename colors.css to color.css
ChristianWitzler Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions static/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import url(color.css);

html,
body {
background-color: #023d6b;
background-color: var(--first-color);
/* background: #fefefe; */
font-family: "Weissenhof_Grotesk", Arial, Helvetica, sans-serif;
height: 100%;
Expand All @@ -12,7 +14,7 @@ main {
}

.bg-primary {
background: #023d6b !important;
background: var(--first-color) !important;
color: #fff;
}

Expand All @@ -22,8 +24,8 @@ main {
}

.bg-info {
background: #adbde3 !important;
/* color: #023d6b; */
background: var(--second-color) !important;
/* color: var(--first-color); */
}

.text-secondary {
Expand All @@ -43,29 +45,29 @@ main {

a {
text-decoration: none;
color: #023d6b;
color: var(--first-color);
}

a:hover {
text-decoration: underline;
text-decoration-skip-ink: none;
color: #002036;
color: var(--third-color);
}

a.nav-link {
color: #023d6b;
color: var(--first-color);
}

a.nav-link:hover {
color: #002036;
color: var(--third-color);
}


/* Buttons */

.btn-primary {
background-color: #023d6b;
border-color: #023d6b;
background-color: var(--first-color);
border-color: var(--first-color);
}

.btn-primary:hover,
Expand All @@ -76,31 +78,31 @@ a.nav-link:hover {
}

.btn-outline-primary {
border-color: #023d6b;
color: #023d6b;
border-color: var(--first-color);
color: var(--first-color);
}

.btn-outline-primary:hover,
.btn-outline-primary:focus,
.btn-outline-primary:active {
background-color: #023d6b;
border-color: #023d6b;
background-color: var(--first-color);
border-color: var(--first-color);
color: #fff;
}


/* Progress bar */

.progress-bar {
background-color: #023d6b;
background-color: var(--first-color);
}


/* Visually disabled select dropdowns */

.form-select.disabled {
pointer-events: none;
background-color: #e9ecef;
background-color: var(--fifth-color);
background-image: none;
}

Expand Down
9 changes: 9 additions & 0 deletions static/css/color.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* Define colors */
:root {
--first-color:#023d6b; /*#023d6b*/
--second-color:#adbde3; /*#adbde3*/
--third-color:#002036; /*#002036*/
--fourth-color:#e5e6e7; /*#e5e6e7*/
--fifth-color:#e9ecef; /*#e9ecef*/
--sixth-color:##225f8d; /*##225f8d*/
}
6 changes: 4 additions & 2 deletions static/css/error.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@import url(color.css);

a {
color: #adbde3;
color: var(--second-color);
}

a:hover {
color: #fff;
}
}
14 changes: 8 additions & 6 deletions static/css/footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url(color.css);

/* Top
Footer */

Expand All @@ -14,20 +16,20 @@ div[id^='ampel'] {
}

#footer-top a {
color: #023d6b;
color: var(--first-color);
font-weight: bold;
}

#footer-top a:hover {
color: #002036;
color: var(--third-color);
}


/* Bottom
Footer */

#footer-bottom {
background-color: #002036;
background-color: var(--third-color);
min-height: 60px;
padding-left: 72px;
padding-right: 72px;
Expand All @@ -43,18 +45,18 @@ Footer */
*/

/* .tooltip-inner {
background-color: #002036;
background-color: var(--third-color);
border-radius: 0;
}

.tooltip .tooltip-arrow::before {
border-top-color: #002036;
border-top-color: var(--third-color);
} */

.tooltip-inner {
background-color: #eee;
border-radius: 0;
color: #002036;
color: var(--third-color);
min-height: 42px;
max-width: unset;
white-space: pre-line;
Expand Down
8 changes: 5 additions & 3 deletions static/css/header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url(color.css);

nav .nav-link {
font-size: 19px;
border-bottom: 5px solid transparent;
Expand All @@ -8,8 +10,8 @@ nav .nav-link:hover,
nav .nav-link.active,
.navbar-collapse .navlink:hover,
.navbar-collapse .navlink.active {
border-bottom: 5px solid #023d6b;
color: #023d6b;
border-bottom: 5px solid var(--first-color);
color: var(--first-color);
font-weight: bold;
}

Expand All @@ -29,4 +31,4 @@ nav .nav-link.active,

#logout:hover {
text-decoration: none;
}
}
20 changes: 11 additions & 9 deletions static/css/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url(color.css);

td h6 {
font-size: .75rem;
}
Expand All @@ -13,11 +15,11 @@ tr.lab-collapsible-tr {
.table-new-lab {
--bs-table-bg: #fff;
--bs-table-striped-bg: #fff;
--bs-table-striped-color: #023d6b;
--bs-table-striped-color: var(--first-color);
--bs-table-active-bg: #fff;
--bs-table-active-color: #023d6b;
--bs-table-hover-bg: #e5e6e7;
--bs-table-hover-color: #023d6b;
--bs-table-active-color: var(--first-color);
--bs-table-hover-bg: var(--fourth-color);
--bs-table-hover-color: var(--first-color);
color: #000;
text-transform: uppercase
}
Expand All @@ -28,7 +30,7 @@ Info icon
*/

.progress-log-btn {
color: #023d6b;
color: var(--first-color);
}

.progress-log-btn:hover {
Expand Down Expand Up @@ -70,12 +72,12 @@ Vertical tabs
display: flex;
justify-content: space-between;
text-align: start;
color: #023d6b;
border: 1px solid #023d6b !important;
color: var(--first-color);
border: 1px solid var(--first-color) !important;
}

.nav-pills button.active {
background-color: #023d6b !important;
background-color: var(--first-color) !important;
}

.nav-pills svg {
Expand Down Expand Up @@ -103,4 +105,4 @@ pre {
white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word; /* Internet Explorer 5.5+ */
}
}
20 changes: 11 additions & 9 deletions static/css/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@import url(color.css);

/* Login div */

#login-div h3,
#login-div h4 {
color: #023d6b;
color: var(--first-color);
}

#upper-login-div {
Expand Down Expand Up @@ -52,10 +54,10 @@

#link-div a {
display: block;
color: #023d6b;
color: var(--first-color);
padding: 15px 20px 15px 30px;
background: url("/hub/static/images/sprite.png") #adbde3 no-repeat 12px -5139px;
/* background-color: #adbde3; */
background: url("/hub/static/images/sprite.png") var(--second-color) no-repeat 12px -5139px;
/* background-color: var(--second-color); */
}

#link-div a:hover {
Expand Down Expand Up @@ -84,7 +86,7 @@
}

.carousel-item a {
color: #023d6b;
color: var(--first-color);
}
.carousel-item h3 {
background: url("/hub/static/images/pages/login/blue_line.png") no-repeat 0 100%;
Expand All @@ -98,19 +100,19 @@

.carousel-indicators button {
border: 2px solid white !important;
background-color: #adbde3 !important;
background-color: var(--second-color) !important;
border-radius: 50%;
height: 14px !important;
width: 14px !important;
margin: 0 0.5rem;
}

.carousel-indicators button:hover {
background-color: #002036 !important;
background-color: var(--third-color) !important;
}

.carousel-indicators button.active {
background-color: #023d6b !important;
background-color: var(--first-color) !important;
}

.carousel-control-prev,
Expand All @@ -130,4 +132,4 @@

.carousel-control-next-icon {
background-image: url("/hub/static/images/pages/login/right_whitebg_arrow.svg");
}
}