From 5585fa10c4a133953481720a96fd4b3eef9d66fe Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Mon, 18 Dec 2023 10:44:06 -0500 Subject: [PATCH 01/11] change of font sizes --- .../hmi-client/src/assets/css/theme/_fonts.scss | 11 +++++------ .../hmi-client/src/assets/css/theme/_variables.scss | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/client/hmi-client/src/assets/css/theme/_fonts.scss b/packages/client/hmi-client/src/assets/css/theme/_fonts.scss index 0acc6a427a..de8cb68d42 100644 --- a/packages/client/hmi-client/src/assets/css/theme/_fonts.scss +++ b/packages/client/hmi-client/src/assets/css/theme/_fonts.scss @@ -13,18 +13,17 @@ h2 { } h4 { - font-size: 20px; - letter-spacing: 0.15px; + font-size: $fontBodyLarge; } h5 { - font-size: 16px; + font-size: $fontBodyMedium; } h6 { - font-size: 14px; + font-size: $fontBodySmall; } h7 { - font-size: var(--font-caption); -} \ No newline at end of file + font-size: $fontCaption; +} diff --git a/packages/client/hmi-client/src/assets/css/theme/_variables.scss b/packages/client/hmi-client/src/assets/css/theme/_variables.scss index e01036906f..bccc2f9933 100644 --- a/packages/client/hmi-client/src/assets/css/theme/_variables.scss +++ b/packages/client/hmi-client/src/assets/css/theme/_variables.scss @@ -35,13 +35,13 @@ $fontBodySmall: 14px; $fontBodyMedium: 16px; $fontBodyLarge: 18px; $fontFamily: Figtree, Helvetica Neue Light, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif !default; -$fontSize: $fontBodyMedium; +$fontSize: $fontBodySmall; $fontWeight: 400 !default; $fontWeightSemiBold: 600; //global $textColor: rgb(16, 24, 40); -$textSecondaryColor: $emphasis-medium !default; +$textSecondaryColor: $emphasis-medium !default; $borderRadius: 4px !default; $mediumBorderRadius: 6px !default; $bigBorderRadius: 8px !default; @@ -693,7 +693,7 @@ $overlayMenuBg: $menuBg !default; $overlayMenuBorder: 0 none !default; $overlayMenuShadow: 0 2px 4px -1px rgba(0, 0, 0, .2), 0 4px 5px 0 rgba(0, 0, 0, .14), 0 1px 10px 0 rgba(0, 0, 0, .12) !default; $verticalMenuPadding: .5rem 0 !default; -$menuSeparatorMargin: .5rem 0 !default; +$menuSeparatorMargin: .5rem 0 !default; $breadcrumbPadding: 1rem !default; $breadcrumbBg: #ffffff !default; @@ -956,4 +956,4 @@ $petri-inputBox: var(--surface-0); --node-header-hover: var(--text-color-subdued); --z-index-modal: 1000; --keyboard-zindex: calc(var(--z-index-modal) + 100); -} \ No newline at end of file +} From ca37e1fcb6cee9f3ed44e73eb2120c938f774821 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Mon, 18 Dec 2023 10:47:09 -0500 Subject: [PATCH 02/11] fix slider panel header orientation --- .../hmi-client/src/components/widgets/tera-slider-panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/hmi-client/src/components/widgets/tera-slider-panel.vue b/packages/client/hmi-client/src/components/widgets/tera-slider-panel.vue index 3213694dd8..b1e71ac9bd 100644 --- a/packages/client/hmi-client/src/components/widgets/tera-slider-panel.vue +++ b/packages/client/hmi-client/src/components/widgets/tera-slider-panel.vue @@ -125,7 +125,7 @@ i.slider-header-item { } .slider-tab-header h5 { - transform: rotate(180deg); + transform: rotate(0deg); writing-mode: vertical-lr; } From 178593d4f99f9fe3b27956a42c95f137d4bfd519 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Mon, 18 Dec 2023 10:51:00 -0500 Subject: [PATCH 03/11] Change Cards to a different icon --- packages/client/hmi-client/src/page/Home.vue | 2 +- packages/client/hmi-client/src/page/project/tera-project.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/hmi-client/src/page/Home.vue b/packages/client/hmi-client/src/page/Home.vue index 061262f0db..7c0918f4ee 100644 --- a/packages/client/hmi-client/src/page/Home.vue +++ b/packages/client/hmi-client/src/page/Home.vue @@ -160,7 +160,7 @@ const sortOptions = [ const view = ref(ProjectsView.Cards); const viewOptions = ref([ - { value: ProjectsView.Cards, icon: 'pi pi-image' }, + { value: ProjectsView.Cards, icon: 'pi pi-credit-card' }, { value: ProjectsView.Table, icon: 'pi pi-list' } ]); diff --git a/packages/client/hmi-client/src/page/project/tera-project.vue b/packages/client/hmi-client/src/page/project/tera-project.vue index c4987d71e0..4f91f02155 100644 --- a/packages/client/hmi-client/src/page/project/tera-project.vue +++ b/packages/client/hmi-client/src/page/project/tera-project.vue @@ -101,7 +101,7 @@ const assetName = computed(() => { /** * FIXME: to properly type this we'd want to have a base type with common attributes id/name ... etc * - * const list = assets[ pageType.value as string] as IdetifiableAsset[] + * const list = assets[ pageType.value as string] as IdentifiableAsset[] * const asset = list.find(...) */ if (assets) { From 1e66f2fa8e0bdea8534fd8fdef52140733cad95d Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Mon, 18 Dec 2023 11:05:13 -0500 Subject: [PATCH 04/11] Update input padding default --- .../src/assets/css/theme/_variables.scss | 3 ++- .../components/tera-resource-sidebar.vue | 26 +++++++------------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/packages/client/hmi-client/src/assets/css/theme/_variables.scss b/packages/client/hmi-client/src/assets/css/theme/_variables.scss index bccc2f9933..e60ab2cb1d 100644 --- a/packages/client/hmi-client/src/assets/css/theme/_variables.scss +++ b/packages/client/hmi-client/src/assets/css/theme/_variables.scss @@ -58,6 +58,7 @@ $disabledOpacity: .38 !default; $maskBg: rgba(0, 0, 0, 0.32) !default; $loadingIconFontSize: 2rem !default; $errorColor: #B00020 !default; +$padding: .5rem !default; //selected state $highlightBg: #E9FFFC; @@ -86,7 +87,7 @@ $actionIconHoverColor: $textSecondaryColor !default; $actionIconBorderRadius: 50% !default; //input field (e.g. inputtext, spinner, inputmask) -$inputPadding: 1rem 1rem !default; +$inputPadding: $padding $padding !default; $inputTextFontSize: $fontSize; $inputBg: #ffffff !default; $inputTextColor: $emphasis-high !default; diff --git a/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue b/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue index af707df16c..5966cc8c1f 100644 --- a/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue +++ b/packages/client/hmi-client/src/page/project/components/tera-resource-sidebar.vue @@ -5,15 +5,7 @@ -