From 6b40f44ff509e7025b594ec44fee580f3fade26a Mon Sep 17 00:00:00 2001 From: Darya Plotnytska Date: Wed, 31 Jan 2024 15:08:49 +0100 Subject: [PATCH] console: Adapt svg to use current color --- pkg/webui/assets/misc/favorite-outline.svg | 9 --------- pkg/webui/components/panel/index.js | 8 ++++---- pkg/webui/components/panel/panel.styl | 13 +++++++------ pkg/webui/components/panel/story.js | 5 +++-- .../shortcut-panel/shortcut-item/shortcut-item.styl | 2 +- 5 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 pkg/webui/assets/misc/favorite-outline.svg diff --git a/pkg/webui/assets/misc/favorite-outline.svg b/pkg/webui/assets/misc/favorite-outline.svg deleted file mode 100644 index 66d0e7e0ce..0000000000 --- a/pkg/webui/assets/misc/favorite-outline.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/pkg/webui/components/panel/index.js b/pkg/webui/components/panel/index.js index b6ad4bd1e7..93c62e3038 100644 --- a/pkg/webui/components/panel/index.js +++ b/pkg/webui/components/panel/index.js @@ -30,7 +30,7 @@ const Panel = ({ children, title, icon, - svg, + svgIcon, toggleOptions, activeToggle, onToggleClick, @@ -44,7 +44,7 @@ const Panel = ({
{icon && } - {svg && star} + {svgIcon} {messageDecorators}
@@ -71,7 +71,7 @@ Panel.propTypes = { messageDecorators: PropTypes.node, onToggleClick: PropTypes.func, path: PropTypes.string.isRequired, - svg: PropTypes.string, + svgIcon: PropTypes.node, title: PropTypes.message.isRequired, toggleOptions: PropTypes.arrayOf(PropTypes.shape({})), } @@ -85,7 +85,7 @@ Panel.defaultProps = { className: undefined, messageDecorators: undefined, divider: false, - svg: undefined, + svgIcon: undefined, } export default Panel diff --git a/pkg/webui/components/panel/panel.styl b/pkg/webui/components/panel/panel.styl index 4304067b8f..84f8cacb63 100644 --- a/pkg/webui/components/panel/panel.styl +++ b/pkg/webui/components/panel/panel.styl @@ -26,12 +26,13 @@ font-size: $fsv2.l line-height: 1 - &-svg - width: 21px - height: 21px - background-color: var(--c-bg-brand-extralight) - padding: $cs.xs - border-radius: $br.l + svg + width: 21px + height: 21px + background-color: var(--c-bg-brand-extralight) + padding: $cs.xs + border-radius: $br.l + color: var(--c-bg-brand-normal) a.button font-weight: $fwv2.semibold diff --git a/pkg/webui/components/panel/story.js b/pkg/webui/components/panel/story.js index 9a35eb316f..b4c07adbef 100644 --- a/pkg/webui/components/panel/story.js +++ b/pkg/webui/components/panel/story.js @@ -15,7 +15,8 @@ import React from 'react' import loginVisual from '@assets/img/layout/bg/login-visual.jpg' -import starIcon from '@assets/misc/favorite-outline.svg' + +import StarIcon from '@ttn-lw/components/icon/star-icon' import NewsItem from '../news-panel/news-item' @@ -72,7 +73,7 @@ export const WithToggle = () => { return (
- + } toggleOptions={options} />
) } diff --git a/pkg/webui/components/shortcut-panel/shortcut-item/shortcut-item.styl b/pkg/webui/components/shortcut-panel/shortcut-item/shortcut-item.styl index a4d7f09598..c9e5583903 100644 --- a/pkg/webui/components/shortcut-panel/shortcut-item/shortcut-item.styl +++ b/pkg/webui/components/shortcut-panel/shortcut-item/shortcut-item.styl @@ -40,7 +40,7 @@ flex-direction: column top: 0 opacity: 1 - transition: $ad.m opacity ease-in-out + transition: $ad.s opacity ease-in-out &-title-wrapper opacity: 1