From 6e6b7abdf279dad02fb770e740973ed5529160dc Mon Sep 17 00:00:00 2001 From: anandtiwary <52081890+anandtiwary@users.noreply.github.com> Date: Tue, 15 Jun 2021 20:49:19 -0700 Subject: [PATCH 1/2] feat: adding new icons and updating link style --- projects/assets-library/assets/icons/go.svg | 7 +++++-- projects/assets-library/assets/icons/istio.svg | 3 +++ projects/assets-library/assets/icons/java.svg | 18 +++++++++--------- projects/assets-library/assets/icons/kong.svg | 8 ++++---- .../assets-library/assets/icons/kubernetes.svg | 18 +++++++++--------- .../assets-library/assets/icons/python.svg | 14 ++++++++++++++ .../assets/styles/_interaction.scss | 9 +++++++++ .../src/icons/icon-library.module.ts | 2 ++ projects/assets-library/src/icons/icon-type.ts | 2 ++ .../components/src/link/link.component.scss | 2 ++ projects/observability/assets/icons/nginx.svg | 5 +++-- 11 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 projects/assets-library/assets/icons/istio.svg create mode 100644 projects/assets-library/assets/icons/python.svg diff --git a/projects/assets-library/assets/icons/go.svg b/projects/assets-library/assets/icons/go.svg index 7de1d8ec6..059699101 100644 --- a/projects/assets-library/assets/icons/go.svg +++ b/projects/assets-library/assets/icons/go.svg @@ -1,3 +1,6 @@ - - + + + + + diff --git a/projects/assets-library/assets/icons/istio.svg b/projects/assets-library/assets/icons/istio.svg new file mode 100644 index 000000000..dc0b80cc7 --- /dev/null +++ b/projects/assets-library/assets/icons/istio.svg @@ -0,0 +1,3 @@ + + + diff --git a/projects/assets-library/assets/icons/java.svg b/projects/assets-library/assets/icons/java.svg index 6e431a046..29d13c9e1 100644 --- a/projects/assets-library/assets/icons/java.svg +++ b/projects/assets-library/assets/icons/java.svg @@ -1,10 +1,10 @@ - - - - - - - - - + + + + + + + + + diff --git a/projects/assets-library/assets/icons/kong.svg b/projects/assets-library/assets/icons/kong.svg index f98e64deb..d931e95c2 100644 --- a/projects/assets-library/assets/icons/kong.svg +++ b/projects/assets-library/assets/icons/kong.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/projects/assets-library/assets/icons/kubernetes.svg b/projects/assets-library/assets/icons/kubernetes.svg index f47607ce7..6c8c87790 100644 --- a/projects/assets-library/assets/icons/kubernetes.svg +++ b/projects/assets-library/assets/icons/kubernetes.svg @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + diff --git a/projects/assets-library/assets/icons/python.svg b/projects/assets-library/assets/icons/python.svg new file mode 100644 index 000000000..58d277dab --- /dev/null +++ b/projects/assets-library/assets/icons/python.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/projects/assets-library/assets/styles/_interaction.scss b/projects/assets-library/assets/styles/_interaction.scss index fb2586d0b..fc8667c77 100644 --- a/projects/assets-library/assets/styles/_interaction.scss +++ b/projects/assets-library/assets/styles/_interaction.scss @@ -14,6 +14,15 @@ } } +@mixin raised-shadow-hover { + &:hover { + border: none; + box-shadow: 0 8px 20px rgba(63, 71, 74, 0.16), 0 2px 12px rgba(63, 71, 74, 0.08), + 0 1px 8px rgba(63, 71, 74, 0.08); + transform: scale(1.02, 1.02); + } +} + @mixin filter-box-shadow { @include box-shadow-2dp(); } diff --git a/projects/assets-library/src/icons/icon-library.module.ts b/projects/assets-library/src/icons/icon-library.module.ts index c04765bbb..8f76ef645 100644 --- a/projects/assets-library/src/icons/icon-library.module.ts +++ b/projects/assets-library/src/icons/icon-library.module.ts @@ -57,6 +57,7 @@ const iconsRootPath = 'assets/icons'; { key: IconType.Info, url: `${iconsRootPath}/info.svg` }, { key: IconType.Infrastructure, url: `${iconsRootPath}/infrastructure.svg` }, { key: IconType.Internal, url: `${iconsRootPath}/internal.svg` }, + { key: IconType.Istio, url: `${iconsRootPath}/istio.svg` }, { key: IconType.Java, url: `${iconsRootPath}/java.svg` }, { key: IconType.KnowledgeGraph, url: `${iconsRootPath}/knowledge-graph.svg` }, { key: IconType.Kong, url: `${iconsRootPath}/kong.svg` }, @@ -69,6 +70,7 @@ const iconsRootPath = 'assets/icons'; { key: IconType.Node, url: `${iconsRootPath}/node.svg` }, { key: IconType.Note, url: `${iconsRootPath}/note.svg` }, { key: IconType.OpenInNewTab, url: `${iconsRootPath}/open-in-new-tab.svg` }, + { key: IconType.Python, url: `${iconsRootPath}/python.svg` }, { key: IconType.Search, url: `${iconsRootPath}/search.svg` }, { key: IconType.SidebarCollapse, url: `${iconsRootPath}/sidebar-collapse.svg` }, { key: IconType.SidebarExpand, url: `${iconsRootPath}/sidebar-expand.svg` }, diff --git a/projects/assets-library/src/icons/icon-type.ts b/projects/assets-library/src/icons/icon-type.ts index 521dfe2b3..57b483435 100644 --- a/projects/assets-library/src/icons/icon-type.ts +++ b/projects/assets-library/src/icons/icon-type.ts @@ -57,6 +57,7 @@ export const enum IconType { Home = 'home', Hypertrace = 'svg:hypertrace', IpAddress = 'svg:ip-address', + Istio = 'svg:istio', Info = 'svg:info', Infrastructure = 'svg:infrastructure', Internal = 'svg:internal', @@ -84,6 +85,7 @@ export const enum IconType { OpenInNewTab = 'svg:open-in-new-tab', PageView = 'pageview', Previous = 'navigate_before', + Python = 'svg:python', Refresh = 'refresh', Remove = 'remove', RemoveCircle = 'remove_circle', diff --git a/projects/components/src/link/link.component.scss b/projects/components/src/link/link.component.scss index dfc9c918f..1c2cb10f6 100644 --- a/projects/components/src/link/link.component.scss +++ b/projects/components/src/link/link.component.scss @@ -7,6 +7,8 @@ text-decoration-line: none; text-decoration: none; color: inherit; + width: inherit; + height: inherit; &:not(.disabled) { @include link-hover; diff --git a/projects/observability/assets/icons/nginx.svg b/projects/observability/assets/icons/nginx.svg index 6465c8296..f7f359afa 100644 --- a/projects/observability/assets/icons/nginx.svg +++ b/projects/observability/assets/icons/nginx.svg @@ -1,3 +1,4 @@ - - + + + From 9f74e7a49c0b6fafdf822ff5914df1c17a6d63fd Mon Sep 17 00:00:00 2001 From: anandtiwary <52081890+anandtiwary@users.noreply.github.com> Date: Tue, 15 Jun 2021 22:42:21 -0700 Subject: [PATCH 2/2] refactor: fixing lint issues --- projects/assets-library/assets/styles/_interaction.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/assets-library/assets/styles/_interaction.scss b/projects/assets-library/assets/styles/_interaction.scss index fc8667c77..eb48c078f 100644 --- a/projects/assets-library/assets/styles/_interaction.scss +++ b/projects/assets-library/assets/styles/_interaction.scss @@ -17,8 +17,7 @@ @mixin raised-shadow-hover { &:hover { border: none; - box-shadow: 0 8px 20px rgba(63, 71, 74, 0.16), 0 2px 12px rgba(63, 71, 74, 0.08), - 0 1px 8px rgba(63, 71, 74, 0.08); + box-shadow: 0 8px 20px rgba(63, 71, 74, 0.16), 0 2px 12px rgba(63, 71, 74, 0.08), 0 1px 8px rgba(63, 71, 74, 0.08); transform: scale(1.02, 1.02); } }