Skip to content

Commit 002682e

Browse files
authored
Merge pull request #7 from BAMresearch/5-improve-the-app-design-colors-fonts
Improve the app design (colors, fonts...)
2 parents 532f031 + 36e2364 commit 002682e

File tree

13 files changed

+308
-124
lines changed

13 files changed

+308
-124
lines changed

.vscode/settings.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,19 @@
2525
"source.organizeImports.ruff": "always",
2626
"source.fixAll.ruff": "always",
2727
},
28+
"launch": {
29+
"version": "0.2.0",
30+
"configurations": [
31+
{
32+
"name": "Django Server",
33+
"type": "debugpy",
34+
"request": "launch",
35+
"program": "${workspaceFolder}/masterdata_checker/manage.py",
36+
"args": ["runserver"],
37+
"django": true,
38+
"justMyCode": false,
39+
"console": "integratedTerminal"
40+
}
41+
]
42+
},
2843
}
12.3 KB
Loading
13.9 KB
Loading
24.4 KB
Loading
26.1 KB
Loading
88.9 KB
Binary file not shown.
Binary file not shown.
78.7 KB
Binary file not shown.
Binary file not shown.

masterdata_checker/app/static/css/style.css

Lines changed: 145 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,87 @@
1+
@font-face {
2+
font-family: "BAM Klavika-Light";
3+
src: url("../assets/fonts/BAMKlavika-Light.ttf");
4+
font-weight: normal;
5+
font-style: normal;
6+
}
7+
8+
@font-face {
9+
font-family: "BAM Klavika-LightItalic";
10+
src: url("../assets/fonts/BAMKlavika-LightItalic.ttf");
11+
font-weight: normal;
12+
font-style: normal;
13+
}
14+
15+
@font-face {
16+
font-family: "BAM Klavika-Medium";
17+
src: url("../assets/fonts/BAMKlavika-Medium.ttf");
18+
font-weight: normal;
19+
font-style: normal;
20+
}
21+
22+
@font-face {
23+
font-family: "BAM Klavika-MediumItalic";
24+
src: url("../assets/fonts/BAMKlavika-MediumItalic.ttf");
25+
font-weight: normal;
26+
font-style: normal;
27+
}
28+
29+
:root {
30+
--text-font: "BAM Klavika-Light";
31+
--titles-font: "BAM Klavika-Medium";
32+
--code-font: "Noto Mono";
33+
34+
/* BAM colors */
35+
--bam-weiss: rgb(243, 243, 243);
36+
--bam-weiss-dark: rgb(238, 241, 243);
37+
--bam-schwarz-100: rgb(0, 40, 50);
38+
--bam-schwarz-80: rgb(50, 84, 99);
39+
--bam-schwarz-60: rgb(95, 123, 137);
40+
--bam-schwarz-45: rgb(125, 149, 163);
41+
--bam-schwarz-30: rgb(163, 184, 195);
42+
--bam-schwarz-15: rgb(204, 216, 223);
43+
--bam-rot: rgb(210, 0, 30);
44+
--bam-rot-dark: rgb(180, 15, 30);
45+
--bam-rot-darker: rgb(140, 20, 25);
46+
--bam-rot-darkest: rgb(80, 25, 25);
47+
--bam-blau: rgb(0, 175, 240);
48+
--bam-blau-dark: rgb(0, 137, 186);
49+
--bam-blau-darker: rgb(0, 117, 153);
50+
--bam-blau-darkest: rgb(0, 85, 110);
51+
--bam-grun: rgb(140, 180, 15);
52+
--bam-grun-dark: rgb(130, 165, 50);
53+
--bam-grun-darker: rgb(90, 140, 50);
54+
--bam-grun-darkest: rgb(55, 120, 50);
55+
--bam-gelb: rgb(255, 220, 0);
56+
--bam-gelb-dark: rgb(250, 185, 0);
57+
--bam-gelb-darker: rgb(230, 155, 0);
58+
--bam-gelb-darkest: rgb(205, 125, 0);
59+
60+
/* Backgrounds, primaries, and secondaries */
61+
--background-light: var(--bam-weiss);
62+
--color-light: var(--bam-schwarz-100);
63+
--background-dark: var(--bam-schwarz-100);
64+
--color-dark: var(--bam-weiss);
65+
66+
--code-color-light: var(--bam-grun-darkest);
67+
--code-background-light: rgba(204, 216, 223, 0.3); /* similar to bam-schwarz-15 */
68+
--code-color-dark: var(--bam-grun);
69+
--code-background-dark: rgba(27, 72, 83, 0.3);
70+
71+
--grid-background-light: rgba(238, 229, 174, 0.5);
72+
}
73+
174
/* General body styling */
275
body {
376
background-color: #f9f9f9; /* Very light background to make the card stand out */
4-
font-family: 'Arial', sans-serif;
77+
font-family: var(--text-font), sans-serif;
578
padding: 20px; /* Adding some padding for better spacing */
679
}
780

81+
/* .col-md-8 {
82+
width: 100%;
83+
} */
84+
885
/* Card Styling */
986
.card {
1087
border-radius: 10px;
@@ -17,17 +94,19 @@ body {
1794

1895
/* Card title styling */
1996
.card-title {
20-
font-weight: 600;
21-
font-size: 1.5rem;
2297
margin-bottom: 20px;
2398
color: #2d572c; /* Slightly darker green */
2499
text-align: center;
25100
}
26101

102+
.card-title, h1, h2, h3, h4, h5, h6 {
103+
font-family: var(--titles-font), sans-serif;
104+
}
105+
27106
/* Button Styling */
28107
.btn-primary {
29-
background-color: #4CAF50; /* Primary button color */
30-
border-color: #45a049;
108+
background-color: var(--bam-blau-dark); /* Primary button color */
109+
border-color: var(--bam-blau-darkest);
31110
transition: all 0.3s ease;
32111
color: #fff;
33112
padding: 10px 20px; /* More padding for bigger, modern buttons */
@@ -37,8 +116,25 @@ body {
37116
}
38117

39118
.btn-primary:hover {
40-
background-color: #3e8e41; /* Darker green on hover */
41-
border-color: #367c3a;
119+
background-color: var(--bam-blau-darkest); /* Darker green on hover */
120+
border-color: var(--bam-blau-darkest);
121+
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15); /* Stronger shadow on hover */
122+
}
123+
124+
.btn-secondary {
125+
background-color: var(--bam-schwarz-80); /* Primary button color */
126+
border-color: var(--bam-schwarz-100);
127+
transition: all 0.3s ease;
128+
color: #fff;
129+
padding: 10px 20px; /* More padding for bigger, modern buttons */
130+
font-size: 1rem;
131+
border-radius: 5px; /* Subtle rounded corners */
132+
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); /* Shadow effect for depth */
133+
}
134+
135+
.btn-secondary:hover {
136+
background-color: var(--bam-schwarz-100);
137+
border-color: var(--bam-schwarz-100);
42138
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15); /* Stronger shadow on hover */
43139
}
44140

@@ -54,6 +150,7 @@ body {
54150
.form-label {
55151
color: #2d572c; /* Darker green for form labels */
56152
font-weight: bold;
153+
margin-bottom: 0;
57154
}
58155

59156
/* Alert Styling */
@@ -77,15 +174,49 @@ body {
77174
h5 {
78175
text-transform: uppercase; /* Ensures the title is capitalized */
79176
letter-spacing: 1px; /* Adds spacing between letters for a modern feel */
177+
margin-bottom: 16px;
178+
}
179+
180+
/*Collapsible log section*/
181+
.list-group-item-info, .list-group-item-warning, .list-group-item-danger {
182+
--bs-list-group-color: black !important;
183+
--bs-list-group-border-color: #ffffff !important
184+
}
185+
186+
.list-group-item-info {
187+
--bs-list-group-bg: rgba(0, 175, 240, 0.3) !important; /* BAM blue */
188+
}
189+
.list-group-item-warning {
190+
--bs-list-group-bg: rgba(255, 220, 0, 0.3) !important; /* BAM yellow */
191+
}
192+
.list-group-item-danger {
193+
--bs-list-group-bg: rgba(210, 0, 30, 0.3) !important; /* BAM red */
194+
}
195+
196+
.btn-link {
197+
color: black !important;
198+
text-decoration: none;
199+
}
200+
201+
.btn-link:hover,
202+
.btn-link:focus {
203+
color: black !important;
204+
text-decoration: none; /* or none, your choice */
205+
}
206+
207+
.list-group-item + .list-group-item {
208+
border-top-width: 8px !important;
209+
}
210+
211+
button svg.bi-chevron-right {
212+
position: relative;
213+
top: -2px; /* adjust up/down by changing this value */
80214
}
81215

82-
/* Additional margin for file upload input */
83-
input[type="file"] {
84-
margin-top: 10px;
216+
.transition-arrow {
217+
transition: transform 0.3s ease;
85218
}
86219

87-
.progress,
88-
.progress-bar {
89-
border-radius: 0.375rem !important; /* Ensures consistent rounded corners */
90-
height: 100% !important; /* Forces full vertical fill */
220+
button[aria-expanded="true"] .transition-arrow {
221+
transform: rotate(90deg);
91222
}

0 commit comments

Comments
 (0)