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

Jump to bottom

fix(ui): Refactoring of themes #193

Merged
merged 10 commits into from
Oct 10, 2023
Merged

fix(ui): Refactoring of themes #193

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bff2735
- Fixed the badge colors
lupusA Sep 18, 2023
0e76bba
fix(ui): Fix missing badges in policy table (#194)
lupusA Sep 25, 2023
24feeda
Merge branch 'main' of https://github.com/kopia/htmlui into refactori…
lupusA Sep 27, 2023
2263cdc
Started to refactor css
lupusA Sep 27, 2023
c8a23e5
Further refactoring of the css file
lupusA Sep 29, 2023
96115b3
Deleted obsolet css statements
lupusA Sep 29, 2023
6a881e0
Adjusting colors and refactor css
lupusA Sep 30, 2023
932c3cc
Dummy commit
lupusA Sep 30, 2023
8ecd091
Further refactoring. Properly overriding bootstrap
lupusA Oct 1, 2023
b5cab29
Minor refactoring
lupusA Oct 3, 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
106 changes: 88 additions & 18 deletions src/css/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,42 +54,54 @@ body {
border-color: var(--color-danger);
}

.btn-primary:hover, .btn-primary:focus, .btn-primary:active {
.btn-primary:hover,
.btn-primary:focus,
.btn-primary:active {
background-color: var(--color-primary);
border-color: var(--color-primary);
color: var(--text-color);
filter: brightness(80%);
}

.btn-secondary:hover, .btn-secondary:focus, .btn-secondary:active {
.btn-secondary:hover,
.btn-secondary:focus,
.btn-secondary:active {
background-color: var(--color-secondary);
border-color: var(--color-secondary);
color: var(--text-color);
filter: brightness(80%);
}

.btn-warning:hover, .btn-warning:focus, .btn-warning:active {
.btn-warning:hover,
.btn-warning:focus,
.btn-warning:active {
background-color: var(--color-warning);
border-color: var(--color-warning);
color: var(--text-color);
filter: brightness(80%);
}

.btn-success:hover, .btn-success:focus, .btn-success:active {
.btn-success:hover,
.btn-success:focus,
.btn-success:active {
background-color: var(--color-success);
border-color: var(--color-success);
color: var(--text-color);
filter: brightness(80%);
}

.btn-danger:hover, .btn-danger:focus, .btn-danger:active {
.btn-danger:hover,
.btn-danger:focus,
.btn-danger:active {
background-color: var(--color-danger);
border-color: var(--color-danger);
color: var(--text-color);
filter: brightness(80%);
}

.btn-submit:hover, .btn-submit:focus, .btn-submit:active {
.btn-submit:hover,
.btn-submit:focus,
.btn-submit:active {
background-color: var(--color-submit);
border-color: var(--color-submit);
color: var(--text-color);
Expand Down Expand Up @@ -132,26 +144,39 @@ a:hover {
filter: brightness(80%);
}

.form-control, .form-control:focus, .form-control:active, .form-control:hover {
.form-control,
.form-control:focus,
.form-control:active,
.form-control:hover {
color: var(--text-color-body) !important;
background-color: var(--background-color) !important;
}

.form-select, .form-select:focus, .form-select:active, form-select:hover {
.form-select,
.form-select:focus,
.form-select:active,
form-select:hover {
color: var(--text-color-body);
background-color: var(--background-color);
}

.form-control-sm, .form-control-sm:focus, .form-control-sm:active, .form-control-sm:hover {
.form-control-sm,
.form-control-sm:focus,
.form-control-sm:active,
.form-control-sm:hover {
color: var(--text-color-body);
background-color: var(--background-color);
}

.form-check-input, .form-check-input:focus, .form-check-input:active, .form-control-sm:hover {
.form-check-input,
.form-check-input:focus,
.form-check-input:active,
.form-control-sm:hover {
color: var(--text-color-body);
}

.navbar-light .navbar-nav .nav-link.active, .navbar-light .navbar-nav .show>.nav-link {
.navbar-light .navbar-nav .nav-link.active,
.navbar-light .navbar-nav .show>.nav-link {
color: var(--text-color-nav);
}

Expand All @@ -160,7 +185,7 @@ a:hover {
background-color: var(--background-color) !important;
}

.accordion-button {
.accordion-button {
background-color: var(--background-color) !important;
color: var(--text-color-body) !important;
}
Expand All @@ -170,11 +195,38 @@ a:hover {
background-color: var(--background-color);
}

.accordion-button:link, .accordion-button:visited, .accordion-button:hover, .accordion-button:active {
.accordion-button:link,
.accordion-button:visited,
.accordion-button:hover,
.accordion-button:active {
background-color: var(--color-select);
color: var(--text-color-body);
}

.bg-warning {
background-color: var(--color-badge-warning) !important;
}

.bg-danger {
background-color: var(--color-badge-danger) !important;
}

.bg-info {
background-color: var(--color-badge-info) !important;
}

.bg-primary {
background-color: var(--color-badge-primary) !important;
}

.bg-secondary {
background-color: var(--color-badge-secondary) !important;
}

.bg-success {
background-color: var(--color-badge-success) !important;
}

.popover {
max-width: 1000px;
}
Expand All @@ -187,7 +239,7 @@ a:hover {
height: 32px;
}

.active{
.active {
font-weight: bold;
}

Expand Down Expand Up @@ -317,10 +369,28 @@ div.tab-body {
border: 1px solid #aaa;
}

.loglevel-0 { color: var(--text-color-body)} /* debug */
.loglevel-1 { font-weight: bold;} /* info */
.loglevel-2 { color: var(--color-warning); font-weight: bold;} /* warning */
.loglevel-3 { color: var(--color-error); font-weight: bold; } /* error */
.loglevel-0 {
color: var(--text-color-body)
}

/* debug */
.loglevel-1 {
font-weight: bold;
}

/* info */
.loglevel-2 {
color: var(--color-warning);
font-weight: bold;
}

/* warning */
.loglevel-3 {
color: var(--color-error);
font-weight: bold;
}

/* error */

.counter-badge {
font-size: 90%;
Expand Down
29 changes: 28 additions & 1 deletion src/css/Theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@

--color-error: #d2475a;
--color-danger: #d2475a;

--color-badge-warning: #D8A509;
--color-badge-primary: #47729A;
--color-badge-secondary: #6E7072;
--color-badge-info:#127D74;
--color-badge-danger:#C14B0B;
--color-badge-success:#498235;
}

.dark {
Expand All @@ -32,9 +39,15 @@
--text-color-body: #cfcfcf;
--text-color-nav: #cfcfcf;


--color-error: #b31f04;
--color-danger: #b31f04;

--color-badge-warning: #C49508;
--color-badge-primary: #5B89B4;
--color-badge-secondary: #787A7D;
--color-badge-info:#159489;
--color-badge-danger:#F3712B;
--color-badge-success:#5DA745;
}

.pastel {
Expand All @@ -53,6 +66,13 @@

--color-error: #ffadad;
--color-danger: #ffadad;

--color-badge-warning: #D8A509;
--color-badge-primary: #47729A;
--color-badge-secondary: #6E7072;
--color-badge-info:#127D74;
--color-badge-danger:#C14B0B;
--color-badge-success:#498235;
}

.ocean {
Expand All @@ -71,4 +91,11 @@

--color-error: #d2475a;
--color-danger: #d2475a;

--color-badge-warning: #D8A509;
--color-badge-primary: #47729A;
--color-badge-secondary: #6E7072;
--color-badge-info:#127D74;
--color-badge-danger:#C14B0B;
--color-badge-success:#498235;
}
Loading