Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Commit

Permalink
feat(bridge): Introduce keptn color scheme #5081 (#6577)
Browse files Browse the repository at this point in the history
* append the custom look and feel stylesheet to the body, so that it overrides all other styles (stylesheet link type is body-ok, see: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link)

Signed-off-by: ermin.muratovic <ermin.muratovic@gmail.com>

* create keptn-theme.css and load via app-config.json

Signed-off-by: ermin.muratovic <ermin.muratovic@gmail.com>

* use color variables from theme.css

Signed-off-by: ermin.muratovic <ermin.muratovic@gmail.com>

* set dt-icon-color

Signed-off-by: ermin.muratovic <ermin.muratovic@gmail.com>

* create background color

Signed-off-by: ermin.muratovic <ermin.muratovic@gmail.com>

* fix dropdown color in app header

Signed-off-by: ermin.muratovic <ermin.muratovic@gmail.com>
  • Loading branch information
ermin-muratovic committed Jan 17, 2022
1 parent c7e7273 commit 9915466
Show file tree
Hide file tree
Showing 15 changed files with 114 additions and 31 deletions.
6 changes: 0 additions & 6 deletions bridge/client/_barista.scss

This file was deleted.

4 changes: 0 additions & 4 deletions bridge/client/_variables.scss
@@ -1,9 +1,5 @@
$base-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans' sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

$primary-color: #006bb8;
$secondary-color: #002c66;
$link-icon-color: #00a1b2;

/* sequence and task status colors */
$aborted-color: #b7b7b7;
$approval-color: #2ab6f4;
Expand Down
Expand Up @@ -30,5 +30,5 @@
}

.link-icon {
fill: $link-icon-color;
fill: var(--dt-theme-main-default-color);
}
Expand Up @@ -16,7 +16,7 @@
}

.info {
fill: $primary-color;
fill: var(--dt-theme-main-default-color);
}

.no-integration-selected {
Expand Down
Expand Up @@ -52,7 +52,7 @@
}

.info-note {
background-color: $secondary-color;
background-color: var(--dt-theme-main-active-color);
}
.error-note {
background-color: $error-color;
Expand Down
Expand Up @@ -14,7 +14,7 @@
height: 16px;

&.info {
fill: $primary-color;
fill: var(--dt-theme-main-default-color);
}
&.error {
fill: $error-color;
Expand Down
Expand Up @@ -19,5 +19,5 @@ code {
}

.info {
fill: $primary-color;
fill: var(--dt-theme-main-default-color);
}
Expand Up @@ -3,7 +3,7 @@

:host {
width: 100%;
border: 1px solid $turquoise-600;
border: 1px solid var(--dt-theme-main-default-color);
background: #ffffff;
}

Expand All @@ -14,7 +14,7 @@
}

.select-overlay-header {
background: $turquoise-600;
background: var(--dt-theme-main-default-color);

> div {
color: #ffffff;
Expand All @@ -30,7 +30,7 @@
height: 0;
border-style: solid;
border-width: 0 15px 15px 15px;
border-color: transparent transparent $turquoise-600 transparent;
border-color: transparent transparent var(--dt-theme-main-default-color) transparent;
}

> div > .dt-icon {
Expand Down
Expand Up @@ -13,7 +13,7 @@
.dt-icon.info {
width: 16px;
height: 16px;
fill: $primary-color;
fill: var(--dt-theme-main-default-color);
}

.send-finished-input + .dt-overlay-trigger {
Expand Down
4 changes: 2 additions & 2 deletions bridge/client/app/_services/app.init.ts
Expand Up @@ -22,13 +22,13 @@ export class AppInitService {
});

if (window.config?.stylesheetUrl) {
const head = document.getElementsByTagName('head')[0];
const body = document.getElementsByTagName('body')[0];
const link = document.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.setAttribute('type', 'text/css');
link.setAttribute('href', window.config.stylesheetUrl);
link.setAttribute('media', 'all');
head.appendChild(link);
body.appendChild(link);
}
}
} catch (err) {
Expand Down
8 changes: 4 additions & 4 deletions bridge/client/app/app-header/app-header.component.scss
Expand Up @@ -3,11 +3,11 @@

dt-top-bar-navigation {
color: #fff;
background-color: $primary-color;
background-color: var(--dt-theme-main-default-color);
height: auto;

.dt-top-bar-action {
background-color: $primary-color;
background-color: var(--dt-theme-main-default-color);
}

.brand {
Expand Down Expand Up @@ -40,7 +40,7 @@ dt-top-bar-navigation {
word-break: break-all;
}
a:hover {
color: lighten($primary-color, 55%);
color: var(--dt-theme-main-hover-color);
}

.dt-icon.error {
Expand All @@ -65,6 +65,6 @@ dt-select#projectSelect {
border-radius: 3px;
}
::ng-deep .dt-select-arrow svg {
fill: #fff;
fill: #fff !important;
}
}
2 changes: 1 addition & 1 deletion bridge/client/app/dashboard/dashboard.component.scss
Expand Up @@ -22,7 +22,7 @@
bottom: 30px;
left: 190px;
background-color: #ffffff;
border: 1px solid $primary-color;
border: 1px solid var(--dt-theme-main-default-color);
border-radius: 5px;
z-index: 2;

Expand Down
3 changes: 2 additions & 1 deletion bridge/client/assets/default-branding/app-config.json
@@ -1,5 +1,6 @@
{
"appTitle": "keptn",
"logoUrl": "assets/default-branding/logo.png",
"logoInvertedUrl": "assets/default-branding/logo_inverted.png"
"logoInvertedUrl": "assets/default-branding/logo_inverted.png",
"stylesheetUrl": "assets/default-branding/keptn-theme.css"
}
94 changes: 94 additions & 0 deletions bridge/client/assets/default-branding/keptn-theme.css
@@ -0,0 +1,94 @@
:root {
--dt-theme-main-default-color: #006bb8;
--dt-theme-main-hover-color: #0058A8;
--dt-theme-main-active-color: #004EA0;
--dt-theme-main-background-color: #C2E5FF;
--dt-warning-default-color: #c9a000;
--dt-warning-hover-color: #ab8300;
--dt-warning-active-color: #8e6500;
--dt-error-default-color: #dc172a;
--dt-error-hover-color: #c41425;
--dt-error-active-color: #ab0c17;
--dt-recovered-default-color: #3f962a;
--dt-recovered-hover-color: #1f7e1e;
--dt-recovered-active-color: #006613;
--dt-neutral-default-color: #6d6d6d;
--dt-neutral-hover-color: #454646;
--dt-neutral-active-color: #353535;
--dt-cta-default-color: #5ead35;
--dt-cta-hover-color: #3f962a;
--dt-cta-active-color: #1f7e1e;
--dt-critical-default-color: #ab0c17;
--dt-critical-hover-color: #93060e;
--dt-critical-active-color: #7a0004;
--dt-critical-background-color: #f9acaf;

--dt-accent-active-background-color: #C2E5FF;
}

.dt-button {
--dt-button-default-color: var(--dt-theme-main-default-color);
--dt-button-hover-color: var(--dt-theme-main-hover-color);
--dt-button-active-color: var(--dt-theme-main-active-color);
}

.dt-radio-button {
--dt-radio-default-color: var(--dt-theme-main-default-color);
--dt-radio-hover-color: var(--dt-theme-main-hover-color);
--dt-radio-active-color: var(--dt-theme-main-active-color);
}

.dt-show-more-icon {
--dt-show-more-default-color: var(--dt-theme-main-default-color);
--dt-show-more-hover-color: var(--dt-theme-main-hover-color);
--dt-show-more-active-color: var(--dt-theme-main-active-color);
}

.dt-switch-bar {
--dt-switch-bar-checked-before-background-color: var(--dt-theme-main-default-color);
--dt-switch-bar-checked-active-before-background: var(--dt-theme-main-active-color);
}

.dt-highlight {
--dt-highlight-color: var(--dt-theme-main-background-color);
}

.dt-option:not(.dt-option-disabled).dt-option-active, .dt-option:not(.dt-option-disabled):hover {
background-color: var(--dt-theme-main-background-color) !important;
}

.dt-filter-field-tag-value {
color: var(--dt-theme-main-default-color) !important;
}

.dt-select-arrow svg {
fill: var(--dt-theme-main-default-color) !important;
}

.dt-checkbox-container {
border: 2px solid var(--dt-theme-main-default-color) !important;
}

.dt-checkbox-icon svg {
stroke: var(--dt-theme-main-default-color) !important;
}

:hover .dt-checkbox-icon svg {
stroke: var(--dt-theme-main-hover-color) !important;
}

:active .dt-checkbox-icon svg {
stroke: var(--dt-theme-main-active-color) !important;
}

.dt-button.dt-button-nested .dt-loading-spinner-svg {
stroke: var(--dt-neutral-active-color) !important;
}

.dt-quick-filter-close, .dt-quick-filter-open {
color: var(--dt-theme-main-default-color) !important;
}

.dt-overlay-container {
border: 1px solid var(--dt-theme-main-default-color) !important;
}
6 changes: 2 additions & 4 deletions bridge/client/styles.scss
Expand Up @@ -8,8 +8,6 @@ $fonts-dir: '^./assets/fonts';
@import '~@dynatrace/barista-components/style/main';
@import '~@dynatrace/barista-components/style/index';

@import 'barista';

pre,
code {
font-family: monospace;
Expand Down Expand Up @@ -129,7 +127,7 @@ a {
}

a:hover {
color: $primary-color;
color: var(--dt-theme-main-default-color);
}

button.dt-button-primary.danger-button:not([disabled]),
Expand Down Expand Up @@ -432,7 +430,7 @@ pre.code {
flex-direction: column;
align-items: center;
width: 100%;
border: 1px solid $link-icon-color;
border: 1px solid var(--dt-theme-main-default-color);
border-radius: 5px;
background-color: transparent;
text-align: center;
Expand Down

0 comments on commit 9915466

Please sign in to comment.