diff --git a/frontend/amundsen_application/static/css/_colors-custom.scss b/frontend/amundsen_application/static/css/_colors-custom.scss
new file mode 100644
index 000000000..1675c206a
--- /dev/null
+++ b/frontend/amundsen_application/static/css/_colors-custom.scss
@@ -0,0 +1 @@
+// This file is intentionally left blank and should be used to add new colors or overwrite defaults from _colors-default.scss
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/css/_colors-default.scss b/frontend/amundsen_application/static/css/_colors-default.scss
new file mode 100644
index 000000000..82bf67a89
--- /dev/null
+++ b/frontend/amundsen_application/static/css/_colors-default.scss
@@ -0,0 +1,273 @@
+// Copyright Contributors to the Amundsen project.
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+
+Avoid using these color definitions directly.
+Define semantic variables that reference this color palette instead.
+The color palette can be swapped out or modified without
+revisiting each individual color usage.
+
+---------------
+Do this:
+ $text-primary: $gray100;
+
+ body {
+ color: $text-primary;
+ }
+
+----------------
+Don't do this:
+ body {
+ color: $gray100;
+ }
+
+*/
+
+$white: #fff;
+$black: #000;
+
+/* Red */
+$red0: #fffafb;
+$red5: #ffe5e9;
+$red10: #ffcfd5;
+$red20: #ffa0ac;
+$red30: #ff7689;
+$red40: #ff516b;
+$red50: #ff3354;
+$red60: #e6193f;
+$red70: #b8072c;
+$red80: #8c0020;
+$red90: #670019;
+$red100: #560015;
+
+/* Sunset */
+$sunset0: #fffbfa;
+$sunset5: #ffe4dd;
+$sunset10: #ffccbf;
+$sunset20: #ff9e87;
+$sunset30: #ff7b5c;
+$sunset40: #ff623e;
+$sunset50: #ff4e28;
+$sunset60: #db3615;
+$sunset70: #af230a;
+$sunset80: #841604;
+$sunset90: #5f0e01;
+$sunset100: #4e0b00;
+
+/* Orange */
+$orange0: #fff6f2;
+$orange5: #ffe8dd;
+$orange10: #ffd9c7;
+$orange20: #ffb38f;
+$orange30: #ff915d;
+$orange40: #ff7232;
+$orange50: #f9560e;
+$orange60: #d03d00;
+$orange70: #a82e00;
+$orange80: #832300;
+$orange90: #651a00;
+$orange100: #581600;
+
+/* Amber */
+$amber0: #fffdfa;
+$amber5: #fff6e7;
+$amber10: #fff0d4;
+$amber20: #ffe0a9;
+$amber30: #ffd082;
+$amber40: #ffc161;
+$amber50: #ffb146;
+$amber60: #ffa030;
+$amber70: #ff8d1f;
+$amber80: #fe7e13;
+$amber90: #e66909;
+$amber100: #cb5803;
+
+/* Yellow */
+$yellow0: #fffefa;
+$yellow5: #fff8d9;
+$yellow10: #fff3b8;
+$yellow20: #ffe77b;
+$yellow30: #ffdd4c;
+$yellow40: #ffd32a;
+$yellow50: #ffca13;
+$yellow60: #ffc002;
+$yellow70: #efac00;
+$yellow80: #dc9900;
+$yellow90: #c78700;
+$yellow100: #b07600;
+
+/* Citron */
+$citron0: #fffff2;
+$citron5: #ffffd2;
+$citron10: #feffb2;
+$citron20: #fbff6f;
+$citron30: #f1fb3b;
+$citron40: #e2f316;
+$citron50: #cce700;
+$citron60: #b5d900;
+$citron70: #9ac800;
+$citron80: #82b400;
+$citron90: #6c9c00;
+$citron100: #578000;
+
+/* Lime */
+$lime0: #fdfffa;
+$lime5: #edfed0;
+$lime10: #d6f3a0;
+$lime20: #a4dc48;
+$lime30: #75c404;
+$lime40: #5eab00;
+$lime50: #499300;
+$lime60: #347d00;
+$lime70: #216800;
+$lime80: #155600;
+$lime90: #0e4400;
+$lime100: #0a3600;
+
+/* Green */
+$green0: #fafffc;
+$green5: #d1ffe2;
+$green10: #a8ffc4;
+$green20: #4be77a;
+$green30: #04cd3d;
+$green40: #00b32e;
+$green50: #009b22;
+$green60: #008316;
+$green70: #006e0b;
+$green80: #005a05;
+$green90: #004802;
+$green100: #003901;
+
+/* Mint */
+$mint0: #fafffd;
+$mint5: #d1ffee;
+$mint10: #a6fbde;
+$mint20: #4ae3ae;
+$mint30: #04ca83;
+$mint40: #00b16f;
+$mint50: #00985d;
+$mint60: #00824c;
+$mint70: #006c3c;
+$mint80: #00592f;
+$mint90: #004724;
+$mint100: #00381c;
+
+/* Teal */
+$teal0: #fafffe;
+$teal5: #d1fff7;
+$teal10: #a8fff4;
+$teal20: #4ceae4;
+$teal30: #04ced2;
+$teal40: #00b0b9;
+$teal50: #00949f;
+$teal60: #007b85;
+$teal70: #00626b;
+$teal80: #004c53;
+$teal90: #003b40;
+$teal100: #003338;
+
+/* Cyan */
+$cyan0: #fafdff;
+$cyan5: #e7f6ff;
+$cyan10: #d4f0ff;
+$cyan20: #a9e1ff;
+$cyan30: #82d2ff;
+$cyan40: #5dbcf4;
+$cyan50: #3a97d3;
+$cyan60: #2277b3;
+$cyan70: #135b96;
+$cyan80: #09457b;
+$cyan90: #043563;
+$cyan100: #01284e;
+
+/* Blue */
+$blue0: #fafbff;
+$blue5: #e8ecff;
+$blue10: #d5dcff;
+$blue20: #acbbff;
+$blue30: #869dff;
+$blue40: #6686ff;
+$blue50: #4b73ff;
+$blue60: #3668ff;
+$blue70: #2156db;
+$blue80: #1242af;
+$blue90: #093186;
+$blue100: #042260;
+
+/* Indigo */
+$indigo0: #fafaff;
+$indigo5: #ebebff;
+$indigo10: #dcdcff;
+$indigo20: #babaff;
+$indigo30: #9c9bff;
+$indigo40: #8481ff;
+$indigo50: #726bff;
+$indigo60: #665aff;
+$indigo70: #604cff;
+$indigo80: #523be4;
+$indigo90: #3e29b1;
+$indigo100: #2b1b81;
+
+/* Purple */
+$purple0: #fdfaff;
+$purple5: #f6ebff;
+$purple10: #ecdcff;
+$purple20: #d7b8ff;
+$purple30: #c294ff;
+$purple40: #ad71ff;
+$purple50: #9b52ff;
+$purple60: #8b37ff;
+$purple70: #7b20f9;
+$purple80: #590dc4;
+$purple90: #420499;
+$purple100: #390188;
+
+/* Pink */
+$pink0: #fffafd;
+$pink5: #ffe1f2;
+$pink10: #ffc7e4;
+$pink20: #ff8fcc;
+$pink30: #ff5dbb;
+$pink40: #ff32b1;
+$pink50: #ff0eb0;
+$pink60: #de00a7;
+$pink70: #bd00a0;
+$pink80: #a00093;
+$pink90: #860081;
+$pink100: #71006f;
+
+/* Rose */
+$rose0: #fff2f5;
+$rose5: #ffe1e9;
+$rose10: #ffcfdc;
+$rose20: #ffa0ba;
+$rose30: #ff769e;
+$rose40: #ff5187;
+$rose50: #ff3378;
+$rose60: #e51966;
+$rose70: #b70752;
+$rose80: #8b0040;
+$rose90: #660031;
+$rose100: #55002a;
+
+/* Gray */
+$gray0: #fcfcff;
+$gray5: #f4f4fa;
+$gray10: #e7e7ef;
+$gray15: #d8d8e4;
+$gray20: #cacad9;
+$gray30: #acacc0;
+$gray40: #9191a8;
+$gray50: #787891;
+$gray60: #63637b;
+$gray70: #515167;
+$gray80: #414155;
+$gray90: #334;
+$gray100: #292936;
+
+/* CMDRVL */
+$black: #000000;
+$cmdrvl-neon: #DEFF2D;
+$cmdrvl-softblack: #191919;
+$cmdrvl-grey: #cdcdcd;
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/css/_colors.scss b/frontend/amundsen_application/static/css/_colors.scss
index 07accdff6..0bce18714 100644
--- a/frontend/amundsen_application/static/css/_colors.scss
+++ b/frontend/amundsen_application/static/css/_colors.scss
@@ -1,269 +1,4 @@
-// Copyright Contributors to the Amundsen project.
-// SPDX-License-Identifier: Apache-2.0
-
-/**
-
-Avoid using these color definitions directly.
-Define semantic variables that reference this color palette instead.
-The color palette can be swapped out or modified without
-revisiting each individual color usage.
-
----------------
-Do this:
- $text-primary: $gray100;
-
- body {
- color: $text-primary;
- }
-
-----------------
-Don't do this:
- body {
- color: $gray100;
- }
-
-*/
-
-$white: #fff;
-$black: #000;
-
-/* Red */
-$red0: #fffafb;
-$red5: #ffe5e9;
-$red10: #ffcfd5;
-$red20: #ffa0ac;
-$red30: #ff7689;
-$red40: #ff516b;
-$red50: #ff3354;
-$red60: #e6193f;
-$red70: #b8072c;
-$red80: #8c0020;
-$red90: #670019;
-$red100: #560015;
-
-/* Sunset */
-$sunset0: #fffbfa;
-$sunset5: #ffe4dd;
-$sunset10: #ffccbf;
-$sunset20: #ff9e87;
-$sunset30: #ff7b5c;
-$sunset40: #ff623e;
-$sunset50: #ff4e28;
-$sunset60: #db3615;
-$sunset70: #af230a;
-$sunset80: #841604;
-$sunset90: #5f0e01;
-$sunset100: #4e0b00;
-
-/* Orange */
-$orange0: #fff6f2;
-$orange5: #ffe8dd;
-$orange10: #ffd9c7;
-$orange20: #ffb38f;
-$orange30: #ff915d;
-$orange40: #ff7232;
-$orange50: #f9560e;
-$orange60: #d03d00;
-$orange70: #a82e00;
-$orange80: #832300;
-$orange90: #651a00;
-$orange100: #581600;
-
-/* Amber */
-$amber0: #fffdfa;
-$amber5: #fff6e7;
-$amber10: #fff0d4;
-$amber20: #ffe0a9;
-$amber30: #ffd082;
-$amber40: #ffc161;
-$amber50: #ffb146;
-$amber60: #ffa030;
-$amber70: #ff8d1f;
-$amber80: #fe7e13;
-$amber90: #e66909;
-$amber100: #cb5803;
-
-/* Yellow */
-$yellow0: #fffefa;
-$yellow5: #fff8d9;
-$yellow10: #fff3b8;
-$yellow20: #ffe77b;
-$yellow30: #ffdd4c;
-$yellow40: #ffd32a;
-$yellow50: #ffca13;
-$yellow60: #ffc002;
-$yellow70: #efac00;
-$yellow80: #dc9900;
-$yellow90: #c78700;
-$yellow100: #b07600;
-
-/* Citron */
-$citron0: #fffff2;
-$citron5: #ffffd2;
-$citron10: #feffb2;
-$citron20: #fbff6f;
-$citron30: #f1fb3b;
-$citron40: #e2f316;
-$citron50: #cce700;
-$citron60: #b5d900;
-$citron70: #9ac800;
-$citron80: #82b400;
-$citron90: #6c9c00;
-$citron100: #578000;
-
-/* Lime */
-$lime0: #fdfffa;
-$lime5: #edfed0;
-$lime10: #d6f3a0;
-$lime20: #a4dc48;
-$lime30: #75c404;
-$lime40: #5eab00;
-$lime50: #499300;
-$lime60: #347d00;
-$lime70: #216800;
-$lime80: #155600;
-$lime90: #0e4400;
-$lime100: #0a3600;
-
-/* Green */
-$green0: #fafffc;
-$green5: #d1ffe2;
-$green10: #a8ffc4;
-$green20: #4be77a;
-$green30: #04cd3d;
-$green40: #00b32e;
-$green50: #009b22;
-$green60: #008316;
-$green70: #006e0b;
-$green80: #005a05;
-$green90: #004802;
-$green100: #003901;
-
-/* Mint */
-$mint0: #fafffd;
-$mint5: #d1ffee;
-$mint10: #a6fbde;
-$mint20: #4ae3ae;
-$mint30: #04ca83;
-$mint40: #00b16f;
-$mint50: #00985d;
-$mint60: #00824c;
-$mint70: #006c3c;
-$mint80: #00592f;
-$mint90: #004724;
-$mint100: #00381c;
-
-/* Teal */
-$teal0: #fafffe;
-$teal5: #d1fff7;
-$teal10: #a8fff4;
-$teal20: #4ceae4;
-$teal30: #04ced2;
-$teal40: #00b0b9;
-$teal50: #00949f;
-$teal60: #007b85;
-$teal70: #00626b;
-$teal80: #004c53;
-$teal90: #003b40;
-$teal100: #003338;
-
-/* Cyan */
-$cyan0: #fafdff;
-$cyan5: #e7f6ff;
-$cyan10: #d4f0ff;
-$cyan20: #a9e1ff;
-$cyan30: #82d2ff;
-$cyan40: #5dbcf4;
-$cyan50: #3a97d3;
-$cyan60: #2277b3;
-$cyan70: #135b96;
-$cyan80: #09457b;
-$cyan90: #043563;
-$cyan100: #01284e;
-
-/* Blue */
-$blue0: #fafbff;
-$blue5: #e8ecff;
-$blue10: #d5dcff;
-$blue20: #acbbff;
-$blue30: #869dff;
-$blue40: #6686ff;
-$blue50: #4b73ff;
-$blue60: #3668ff;
-$blue70: #2156db;
-$blue80: #1242af;
-$blue90: #093186;
-$blue100: #042260;
-
-/* Indigo */
-$indigo0: #fafaff;
-$indigo5: #ebebff;
-$indigo10: #dcdcff;
-$indigo20: #babaff;
-$indigo30: #9c9bff;
-$indigo40: #8481ff;
-$indigo50: #726bff;
-$indigo60: #665aff;
-$indigo70: #604cff;
-$indigo80: #523be4;
-$indigo90: #3e29b1;
-$indigo100: #2b1b81;
-
-/* Purple */
-$purple0: #fdfaff;
-$purple5: #f6ebff;
-$purple10: #ecdcff;
-$purple20: #d7b8ff;
-$purple30: #c294ff;
-$purple40: #ad71ff;
-$purple50: #9b52ff;
-$purple60: #8b37ff;
-$purple70: #7b20f9;
-$purple80: #590dc4;
-$purple90: #420499;
-$purple100: #390188;
-
-/* Pink */
-$pink0: #fffafd;
-$pink5: #ffe1f2;
-$pink10: #ffc7e4;
-$pink20: #ff8fcc;
-$pink30: #ff5dbb;
-$pink40: #ff32b1;
-$pink50: #ff0eb0;
-$pink60: #de00a7;
-$pink70: #bd00a0;
-$pink80: #a00093;
-$pink90: #860081;
-$pink100: #71006f;
-
-/* Rose */
-$rose0: #fff2f5;
-$rose5: #ffe1e9;
-$rose10: #ffcfdc;
-$rose20: #ffa0ba;
-$rose30: #ff769e;
-$rose40: #ff5187;
-$rose50: #ff3378;
-$rose60: #e51966;
-$rose70: #b70752;
-$rose80: #8b0040;
-$rose90: #660031;
-$rose100: #55002a;
-
-/* Gray */
-$gray0: #fcfcff;
-$gray5: #f4f4fa;
-$gray10: #e7e7ef;
-$gray15: #d8d8e4;
-$gray20: #cacad9;
-$gray30: #acacc0;
-$gray40: #9191a8;
-$gray50: #787891;
-$gray60: #63637b;
-$gray70: #515167;
-$gray80: #414155;
-$gray90: #334;
-$gray100: #292936;
-
-/* Custom */
\ No newline at end of file
+// Amundsen Default Values
+@import 'colors-default';
+// Per-Client Custom Values
+@import 'colors-custom';
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/css/_fonts-default.scss b/frontend/amundsen_application/static/css/_fonts-default.scss
index 9e39f71e8..4aa786055 100644
--- a/frontend/amundsen_application/static/css/_fonts-default.scss
+++ b/frontend/amundsen_application/static/css/_fonts-default.scss
@@ -47,3 +47,60 @@
font-weight: $font-weight-body-bold;
src: url('../fonts/OpenSans-Bold.ttf') format('truetype');
}
+
+// CMD+RVL
+
+// PPMori
+@font-face {
+ font-family: 'PPMori';
+ font-style: normal;
+ font-weight: $font-weight-body-regular;
+ src: url('../fonts/PPMori-Regular.woff2') format('woff2'),
+ url('../fonts/PPMori-Regular.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'PPMori';
+ font-style: normal;
+ font-weight: $font-weight-body-bold;
+ src: url('../fonts/PPMori-Bold.woff2') format('woff2'),
+ url('../fonts/PPMori-Bold.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'PPMori';
+ font-style: normal;
+ font-weight: $font-weight-body-semi-bold;
+ src: url('../fonts/PPMori-Bold.woff2') format('woff2'),
+ url('../fonts/PPMori-Bold.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'PPMori';
+ font-style: normal;
+ font-weight: $font-weight-body-extralight;
+ src: url('../fonts/PPMori-Extralight.woff2') format('woff2'),
+ url('../fonts/PPMori-Extralight.ttf') format('truetype');
+}
+
+// IBM Plex Mono
+@font-face {
+ font-family: 'IBM Plex Mono';
+ font-style: normal;
+ font-weight: $font-weight-body-regular;
+ src: url('../fonts/IBMPlexMono-Regular.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'IBM Plex Mono';
+ font-style: normal;
+ font-weight: $font-weight-body-bold;
+ src: url('../fonts/IBMPlexMono-Bold.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'IBM Plex Mono';
+ font-style: normal;
+ font-weight: $font-weight-body-light;
+ src: url('../fonts/IBMPlexMono-Light.ttf') format('truetype');
+}
diff --git a/frontend/amundsen_application/static/css/_icons-default.scss b/frontend/amundsen_application/static/css/_icons-default.scss
index 4492f922e..a956e3d16 100644
--- a/frontend/amundsen_application/static/css/_icons-default.scss
+++ b/frontend/amundsen_application/static/css/_icons-default.scss
@@ -10,7 +10,7 @@ $icon-small-size: 16px;
// Lookout! When you update one of these, please update the enums on
// ../js/interfaces/Enums.ts
// Map of Database names and icon paths
-$data-stores: (
+$data-stores-default: (
database: '../images/icons/Database.svg',
hive: '../images/icons/logo-hive.svg',
bigquery: '../images/icons/logo-bigquery.svg',
@@ -33,7 +33,7 @@ $data-stores: (
);
// Map of Dashboard names and icon paths
-$dashboards: (
+$dashboards-default: (
dashboard: '../images/icons/dashboard.svg',
mode: '../images/icons/logo-mode.svg',
redash: '../images/icons/logo-redash.svg',
@@ -53,7 +53,7 @@ $check: (
);
// Map of File types and icon paths
-$files: (
+$files-default: (
file: '../images/icons/logo-file-text.png',
pdf: '../images/icons/logo-file-pdf.png',
csv: '../images/icons/logo-file-csv.png',
@@ -63,191 +63,9 @@ $files: (
);
// Map of Data Provider names and icon paths
-$dataproviders: (
+$dataproviders-default: (
provider: '../images/icons/logo-provider.png',
- secgov: '../images/icons/logo-provider-secgov.png',
cmdrvl: '../images/icons/logo-provider-cmdrvl.svg',
+ secgov: '../images/icons/logo-provider-secgov.png',
eganjones: '../images/icons/logo-provider-eganjones.png',
);
-
-// Given a Map of key/value pairs, generates a new class
-@mixin iconBackgrounds($map) {
- @each $name, $url in $map {
- &.icon-#{$name} {
- background: transparent url($url) center center / contain no-repeat;
- }
- }
-}
-
-span.icon {
- // Generate Icons
- @include iconBackgrounds($data-stores);
- @include iconBackgrounds($dashboards);
- @include iconBackgrounds($users);
- @include iconBackgrounds($check);
- @include iconBackgrounds($dataproviders);
- @include iconBackgrounds($files);
-
- background-color: $icon-bg;
- border: none;
- display: inline-block;
- height: $icon-size;
- margin: auto 16px auto 0;
- min-width: $icon-size;
- vertical-align: middle;
- width: $icon-size;
-}
-
-img.icon {
- /* DEPRECATED: follow behavior above to generate
- icons */
- background-color: $icon-bg;
- border: none;
- height: $icon-size;
- margin: -3px 4px -3px 0;
- -webkit-mask-repeat: no-repeat;
- mask-repeat: no-repeat;
- -webkit-mask-size: contain;
- mask-size: contain;
- min-width: $icon-size;
- width: $icon-size;
-
- &.icon-small {
- height: $icon-small-size;
- -webkit-mask-size: $icon-small-size $icon-small-size;
- mask-size: $icon-small-size $icon-small-size;
- min-width: $icon-small-size;
- width: $icon-small-size;
- }
-
- &.icon-color {
- background-color: $icon-bg-brand;
- }
-
- &.icon-dark {
- background-color: $icon-bg-dark;
- }
-
- &.icon-alert {
- -webkit-mask-image: url('../images/icons/Alert-Triangle.svg');
- mask-image: url('../images/icons/Alert-Triangle.svg');
- }
-
- &.icon-bookmark {
- -webkit-mask-image: url('../images/icons/Favorite.svg');
- mask-image: url('../images/icons/Favorite.svg');
- }
-
- &.icon-bookmark-filled {
- -webkit-mask-image: url('../images/icons/Favorite-Filled.svg');
- mask-image: url('../images/icons/Favorite-Filled.svg');
- }
-
- &.icon-delete {
- -webkit-mask-image: url('../images/icons/Trash.svg');
- mask-image: url('../images/icons/Trash.svg');
- }
-
- &.icon-red-triangle-warning {
- -webkit-mask-image: url('../images/icons/DataQualityWarning.svg');
- mask-image: url('../images/icons/DataQualityWarning.svg');
- }
-
- &.icon-down {
- -webkit-mask-image: url('../images/icons/Down.svg');
- mask-image: url('../images/icons/Down.svg');
- }
-
- &.icon-edit {
- -webkit-mask-image: url('../images/icons/Edit.svg');
- mask-image: url('../images/icons/Edit.svg');
- }
-
- &.icon-help {
- -webkit-mask-image: url('../images/icons/Help-Circle.svg');
- mask-image: url('../images/icons/Help-Circle.svg');
- }
-
- &.icon-github {
- -webkit-mask-image: url('../images/icons/github.svg');
- mask-image: url('../images/icons/github.svg');
- }
-
- &.icon-left {
- -webkit-mask-image: url('../images/icons/Left.svg');
- mask-image: url('../images/icons/Left.svg');
- }
-
- &.icon-loading {
- -webkit-mask-image: url('../images/icons/Loader.svg');
- mask-image: url('../images/icons/Loader.svg');
- }
-
- &.icon-mail {
- -webkit-mask-image: url('../images/icons/mail.svg');
- mask-image: url('../images/icons/mail.svg');
- }
-
- &.icon-plus {
- -webkit-mask-image: url('../images/icons/plus.svg');
- mask-image: url('../images/icons/plus.svg');
- }
-
- &.icon-plus-circle {
- -webkit-mask-image: url('../images/icons/Plus-Circle.svg');
- mask-image: url('../images/icons/Plus-Circle.svg');
- }
-
- &.icon-preview {
- -webkit-mask-image: url('../images/icons/Preview.svg');
- mask-image: url('../images/icons/Preview.svg');
- }
-
- &.icon-refresh {
- -webkit-mask-image: url('../images/icons/Refresh-cw.svg');
- mask-image: url('../images/icons/Refresh-cw.svg');
- }
-
- &.icon-right {
- -webkit-mask-image: url('../images/icons/Right.svg');
- mask-image: url('../images/icons/Right.svg');
- }
-
- &.icon-search {
- -webkit-mask-image: url('../images/icons/Search.svg');
- mask-image: url('../images/icons/Search.svg');
- }
-
- &.icon-send {
- -webkit-mask-image: url('../images/icons/Send.svg');
- mask-image: url('../images/icons/Send.svg');
- }
-
- &.icon-slack {
- -webkit-mask-image: url('../images/icons/slack.svg');
- mask-image: url('../images/icons/slack.svg');
- }
-
- &.icon-up {
- -webkit-mask-image: url('../images/icons/Up.svg');
- mask-image: url('../images/icons/Up.svg');
- }
-
- &.icon-user {
- -webkit-mask-image: url('../images/icons/users.svg');
- mask-image: url('../images/icons/users.svg');
- }
-
- &.icon-more {
- -webkit-mask-image: url('../images/icons/More.svg');
- mask-image: url('../images/icons/More.svg');
- }
-}
-
-.disabled,
-:disabled {
- > img.icon,
- > img.icon.icon-color {
- background-color: $icon-bg-disabled;
- }
-}
diff --git a/frontend/amundsen_application/static/css/_icons.scss b/frontend/amundsen_application/static/css/_icons.scss
index b41276005..5145c650e 100644
--- a/frontend/amundsen_application/static/css/_icons.scss
+++ b/frontend/amundsen_application/static/css/_icons.scss
@@ -1,7 +1,198 @@
// Copyright Contributors to the Amundsen project.
// SPDX-License-Identifier: Apache-2.0
+@import 'variables';
// Amundsen Default Typography
@import 'icons-default';
// Per-Client Custom Typography
@import 'icons-custom';
+
+
+// Merge
+$data-stores: if(global-variable-exists(data-stores-custom), map-merge($data-stores-default, $data-stores-custom), $data-stores-default);
+$dashboards: if(global-variable-exists(dashboards-custom), map-merge($dashboards-default, $dashboards-custom), $dashboards-default);
+$files: if(global-variable-exists(files-custom), map-merge($files-default, $files-custom), $files-default);
+$dataproviders: if(global-variable-exists(dataproviders-custom), map-merge($dataproviders-default, $dataproviders-custom), $dataproviders-default);
+//////////////////
+
+// Given a Map of key/value pairs, generates a new class
+@mixin iconBackgrounds($map) {
+ @each $name, $url in $map {
+ &.icon-#{$name} {
+ background: transparent url($url) center center / contain no-repeat;
+ }
+ }
+}
+
+span.icon {
+// Generate Icons
+@include iconBackgrounds($data-stores);
+@include iconBackgrounds($dashboards);
+@include iconBackgrounds($users);
+@include iconBackgrounds($check);
+@include iconBackgrounds($dataproviders);
+@include iconBackgrounds($files);
+
+background-color: $icon-bg;
+border: none;
+display: inline-block;
+height: $icon-size;
+margin: auto 16px auto 0;
+min-width: $icon-size;
+vertical-align: middle;
+width: $icon-size;
+}
+
+img.icon {
+/* DEPRECATED: follow behavior above to generate
+icons */
+background-color: $icon-bg;
+border: none;
+height: $icon-size;
+margin: -3px 4px -3px 0;
+-webkit-mask-repeat: no-repeat;
+mask-repeat: no-repeat;
+-webkit-mask-size: contain;
+mask-size: contain;
+min-width: $icon-size;
+width: $icon-size;
+
+&.icon-small {
+ height: $icon-small-size;
+ -webkit-mask-size: $icon-small-size $icon-small-size;
+ mask-size: $icon-small-size $icon-small-size;
+ min-width: $icon-small-size;
+ width: $icon-small-size;
+}
+
+&.icon-color {
+ background-color: $icon-bg-brand;
+}
+
+&.icon-dark {
+ background-color: $icon-bg-dark;
+}
+
+&.icon-alert {
+ -webkit-mask-image: url('../images/icons/Alert-Triangle.svg');
+ mask-image: url('../images/icons/Alert-Triangle.svg');
+}
+
+&.icon-bookmark {
+ -webkit-mask-image: url('../images/icons/Favorite.svg');
+ mask-image: url('../images/icons/Favorite.svg');
+}
+
+&.icon-bookmark-filled {
+ -webkit-mask-image: url('../images/icons/Favorite-Filled.svg');
+ mask-image: url('../images/icons/Favorite-Filled.svg');
+}
+
+&.icon-delete {
+ -webkit-mask-image: url('../images/icons/Trash.svg');
+ mask-image: url('../images/icons/Trash.svg');
+}
+
+&.icon-red-triangle-warning {
+ -webkit-mask-image: url('../images/icons/DataQualityWarning.svg');
+ mask-image: url('../images/icons/DataQualityWarning.svg');
+}
+
+&.icon-down {
+ -webkit-mask-image: url('../images/icons/Down.svg');
+ mask-image: url('../images/icons/Down.svg');
+}
+
+&.icon-edit {
+ -webkit-mask-image: url('../images/icons/Edit.svg');
+ mask-image: url('../images/icons/Edit.svg');
+}
+
+&.icon-help {
+ -webkit-mask-image: url('../images/icons/Help-Circle.svg');
+ mask-image: url('../images/icons/Help-Circle.svg');
+}
+
+&.icon-github {
+ -webkit-mask-image: url('../images/icons/github.svg');
+ mask-image: url('../images/icons/github.svg');
+}
+
+&.icon-left {
+ -webkit-mask-image: url('../images/icons/Left.svg');
+ mask-image: url('../images/icons/Left.svg');
+}
+
+&.icon-loading {
+ -webkit-mask-image: url('../images/icons/Loader.svg');
+ mask-image: url('../images/icons/Loader.svg');
+}
+
+&.icon-mail {
+ -webkit-mask-image: url('../images/icons/mail.svg');
+ mask-image: url('../images/icons/mail.svg');
+}
+
+&.icon-plus {
+ -webkit-mask-image: url('../images/icons/plus.svg');
+ mask-image: url('../images/icons/plus.svg');
+}
+
+&.icon-plus-circle {
+ -webkit-mask-image: url('../images/icons/Plus-Circle.svg');
+ mask-image: url('../images/icons/Plus-Circle.svg');
+}
+
+&.icon-preview {
+ -webkit-mask-image: url('../images/icons/Preview.svg');
+ mask-image: url('../images/icons/Preview.svg');
+}
+
+&.icon-refresh {
+ -webkit-mask-image: url('../images/icons/Refresh-cw.svg');
+ mask-image: url('../images/icons/Refresh-cw.svg');
+}
+
+&.icon-right {
+ -webkit-mask-image: url('../images/icons/Right.svg');
+ mask-image: url('../images/icons/Right.svg');
+}
+
+&.icon-search {
+ -webkit-mask-image: url('../images/icons/Search.svg');
+ mask-image: url('../images/icons/Search.svg');
+}
+
+&.icon-send {
+ -webkit-mask-image: url('../images/icons/Send.svg');
+ mask-image: url('../images/icons/Send.svg');
+}
+
+&.icon-slack {
+ -webkit-mask-image: url('../images/icons/slack.svg');
+ mask-image: url('../images/icons/slack.svg');
+}
+
+&.icon-up {
+ -webkit-mask-image: url('../images/icons/Up.svg');
+ mask-image: url('../images/icons/Up.svg');
+}
+
+&.icon-user {
+ -webkit-mask-image: url('../images/icons/users.svg');
+ mask-image: url('../images/icons/users.svg');
+}
+
+&.icon-more {
+ -webkit-mask-image: url('../images/icons/More.svg');
+ mask-image: url('../images/icons/More.svg');
+}
+}
+
+.disabled,
+:disabled {
+> img.icon,
+> img.icon.icon-color {
+ background-color: $icon-bg-disabled;
+}
+}
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/css/_labels-custom.scss b/frontend/amundsen_application/static/css/_labels-custom.scss
new file mode 100644
index 000000000..5a6224c80
--- /dev/null
+++ b/frontend/amundsen_application/static/css/_labels-custom.scss
@@ -0,0 +1 @@
+// This file is intentionally left blank and should be used to add new labels or overwrite defaults from _labels-default.scss
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/css/_labels-default.scss b/frontend/amundsen_application/static/css/_labels-default.scss
new file mode 100644
index 000000000..a874b1d4c
--- /dev/null
+++ b/frontend/amundsen_application/static/css/_labels-default.scss
@@ -0,0 +1,63 @@
+// Copyright Contributors to the Amundsen project.
+// SPDX-License-Identifier: Apache-2.0
+@import 'variables';
+.label-negative {
+ background-color: $badge-negative-color;
+ color: $badge-text-color;
+}
+
+.label-neutral {
+ background-color: $badge-neutral-color;
+ color: $badge-text-color;
+}
+
+.label-primary {
+ background-color: $badge-primary-color;
+ color: $badge-text-color;
+}
+
+.label-positive {
+ background-color: $badge-positive-color;
+ color: $badge-text-color;
+}
+
+.label-warning {
+ background-color: $badge-warning-color;
+ color: $badge-text-color;
+}
+
+.label-landing {
+ background-color: $badge-landing-color;
+ color: $badge-text-color;
+}
+
+.label-staging {
+ background-color: $badge-staging-color;
+ color: $badge-text-color;
+}
+
+.label-wrangling {
+ background-color: $badge-wrangling-color;
+ color: $badge-text-color;
+}
+
+.label-marts {
+ background-color: $badge-marts-color;
+ color: $badge-text-color;
+}
+
+.label-snowflake {
+ background-color: $badge-snowflake-color;
+ color: $badge-text-color;
+}
+
+.label-dbt {
+ background-color: $badge-dbt-color;
+ color: $badge-text-color;
+}
+
+.label-watermark {
+ background-color: $badge-watermark-color;
+ color: $badge-text-color;
+}
+
diff --git a/frontend/amundsen_application/static/css/_labels.scss b/frontend/amundsen_application/static/css/_labels.scss
index daee0df74..f4eca916e 100644
--- a/frontend/amundsen_application/static/css/_labels.scss
+++ b/frontend/amundsen_application/static/css/_labels.scss
@@ -1,72 +1,6 @@
// Copyright Contributors to the Amundsen project.
// SPDX-License-Identifier: Apache-2.0
-@import 'variables';
-.label-negative {
- background-color: $badge-negative-color;
- color: $badge-text-color;
-}
-
-.label-neutral {
- background-color: $badge-neutral-color;
- color: $badge-text-color;
-}
-
-.label-primary {
- background-color: $badge-primary-color;
- color: $badge-text-color;
-}
-
-.label-positive {
- background-color: $badge-positive-color;
- color: $badge-text-color;
-}
-
-.label-warning {
- background-color: $badge-warning-color;
- color: $badge-text-color;
-}
-
-.label-landing {
- background-color: $badge-landing-color;
- color: $badge-text-color;
-}
-
-.label-staging {
- background-color: $badge-staging-color;
- color: $badge-text-color;
-}
-
-.label-wrangling {
- background-color: $badge-wrangling-color;
- color: $badge-text-color;
-}
-
-.label-marts {
- background-color: $badge-marts-color;
- color: $badge-text-color;
-}
-
-.label-snowflake {
- background-color: $badge-snowflake-color;
- color: $badge-text-color;
-}
-
-.label-dbt {
- background-color: $badge-dbt-color;
- color: $badge-text-color;
-}
-
-.label-watermark {
- background-color: $badge-watermark-color;
- color: $badge-text-color;
-}
-
-.label-crediq {
- background-color: $badge-crediq-color;
- color: $badge-text-color;
-}
-
-.label-crefc {
- background-color: $badge-crefc-color;
- color: $badge-text-color;
-}
\ No newline at end of file
+// Amundsen Default Fonts
+@import 'labels-default';
+// Per-Client Custom Fonts
+@import 'labels-custom';
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/css/_variables-default.scss b/frontend/amundsen_application/static/css/_variables-default.scss
index 1be821de1..4ef13b04f 100644
--- a/frontend/amundsen_application/static/css/_variables-default.scss
+++ b/frontend/amundsen_application/static/css/_variables-default.scss
@@ -30,24 +30,31 @@ $text-inverse: $white !default;
$column-name-color: $indigo70;
$link-color: $brand-color-4;
$link-hover-color: $brand-color-5;
-$font-family-body: 'Open Sans',
-sans-serif !default;
+// $font-family-body: 'Open Sans',
+// sans-serif !default;
+$font-family-body: 'PPMori', sans-serif !default;
+
$font-weight-body-extralight: 100 !default;
$font-weight-body-light: 200 !default;
$font-weight-body-regular: 400 !default;
$font-weight-body-semi-bold: 600 !default;
$font-weight-body-bold: 700 !default;
-$font-family-header: 'Roboto',
-sans-serif !default;
+// $font-family-header: 'Roboto',
+// sans-serif !default;
+$font-family-header: 'PPMori', sans-serif !default;
+
$font-weight-header-regular: 500 !default;
$font-weight-header-bold: 700 !default;
-$font-family-monospace-code: 'Space Mono',
-menlo,
-monospace !default;
-$font-family-serif: georgia,
-'Times New Roman',
-times,
-serif !default;
+// $font-family-monospace-code: 'Space Mono',
+// menlo,
+// monospace !default;
+$font-family-monospace-code: 'IBM Plex Mono', menlo, monospace;
+
+// $font-family-serif: georgia,
+// 'Times New Roman',
+// times,
+// serif !default;
+$font-family-serif: 'PPMori', 'Times New Roman', times, serif !default;
$font-size-small: 12px !default;
$font-size-base: 14px !default;
$font-size-large: 16px !default;
@@ -67,8 +74,6 @@ $badge-marts-color: $green30;
$badge-snowflake-color: $cyan40;
$badge-dbt-color: $orange40;
$badge-watermark-color: $teal30;
-$badge-crediq-color: $blue20;
-$badge-crefc-color: $cyan40;
$badge-overlay: $gray100;
$badge-opacity-light: 0.14;
@@ -97,7 +102,8 @@ $icon-bg-dark: $gray60 !default;
$icon-bg-disabled: $gray20 !default;
$red-triangle-warning: $sunset60;
// Header, Body, & Footer
-$nav-bar-color: $indigo100;
+// $nav-bar-color: $indigo100;
+$nav-bar-color: $black;
$light-nav-bar-color: $white;
$nav-bar-height: 48px;
$body-min-width: 1048px;
@@ -174,4 +180,5 @@ $body-font-weight: $font-weight-body-regular;
$caption-font-weight: $font-weight-body-bold;
$hover-box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.12),
0 2px 3px 0 rgba(0, 0, 0, 0.16);
-$popover-border-radius: 12px;
\ No newline at end of file
+$popover-border-radius: 12px;
+
diff --git a/frontend/amundsen_application/static/fonts/IBMPlexMono-Bold.ttf b/frontend/amundsen_application/static/fonts/IBMPlexMono-Bold.ttf
new file mode 100644
index 000000000..6b8ece96e
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/IBMPlexMono-Bold.ttf differ
diff --git a/frontend/amundsen_application/static/fonts/IBMPlexMono-Light.ttf b/frontend/amundsen_application/static/fonts/IBMPlexMono-Light.ttf
new file mode 100644
index 000000000..df167f094
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/IBMPlexMono-Light.ttf differ
diff --git a/frontend/amundsen_application/static/fonts/IBMPlexMono-Regular.ttf b/frontend/amundsen_application/static/fonts/IBMPlexMono-Regular.ttf
new file mode 100644
index 000000000..81ca3dcc9
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/IBMPlexMono-Regular.ttf differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Bold.ttf b/frontend/amundsen_application/static/fonts/PPMori-Bold.ttf
new file mode 100644
index 000000000..ef6c3eee2
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Bold.ttf differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Bold.woff2 b/frontend/amundsen_application/static/fonts/PPMori-Bold.woff2
new file mode 100644
index 000000000..e4116fb49
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Bold.woff2 differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Extralight.ttf b/frontend/amundsen_application/static/fonts/PPMori-Extralight.ttf
new file mode 100644
index 000000000..78fd6f49d
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Extralight.ttf differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Extralight.woff b/frontend/amundsen_application/static/fonts/PPMori-Extralight.woff
new file mode 100644
index 000000000..e597373b1
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Extralight.woff differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Extralight.woff2 b/frontend/amundsen_application/static/fonts/PPMori-Extralight.woff2
new file mode 100644
index 000000000..070c6cce9
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Extralight.woff2 differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Regular.ttf b/frontend/amundsen_application/static/fonts/PPMori-Regular.ttf
new file mode 100644
index 000000000..cd21b3147
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Regular.ttf differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Regular.woff b/frontend/amundsen_application/static/fonts/PPMori-Regular.woff
new file mode 100644
index 000000000..8c0987ad6
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Regular.woff differ
diff --git a/frontend/amundsen_application/static/fonts/PPMori-Regular.woff2 b/frontend/amundsen_application/static/fonts/PPMori-Regular.woff2
new file mode 100644
index 000000000..29c7b21cf
Binary files /dev/null and b/frontend/amundsen_application/static/fonts/PPMori-Regular.woff2 differ
diff --git a/frontend/amundsen_application/static/images/cmdrvl-logo.png b/frontend/amundsen_application/static/images/cmdrvl-logo.png
new file mode 100644
index 000000000..7cb0f32c3
Binary files /dev/null and b/frontend/amundsen_application/static/images/cmdrvl-logo.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/android-chrome-192x192.png b/frontend/amundsen_application/static/images/favicons/prod/android-chrome-192x192.png
index 98c32bd71..93a6e9fb1 100644
Binary files a/frontend/amundsen_application/static/images/favicons/prod/android-chrome-192x192.png and b/frontend/amundsen_application/static/images/favicons/prod/android-chrome-192x192.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/android-chrome-512x512.png b/frontend/amundsen_application/static/images/favicons/prod/android-chrome-512x512.png
new file mode 100644
index 000000000..1c64facf8
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/android-chrome-512x512.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/apple-touch-icon.png b/frontend/amundsen_application/static/images/favicons/prod/apple-touch-icon.png
index c8029b46b..1a00c5b8f 100644
Binary files a/frontend/amundsen_application/static/images/favicons/prod/apple-touch-icon.png and b/frontend/amundsen_application/static/images/favicons/prod/apple-touch-icon.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/browserconfig.xml b/frontend/amundsen_application/static/images/favicons/prod/browserconfig.xml
index 84425a0ac..b9639caf4 100644
--- a/frontend/amundsen_application/static/images/favicons/prod/browserconfig.xml
+++ b/frontend/amundsen_application/static/images/favicons/prod/browserconfig.xml
@@ -2,8 +2,8 @@
-
- #2d89ef
+
+ #000000
diff --git a/frontend/amundsen_application/static/images/favicons/prod/favicon-16x16.png b/frontend/amundsen_application/static/images/favicons/prod/favicon-16x16.png
index 14cdad831..bbc1f80b5 100644
Binary files a/frontend/amundsen_application/static/images/favicons/prod/favicon-16x16.png and b/frontend/amundsen_application/static/images/favicons/prod/favicon-16x16.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/favicon-32x32.png b/frontend/amundsen_application/static/images/favicons/prod/favicon-32x32.png
index 74dee77c6..b3cfb6f4c 100644
Binary files a/frontend/amundsen_application/static/images/favicons/prod/favicon-32x32.png and b/frontend/amundsen_application/static/images/favicons/prod/favicon-32x32.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/favicon.ico b/frontend/amundsen_application/static/images/favicons/prod/favicon.ico
index a8216c280..64cbb9ce1 100644
Binary files a/frontend/amundsen_application/static/images/favicons/prod/favicon.ico and b/frontend/amundsen_application/static/images/favicons/prod/favicon.ico differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/mstile-150x150.png b/frontend/amundsen_application/static/images/favicons/prod/mstile-150x150.png
index 65542be2d..2548c616c 100644
Binary files a/frontend/amundsen_application/static/images/favicons/prod/mstile-150x150.png and b/frontend/amundsen_application/static/images/favicons/prod/mstile-150x150.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/android-chrome-192x192.png b/frontend/amundsen_application/static/images/favicons/prod/orig/android-chrome-192x192.png
new file mode 100644
index 000000000..98c32bd71
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/orig/android-chrome-192x192.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/android-chrome-256x256.png b/frontend/amundsen_application/static/images/favicons/prod/orig/android-chrome-256x256.png
similarity index 100%
rename from frontend/amundsen_application/static/images/favicons/prod/android-chrome-256x256.png
rename to frontend/amundsen_application/static/images/favicons/prod/orig/android-chrome-256x256.png
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/apple-touch-icon.png b/frontend/amundsen_application/static/images/favicons/prod/orig/apple-touch-icon.png
new file mode 100644
index 000000000..c8029b46b
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/orig/apple-touch-icon.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/browserconfig.xml b/frontend/amundsen_application/static/images/favicons/prod/orig/browserconfig.xml
new file mode 100644
index 000000000..84425a0ac
--- /dev/null
+++ b/frontend/amundsen_application/static/images/favicons/prod/orig/browserconfig.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ #2d89ef
+
+
+
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/favicon-16x16.png b/frontend/amundsen_application/static/images/favicons/prod/orig/favicon-16x16.png
new file mode 100644
index 000000000..14cdad831
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/orig/favicon-16x16.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/favicon-32x32.png b/frontend/amundsen_application/static/images/favicons/prod/orig/favicon-32x32.png
new file mode 100644
index 000000000..74dee77c6
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/orig/favicon-32x32.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/favicon.ico b/frontend/amundsen_application/static/images/favicons/prod/orig/favicon.ico
new file mode 100644
index 000000000..a8216c280
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/orig/favicon.ico differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/mstile-150x150.png b/frontend/amundsen_application/static/images/favicons/prod/orig/mstile-150x150.png
new file mode 100644
index 000000000..65542be2d
Binary files /dev/null and b/frontend/amundsen_application/static/images/favicons/prod/orig/mstile-150x150.png differ
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/safari-pinned-tab.svg b/frontend/amundsen_application/static/images/favicons/prod/orig/safari-pinned-tab.svg
new file mode 100644
index 000000000..001dc6d86
--- /dev/null
+++ b/frontend/amundsen_application/static/images/favicons/prod/orig/safari-pinned-tab.svg
@@ -0,0 +1,25 @@
+
+
+
diff --git a/frontend/amundsen_application/static/images/favicons/prod/orig/site.webmanifest b/frontend/amundsen_application/static/images/favicons/prod/orig/site.webmanifest
new file mode 100644
index 000000000..dd774fa6b
--- /dev/null
+++ b/frontend/amundsen_application/static/images/favicons/prod/orig/site.webmanifest
@@ -0,0 +1,19 @@
+{
+ "name": "Amundsen",
+ "short_name": "Amundsen",
+ "icons": [
+ {
+ "src": "/static/images/favicons/prod/android-chrome-192x192.png",
+ "sizes": "192x192",
+ "type": "image/png"
+ },
+ {
+ "src": "/static/images/favicons/prod/android-chrome-256x256.png",
+ "sizes": "256x256",
+ "type": "image/png"
+ }
+ ],
+ "theme_color": "#ffffff",
+ "background_color": "#ffffff",
+ "display": "standalone"
+}
diff --git a/frontend/amundsen_application/static/images/favicons/prod/safari-pinned-tab.svg b/frontend/amundsen_application/static/images/favicons/prod/safari-pinned-tab.svg
index 001dc6d86..ce0749259 100644
--- a/frontend/amundsen_application/static/images/favicons/prod/safari-pinned-tab.svg
+++ b/frontend/amundsen_application/static/images/favicons/prod/safari-pinned-tab.svg
@@ -2,24 +2,44 @@
diff --git a/frontend/amundsen_application/static/images/favicons/prod/site.webmanifest b/frontend/amundsen_application/static/images/favicons/prod/site.webmanifest
index dd774fa6b..9eab6b7fa 100644
--- a/frontend/amundsen_application/static/images/favicons/prod/site.webmanifest
+++ b/frontend/amundsen_application/static/images/favicons/prod/site.webmanifest
@@ -1,19 +1,19 @@
{
- "name": "Amundsen",
- "short_name": "Amundsen",
- "icons": [
+ "name": "",
+ "short_name": "",
+ "icons": [
{
- "src": "/static/images/favicons/prod/android-chrome-192x192.png",
+ "src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
- "src": "/static/images/favicons/prod/android-chrome-256x256.png",
- "sizes": "256x256",
+ "src": "/android-chrome-512x512.png",
+ "sizes": "512x512",
"type": "image/png"
}
],
- "theme_color": "#ffffff",
- "background_color": "#ffffff",
+ "theme_color": "#000000",
+ "background_color": "#000000",
"display": "standalone"
}
diff --git a/frontend/amundsen_application/static/js/components/Flag/Flag.story.tsx b/frontend/amundsen_application/static/js/components/Flag/Flag.story.tsx
index 4bb73d07c..2ac23a794 100644
--- a/frontend/amundsen_application/static/js/components/Flag/Flag.story.tsx
+++ b/frontend/amundsen_application/static/js/components/Flag/Flag.story.tsx
@@ -3,7 +3,7 @@
import React from 'react';
-import { BadgeStyle } from 'config/config-types';
+import { DefaultBadgeStyle } from 'config/config-types';
import { CaseType } from 'utils/text';
import StorySection from '../StorySection';
import Flag from '.';
@@ -27,42 +27,42 @@ export const Flags = () => (
>
diff --git a/frontend/amundsen_application/static/js/components/Flag/index.spec.tsx b/frontend/amundsen_application/static/js/components/Flag/index.spec.tsx
index fa773a0b8..ca0ebe39c 100644
--- a/frontend/amundsen_application/static/js/components/Flag/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/components/Flag/index.spec.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
import { shallow } from 'enzyme';
-import { BadgeStyle } from 'config/config-types';
+import { DefaultBadgeStyle } from 'config/config-types';
import Flag, { FlagProps } from '.';
describe('Flag', () => {
@@ -23,16 +23,16 @@ describe('Flag', () => {
describe('render', () => {
it('renders span with correct default className', () => {
expect(subject.find('span').props().className).toEqual(
- `flag label label-${BadgeStyle.DEFAULT}`
+ `flag label label-${DefaultBadgeStyle.DEFAULT}`
);
});
it('renders span with correct custom className', () => {
- props.labelStyle = BadgeStyle.PRIMARY;
+ props.labelStyle = DefaultBadgeStyle.PRIMARY;
subject.setProps(props);
expect(subject.find('span').props().className).toEqual(
- `flag label label-${BadgeStyle.PRIMARY}`
+ `flag label label-${DefaultBadgeStyle.PRIMARY}`
);
});
diff --git a/frontend/amundsen_application/static/js/components/Flag/index.tsx b/frontend/amundsen_application/static/js/components/Flag/index.tsx
index ee3eac47b..4e2626fac 100644
--- a/frontend/amundsen_application/static/js/components/Flag/index.tsx
+++ b/frontend/amundsen_application/static/js/components/Flag/index.tsx
@@ -3,7 +3,7 @@
import * as React from 'react';
-import { BadgeStyle } from 'config/config-types';
+import { DefaultBadgeStyle } from 'config/config-types';
import { convertText, CaseType } from 'utils/text';
import './styles.scss';
@@ -11,13 +11,13 @@ import './styles.scss';
export interface FlagProps {
caseType?: CaseType | null;
text: string;
- labelStyle?: BadgeStyle;
+ labelStyle?: DefaultBadgeStyle;
}
const Flag: React.FC = ({
caseType = null,
text = '',
- labelStyle = BadgeStyle.DEFAULT,
+ labelStyle = DefaultBadgeStyle.DEFAULT,
}: FlagProps) => (
// TODO: After upgrading to Bootstrap 4, this component should leverage badges
// https://getbootstrap.com/docs/4.1/components/badge/
diff --git a/frontend/amundsen_application/static/js/config/config-custom.ts b/frontend/amundsen_application/static/js/config/config-custom.ts
index 346a630d3..0c8b9dec1 100644
--- a/frontend/amundsen_application/static/js/config/config-custom.ts
+++ b/frontend/amundsen_application/static/js/config/config-custom.ts
@@ -1,59 +1,148 @@
// This file should be used to add new config variables or overwrite defaults from config-default.ts
import { AppConfigCustom } from './config-types';
+import { CustomBadgeStyle } from './config-types-custom';
+import { FilterType, ResourceType, SortDirection } from '../interfaces';
const configCustom: AppConfigCustom = {
- analytics: {
- plugins: [],
- },
- announcements: {
- enabled: false,
+ badges: {
+ marts: {
+ style: CustomBadgeStyle.MARTS,
+ displayName: 'Marts',
+ },
+ wrangling: {
+ style: CustomBadgeStyle.WRANGLING,
+ displayName: 'Wrangling',
+ },
+ staging: {
+ style: CustomBadgeStyle.STAGING,
+ displayName: 'Staging',
+ },
+ landing: {
+ style: CustomBadgeStyle.LANDING,
+ displayName: 'Landing',
+ },
+ snowflake: {
+ style: CustomBadgeStyle.SNOWFLAKE,
+ displayName: 'Snowflake',
+ },
+ mysql: {
+ style: CustomBadgeStyle.MYSQL,
+ displayName: 'MySQL',
+ },
+ mssql: {
+ style: CustomBadgeStyle.MSSQL,
+ displayName: 'MSSQL',
+ },
+ dbt: {
+ style: CustomBadgeStyle.DBT,
+ displayName: 'dbt',
+ },
+ watermark: {
+ style: CustomBadgeStyle.WATERMARK,
+ displayName: 'Watermark',
+ }
},
browse: {
curatedTags: [],
- hideNonClickableBadges: false,
showAllTags: true,
- showBadgesInHome: true,
+ showBadgesInHome: false,
+ hideNonClickableBadges: false,
},
- indexDashboards: {
- enabled: false,
+ mailClientFeatures: {
+ feedbackEnabled: true,
+ notificationsEnabled: true,
},
- indexProviders: {
+ indexDashboards: {
enabled: false,
},
- indexFiles: {
- enabled: false,
+ indexUsers: {
+ enabled: true, // Enables User Profile within Amundsen Frontend
},
indexFeatures: {
enabled: false,
},
- indexUsers: {
- enabled: false,
- },
+ userIdLabel: 'email address',
issueTracking: {
- enabled: false,
+ enabled: true,
issueDescriptionTemplate: '',
projectSelection: {
enabled: false,
- inputHint: '',
title: 'Issue project key (optional)',
+ inputHint: '',
},
},
- mailClientFeatures: {
- feedbackEnabled: false,
- notificationsEnabled: false,
- },
- preview: {
+ announcements: {
enabled: true,
},
- snowflake: {
- enabled: false,
- shares: {
- enabled: false
- }
+ featureLineage: {
+ inAppListEnabled: true,
},
- productTour: {},
- userIdLabel: 'email address',
+ navLinks: [
+ {
+ label: 'Announcements',
+ id: 'nav::announcements',
+ href: '/announcements',
+ use_router: true,
+ },
+ {
+ label: 'Browse',
+ id: 'nav::browse',
+ href: '/browse',
+ use_router: true,
+ },
+ ],
+ tableLineage: {
+ defaultLineageDepth: 25,
+ inAppListEnabled: true,
+ inAppPageEnabled: true,
+ externalEnabled: false,
+ iconPath: 'PATH_TO_ICON',
+ isBeta: false,
+ urlGenerator: (
+ database: string,
+ cluster: string,
+ schema: string,
+ table: string
+ ) =>
+ `https://DEFAULT_LINEAGE_URL?schema=${schema}&cluster=${cluster}&db=${database}&table=${table}`,
+ },
+ columnLineage: {
+ inAppListEnabled: true,
+ inAppPageEnabled: true,
+ urlGenerator: (
+ database: string,
+ cluster: string,
+ schema: string,
+ table: string,
+ column: string
+ ) =>
+ `https://DEFAULT_LINEAGE_URL?schema=${schema}&cluster=${cluster}&db=${database}&table=${table}&column=${column}`,
+ },
+ tableProfile: {
+ isBeta: true,
+ isExploreEnabled: false,
+ exploreUrlGenerator: (
+ database: string,
+ cluster: string,
+ schema: string,
+ table: string,
+ partitionKey?: string,
+ partitionValue?: string
+ ) =>
+ `https://DEFAULT_EXPLORE_URL?schema=${schema}&cluster=${cluster}&db=${database}&table=${table}`,
+ },
+ tableQualityChecks: {
+ isEnabled: true,
+ },
+ nestedColumns: {
+ maxNestedColumns: 500,
+ },
+ searchPagination: {
+ resultsPerPage: 10,
+ },
+ documentTitle: 'CMD+RVL - Data Discovery Platform',
+ footerContentHtml: 'Data Discovery Platform Powered by CMD+RVL',
};
export default configCustom;
diff --git a/frontend/amundsen_application/static/js/config/config-default.ts b/frontend/amundsen_application/static/js/config/config-default.ts
index 24f61772a..15be4b48f 100644
--- a/frontend/amundsen_application/static/js/config/config-default.ts
+++ b/frontend/amundsen_application/static/js/config/config-default.ts
@@ -1,60 +1,37 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { FilterType, ResourceType, SortDirection } from '../interfaces';
-import { AppConfig, BadgeStyle } from './config-types';
+import { AppConfig, BadgeStyle, DefaultBadgeStyle } from './config-types';
+
const configDefault: AppConfig = {
- navAppSuite: null,
- navTheme: 'dark',
- nestedColumns: {
- maxNestedColumns: 500,
- },
- productTour: {},
badges: {
- marts: {
- style: BadgeStyle.MARTS,
- displayName: 'Marts',
- },
- wrangling: {
- style: BadgeStyle.WRANGLING,
- displayName: 'Wrangling',
- },
- staging: {
- style: BadgeStyle.STAGING,
- displayName: 'Staging',
- },
- landing: {
- style: BadgeStyle.LANDING,
- displayName: 'Landing',
- },
- snowflake: {
- style: BadgeStyle.SNOWFLAKE,
- displayName: 'Snowflake',
+ negative: {
+ style: DefaultBadgeStyle.DANGER,
+ displayName: 'Danger',
},
- mysql: {
- style: BadgeStyle.MYSQL,
- displayName: 'MySQL',
+ neutral: {
+ style: DefaultBadgeStyle.DEFAULT,
+ displayName: 'Default',
},
- mssql: {
- style: BadgeStyle.MSSQL,
- displayName: 'MSSQL',
+ primary: {
+ style: DefaultBadgeStyle.PRIMARY,
+ displayName: 'Primary',
},
- dbt: {
- style: BadgeStyle.DBT,
- displayName: 'dbt',
- },
- watermark: {
- style: BadgeStyle.WATERMARK,
- displayName: 'Watermark',
- },
- crediq: {
- style: BadgeStyle.CREDIQ,
- displayName: 'Cred iQ',
- },
- crefc: {
- style: BadgeStyle.CREFC,
- displayName: 'CREFC',
+ positive: {
+ style: DefaultBadgeStyle.SUCCESS,
+ displayName: 'Success',
},
+ warning: {
+ style: DefaultBadgeStyle.WARNING,
+ displayName: 'Warning',
+ }
},
+ navAppSuite: null,
+ navTheme: 'dark',
+ nestedColumns: {
+ maxNestedColumns: 500,
+ },
+ productTour: {},
browse: {
curatedTags: [],
showAllTags: true,
@@ -624,3 +601,4 @@ const configDefault: AppConfig = {
};
export default configDefault;
+
diff --git a/frontend/amundsen_application/static/js/config/config-host.ts b/frontend/amundsen_application/static/js/config/config-host.ts
new file mode 100644
index 000000000..1fdcdfe92
--- /dev/null
+++ b/frontend/amundsen_application/static/js/config/config-host.ts
@@ -0,0 +1,80 @@
+// This file should be used to add new config variables or overwrite defaults from config-default.ts
+
+import { AppConfigCustom } from './config-types';
+
+import googleAnalytics from '@analytics/google-analytics';
+import googleTagManager from '@analytics/google-tag-manager';
+
+const configHost: AppConfigCustom = {
+ logoPath: '/static/images/cmdrvl-logo.png',
+ logoTitle: 'Salt.io',
+ indexDashboards: {
+ enabled: true,
+ },
+ indexUsers: {
+ enabled: true,
+ },
+ indexFiles: {
+ enabled: true,
+ },
+ indexProviders: {
+ enabled: true,
+ },
+ navLinks: [
+ {
+ label: 'Data Stories',
+ id: 'nav::anaytics',
+ href: 'https://count.co/connection/XM8NhhgFhAq',
+ use_router: false,
+ target: '_blank'
+ },
+ {
+ label: 'Data Pipelines',
+ id: 'nav::automation',
+ href: 'https://salt.cmdrvl.com/airflow',
+ use_router: false,
+ target: '_blank'
+ },
+ {
+ label: 'Announcements',
+ id: 'nav::announcements',
+ href: '/announcements',
+ use_router: true,
+ },
+ {
+ label: 'Browse',
+ id: 'nav::browse',
+ href: '/browse',
+ use_router: true,
+ },
+ {
+ label: 'Issues',
+ id: 'nav::issues',
+ href: 'https://foodtruck.atlassian.net/jira/software/c/projects/SDD/boards/10',
+ use_router: false,
+ target: '_blank'
+ },
+ ],
+ analytics: {
+ plugins: [
+ googleAnalytics({
+ measurementIds: 'G-W2N0GCH0N9',
+ sampleRate: 100
+ }),
+ googleTagManager({
+ containerId: 'GT-KFLHZL9'
+ })
+ ],
+ },
+ ai: {
+ enabled: true
+ },
+ snowflake: {
+ enabled: true,
+ shares: {
+ enabled: true
+ }
+ },
+};
+
+export default configHost;
diff --git a/frontend/amundsen_application/static/js/config/config-types-custom.ts b/frontend/amundsen_application/static/js/config/config-types-custom.ts
new file mode 100644
index 000000000..075fa716f
--- /dev/null
+++ b/frontend/amundsen_application/static/js/config/config-types-custom.ts
@@ -0,0 +1,12 @@
+
+export enum CustomBadgeStyle {
+ LANDING = 'landing',
+ STAGING = 'staging',
+ WRANGLING = 'wrangling',
+ MARTS = 'marts',
+ SNOWFLAKE = 'snowflake',
+ MYSQL = 'mysql',
+ MSSQL = 'mssql',
+ DBT = 'dbt',
+ WATERMARK = 'watermark',
+}
diff --git a/frontend/amundsen_application/static/js/config/config-types-host.ts b/frontend/amundsen_application/static/js/config/config-types-host.ts
new file mode 100644
index 000000000..00dc6ff95
--- /dev/null
+++ b/frontend/amundsen_application/static/js/config/config-types-host.ts
@@ -0,0 +1,4 @@
+// Placeholder
+export enum HostBadgeStyle {
+
+}
diff --git a/frontend/amundsen_application/static/js/config/config-types.ts b/frontend/amundsen_application/static/js/config/config-types.ts
index e461f0017..33ebe6c29 100644
--- a/frontend/amundsen_application/static/js/config/config-types.ts
+++ b/frontend/amundsen_application/static/js/config/config-types.ts
@@ -7,6 +7,9 @@ import {
import { Widget } from '../interfaces/Widgets';
+import { CustomBadgeStyle } from './config-types-custom';
+import { HostBadgeStyle } from './config-types-host';
+
/**
* AppConfig and AppConfigCustom should share the same definition, except each field in AppConfigCustom
* is optional. If you choose to override one of the configs, you must provide the full type definition
@@ -259,7 +262,7 @@ type NoticesConfigType = Record;
* filterCategories - Optional configuration for any filters that can be applied to this resource
*/
interface BaseResourceConfig {
- displayName: string;
+ displayName?: string;
filterCategories?: FilterConfig;
supportedSources?: SourcesConfig;
notices?: NoticesConfigType;
@@ -273,26 +276,19 @@ interface TableResourceConfig extends BaseResourceConfig {
stats?: StatsConfig;
}
-export enum BadgeStyle {
+export enum DefaultBadgeStyle {
DANGER = 'negative',
DEFAULT = 'neutral',
INFO = 'info',
PRIMARY = 'primary',
SUCCESS = 'positive',
WARNING = 'warning',
- LANDING = 'landing',
- STAGING = 'staging',
- WRANGLING = 'wrangling',
- MARTS = 'marts',
- SNOWFLAKE = 'snowflake',
- MYSQL = 'mysql',
- MSSQL = 'mssql',
- DBT = 'dbt',
- WATERMARK = 'watermark',
- CREDIQ = 'crediq',
- CREFC = 'crefc'
}
+// Merge the badges
+// export const BadgeStyle = { ...DefaultBadgeStyle, ...CustomBadgeStyle, ...HostBadgeStyle };
+export type BadgeStyle = DefaultBadgeStyle | CustomBadgeStyle | HostBadgeStyle;
+
export interface BadgeStyleConfig {
style: BadgeStyle;
displayName?: string;
diff --git a/frontend/amundsen_application/static/js/config/config-utils.ts b/frontend/amundsen_application/static/js/config/config-utils.ts
index 3c24cf0da..3f52ffd50 100644
--- a/frontend/amundsen_application/static/js/config/config-utils.ts
+++ b/frontend/amundsen_application/static/js/config/config-utils.ts
@@ -1,5 +1,5 @@
import AppConfig from 'config/config';
-import { BadgeStyle, BadgeStyleConfig } from 'config/config-types';
+import { DefaultBadgeStyle, BadgeStyleConfig } from 'config/config-types';
import { convertText, CaseType } from 'utils/text';
import { TableMetadata } from 'interfaces/TableMetadata';
@@ -221,13 +221,16 @@ export function getIconNotRequiredStatTypes(): string[] | undefined {
/*
* Given a badge name, this will return a badge style and a display name.
* If these are not specified by config, it will default to some simple rules:
- * use BadgeStyle.DEFAULT and badge name as display name.
+ * use DefaultBadgeStyle.DEFAULT and badge name as display name.
*/
export function getBadgeConfig(badgeName: string): BadgeStyleConfig {
+ console.log(`badgename=${badgeName}`);
+ console.log(`AppConfig.badges`);
+ console.log(AppConfig.badges);
const config: object = AppConfig.badges[badgeName] || {};
return {
- style: BadgeStyle.DEFAULT,
+ style: DefaultBadgeStyle.DEFAULT,
displayName: convertText(badgeName, CaseType.TITLE_CASE),
...config,
};
diff --git a/frontend/amundsen_application/static/js/config/config.ts b/frontend/amundsen_application/static/js/config/config.ts
index 542c4a751..e1ff699ac 100644
--- a/frontend/amundsen_application/static/js/config/config.ts
+++ b/frontend/amundsen_application/static/js/config/config.ts
@@ -1,15 +1,44 @@
-import { AppConfig, AppConfigExternal } from './config-types';
+import { AppConfig } from './config-types';
import configDefault from './config-default';
import configCustom from './config-custom';
+import configHost from './config-host';
+import { ResourceType } from '../interfaces';
+import _ from 'lodash';
-// This is not a shallow merge. In two steps we are overriding the application config
-// Step 1: Any defined members of customConfig will override configDefault.
-// Step 2: Any defined members of configExternal will override the configDefault and configCustom.
+// This is not a shallow merge.
+// Any defined members of customConfig will override configDefault.
+// Any defined members of customHost will override configCustom.
+// const appConfig: AppConfig = { ...configDefault, ...configCustom, ...configHost };
+console.log("starting appconfig")
+
+// Merge badges
+const mergedBadges = _.merge(
+ {},
+ configDefault.badges,
+ (configCustom.badges ? configCustom.badges : {}),
+ (configHost.badges ? configHost.badges : {})
+);
+
+// Merge resourceConfig
+const mergedResourceConfig = _.merge(
+ {},
+ configDefault.resourceConfig,
+ configCustom.resourceConfig,
+ configHost.resourceConfig
+);
+
+
+// Perform complete overrides for other properties
const appConfig: AppConfig = {
- ...configDefault,
- ...configCustom,
- ...((globalThis as unknown as AppConfigExternal)?.configExternal || {}),
+ ...configDefault,
+ ...configCustom,
+ ...configHost,
+ badges: mergedBadges, // Use the merged result
+ resourceConfig: mergedResourceConfig
};
-export default appConfig;
+console.log("AppConfig");
+console.log(JSON.stringify(appConfig, null, 2));
+
+export default appConfig;
\ No newline at end of file
diff --git a/frontend/amundsen_application/static/js/config/index.spec.ts b/frontend/amundsen_application/static/js/config/index.spec.ts
index 57d0f4980..fcd754b8a 100644
--- a/frontend/amundsen_application/static/js/config/index.spec.ts
+++ b/frontend/amundsen_application/static/js/config/index.spec.ts
@@ -2,7 +2,7 @@ import AppConfig from 'config/config';
import * as ConfigUtils from 'config/config-utils';
import configDefault from 'config/config-default';
import {
- BadgeStyle,
+ DefaultBadgeStyle,
NoticeSeverity,
VisualLinkConfig,
} from 'config/config-types';
@@ -672,11 +672,11 @@ describe('getTableSortCriterias', () => {
describe('getBadgeConfig', () => {
AppConfig.badges = {
test_1: {
- style: BadgeStyle.DANGER,
+ style: DefaultBadgeStyle.DANGER,
displayName: 'badge display value 1',
},
test_2: {
- style: BadgeStyle.DANGER,
+ style: DefaultBadgeStyle.DANGER,
displayName: 'badge display value 2',
},
};
@@ -693,7 +693,7 @@ describe('getBadgeConfig', () => {
const badgeName = 'Not_configured_badge';
const badgeConfig = ConfigUtils.getBadgeConfig(badgeName);
- expect(badgeConfig.style).toEqual(BadgeStyle.DEFAULT);
+ expect(badgeConfig.style).toEqual(DefaultBadgeStyle.DEFAULT);
expect(badgeConfig.displayName).toEqual(badgeName);
});
});
diff --git a/frontend/amundsen_application/static/js/features/Badges/BadgeBrowseList/index.spec.tsx b/frontend/amundsen_application/static/js/features/Badges/BadgeBrowseList/index.spec.tsx
index 0de243934..299eca3c6 100644
--- a/frontend/amundsen_application/static/js/features/Badges/BadgeBrowseList/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/features/Badges/BadgeBrowseList/index.spec.tsx
@@ -4,7 +4,7 @@
import * as React from 'react';
import { shallow } from 'enzyme';
-import { BadgeStyle } from 'config/config-types';
+import { DefaultBadgeStyle } from 'config/config-types';
import * as ConfigUtils from 'config/config-utils';
import { Badge } from 'interfaces/Badges';
@@ -44,7 +44,7 @@ describe('BadgeBrowseList', () => {
getBadgeConfigSpy.mockImplementation((badgeName: string) => ({
displayName: badgeName + ' test name',
- style: BadgeStyle.PRIMARY,
+ style: DefaultBadgeStyle.PRIMARY,
}));
describe('render', () => {
diff --git a/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.spec.tsx b/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.spec.tsx
index 04bedbb42..bea5e5d3b 100644
--- a/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.spec.tsx
@@ -4,7 +4,7 @@
import * as React from 'react';
import { mount } from 'enzyme';
-import { BadgeStyle } from 'config/config-types';
+import { DefaultBadgeStyle } from 'config/config-types';
import * as ConfigUtils from 'config/config-utils';
import { Badge } from 'interfaces/Badges';
@@ -60,7 +60,7 @@ describe('BadgeList', () => {
getBadgeConfigSpy.mockImplementation((badgeName: string) => ({
displayName: badgeName + ' test name',
- style: BadgeStyle.PRIMARY,
+ style: DefaultBadgeStyle.PRIMARY,
}));
describe('render', () => {
diff --git a/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.tsx b/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.tsx
index 0428f94e5..b8e9a102e 100644
--- a/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.tsx
+++ b/frontend/amundsen_application/static/js/features/Badges/BadgeList/index.tsx
@@ -4,7 +4,7 @@
import * as React from 'react';
import { getBadgeConfig } from 'config/config-utils';
-import { BadgeStyle, BadgeStyleConfig } from 'config/config-types';
+import { DefaultBadgeStyle, BadgeStyleConfig } from 'config/config-types';
import { convertText, CaseType } from 'utils/text';
import { logClick } from 'utils/analytics';
@@ -22,7 +22,7 @@ export interface BadgeListProps {
}
export interface ActionableBadgeProps {
- style: BadgeStyle;
+ style: DefaultBadgeStyle;
displayName: string;
action: any;
}
diff --git a/frontend/amundsen_application/static/js/features/ColumnList/index.spec.tsx b/frontend/amundsen_application/static/js/features/ColumnList/index.spec.tsx
index 022cbbbd5..a6facfe32 100644
--- a/frontend/amundsen_application/static/js/features/ColumnList/index.spec.tsx
+++ b/frontend/amundsen_application/static/js/features/ColumnList/index.spec.tsx
@@ -8,7 +8,7 @@ import configureStore from 'redux-mock-store';
import { mocked } from 'ts-jest/utils';
import { SortDirection } from 'interfaces';
-import { BadgeStyle } from 'config/config-types';
+import { DefaultBadgeStyle } from 'config/config-types';
import * as ConfigUtils from 'config/config-utils';
import globalState from 'fixtures/globalState';
@@ -344,7 +344,7 @@ describe('ColumnList', () => {
getBadgeConfigSpy.mockImplementation((badgeName: string) => ({
displayName: badgeName + ' test name',
- style: BadgeStyle.PRIMARY,
+ style: DefaultBadgeStyle.PRIMARY,
}));
it('should render the rows', () => {
diff --git a/frontend/amundsen_application/static/js/interfaces/Enums.ts b/frontend/amundsen_application/static/js/interfaces/Enums.ts
index b78b42147..08bfd5d33 100644
--- a/frontend/amundsen_application/static/js/interfaces/Enums.ts
+++ b/frontend/amundsen_application/static/js/interfaces/Enums.ts
@@ -52,46 +52,46 @@ export enum ImageIconType {
}
// Icon types from _icons.scss
-export enum IconType {
- CHECK = 'icon-check',
- USERS = 'icon-users',
- DASHBOARD = 'icon-dashboard',
- MODE = 'icon-mode',
- REDASH = 'icon-redash',
- TABLEAU = 'icon-tableau',
- COUNT = 'icon-count',
- DATABASE = 'icon-database',
- HIVE = 'icon-hive',
- BIGQUERY = 'icon-bigquery',
- DREMIO = 'icon-dremio',
- DRUID = 'icon-druid',
- ORACLE = 'icon-oracle',
- PRESTO = 'icon-presto',
- TRINO = 'icon-trino',
- POSTGRES = 'icon-postgres',
- REDSHIFT = 'icon-redshift',
- SNOWFLAKE = 'icon-snowflake',
- MYSQL = 'icon-mysql',
- MSSQL = 'icon-mssql',
- CLICKHOUSE = 'icon-clickhouse',
- SUPERSET = 'icon-superset',
- ELASTICSEARCH = 'icon-elasticsearch',
- DATABRICKS_SQL = 'icon-databricks-sql',
- TERADATA = 'icon-teradata',
- CREDIQ = 'icon-crediq',
- SALT = 'icon-salt',
- // Providers
- PROVIDER = 'icon-provider',
- SECGOV = 'icon-secgov',
- CMDRVL = 'icon-cmdrvl',
- // Files
- FILE = 'icon-file',
- CSV = 'icon-csv',
- PDF = 'icon-pdf',
- JSON = 'icon-json',
- EXCEL = 'icon-excel',
- BINARY = 'icon-binary',
-}
+// export enum IconType {
+// CHECK = 'icon-check',
+// USERS = 'icon-users',
+// DASHBOARD = 'icon-dashboard',
+// MODE = 'icon-mode',
+// REDASH = 'icon-redash',
+// TABLEAU = 'icon-tableau',
+// COUNT = 'icon-count',
+// DATABASE = 'icon-database',
+// HIVE = 'icon-hive',
+// BIGQUERY = 'icon-bigquery',
+// DREMIO = 'icon-dremio',
+// DRUID = 'icon-druid',
+// ORACLE = 'icon-oracle',
+// PRESTO = 'icon-presto',
+// TRINO = 'icon-trino',
+// POSTGRES = 'icon-postgres',
+// REDSHIFT = 'icon-redshift',
+// SNOWFLAKE = 'icon-snowflake',
+// MYSQL = 'icon-mysql',
+// MSSQL = 'icon-mssql',
+// CLICKHOUSE = 'icon-clickhouse',
+// SUPERSET = 'icon-superset',
+// ELASTICSEARCH = 'icon-elasticsearch',
+// DATABRICKS_SQL = 'icon-databricks-sql',
+// TERADATA = 'icon-teradata',
+// CREDIQ = 'icon-crediq',
+// SALT = 'icon-salt',
+// // Providers
+// PROVIDER = 'icon-provider',
+// SECGOV = 'icon-secgov',
+// CMDRVL = 'icon-cmdrvl',
+// // Files
+// FILE = 'icon-file',
+// CSV = 'icon-csv',
+// PDF = 'icon-pdf',
+// JSON = 'icon-json',
+// EXCEL = 'icon-excel',
+// BINARY = 'icon-binary',
+// }
// Icon sizes
export enum IconSizes {
diff --git a/frontend/amundsen_application/static/templates/fragments/icons-prod.html b/frontend/amundsen_application/static/templates/fragments/icons-prod.html
index 63bf2d636..ff4912ac3 100644
--- a/frontend/amundsen_application/static/templates/fragments/icons-prod.html
+++ b/frontend/amundsen_application/static/templates/fragments/icons-prod.html
@@ -1,15 +1,9 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/frontend/amundsen_application/static/templates/fragments/icons-prod.html.orig b/frontend/amundsen_application/static/templates/fragments/icons-prod.html.orig
new file mode 100644
index 000000000..63bf2d636
--- /dev/null
+++ b/frontend/amundsen_application/static/templates/fragments/icons-prod.html.orig
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+