From 38db7f9db7a89b496e7277ec5424d2bd97b1edc2 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 19 Oct 2023 23:54:36 +0200 Subject: [PATCH] style tweaks #4338 --- src/public/app/widgets/buttons/global_menu.js | 2 +- src/public/app/widgets/containers/ribbon_container.js | 2 +- src/public/app/widgets/ribbon_widgets/basic_properties.js | 3 ++- .../app/widgets/ribbon_widgets/inherited_attribute_list.js | 2 +- .../app/widgets/ribbon_widgets/owned_attribute_list.js | 3 ++- src/public/app/widgets/tab_row.js | 5 +++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js index dc17cfbc5..792375abd 100644 --- a/src/public/app/widgets/buttons/global_menu.js +++ b/src/public/app/widgets/buttons/global_menu.js @@ -18,7 +18,7 @@ const TPL = ` .global-menu-button { background-image: url("${window.glob.assetPath}/images/icon-black.svg"); background-repeat: no-repeat; - background-position: 50% 80%; + background-position: 40% 50%; background-size: 45px; width: 100%; height: 100%; diff --git a/src/public/app/widgets/containers/ribbon_container.js b/src/public/app/widgets/containers/ribbon_container.js index a132a0aaf..c75776a99 100644 --- a/src/public/app/widgets/containers/ribbon_container.js +++ b/src/public/app/widgets/containers/ribbon_container.js @@ -88,7 +88,7 @@ const TPL = ` display: none; border-bottom: 1px solid var(--main-border-color); margin-left: 10px; - margin-right: 10px; + margin-right: 5px; /* needs to have this value so that the bottom border is the same width as the top one */ } .ribbon-body.active { diff --git a/src/public/app/widgets/ribbon_widgets/basic_properties.js b/src/public/app/widgets/ribbon_widgets/basic_properties.js index 00dec1015..39e34d111 100644 --- a/src/public/app/widgets/ribbon_widgets/basic_properties.js +++ b/src/public/app/widgets/ribbon_widgets/basic_properties.js @@ -17,7 +17,8 @@ const TPL = ` .basic-properties-widget > * { margin-right: 30px; - margin-top: 12px; + margin-top: 9px; + margin-bottom: 2px; } .note-type-container, .editability-select-container { diff --git a/src/public/app/widgets/ribbon_widgets/inherited_attribute_list.js b/src/public/app/widgets/ribbon_widgets/inherited_attribute_list.js index 9445d088a..1af39a972 100644 --- a/src/public/app/widgets/ribbon_widgets/inherited_attribute_list.js +++ b/src/public/app/widgets/ribbon_widgets/inherited_attribute_list.js @@ -14,7 +14,7 @@ const TPL = ` color: var(--muted-text-color); max-height: 200px; overflow: auto; - padding: 12px 12px 11px 12px; + padding: 14px 12px 13px 12px; } diff --git a/src/public/app/widgets/ribbon_widgets/owned_attribute_list.js b/src/public/app/widgets/ribbon_widgets/owned_attribute_list.js index a68371f35..2e37fe8f3 100644 --- a/src/public/app/widgets/ribbon_widgets/owned_attribute_list.js +++ b/src/public/app/widgets/ribbon_widgets/owned_attribute_list.js @@ -8,7 +8,8 @@ const TPL = ` .attribute-list { margin-left: 7px; margin-right: 7px; - margin-top: 3px; + margin-top: 5px; + margin-bottom: 2px; position: relative; } diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js index 85ab7e3c5..e47a1ee33 100644 --- a/src/public/app/widgets/tab_row.js +++ b/src/public/app/widgets/tab_row.js @@ -22,6 +22,7 @@ const Draggabilly = window.Draggabilly; const TAB_CONTAINER_MIN_WIDTH = 24; const TAB_CONTAINER_MAX_WIDTH = 240; +const TAB_CONTAINER_LEFT_PADDING = 5; const NEW_TAB_WIDTH = 32; const MIN_FILLER_WIDTH = 50; const MARGIN_WIDTH = 5; @@ -330,7 +331,7 @@ export default class TabRowWidget extends BasicWidget { getTabPositions() { const tabPositions = []; - let position = 0; + let position = TAB_CONTAINER_LEFT_PADDING; this.tabWidths.forEach(width => { tabPositions.push(position); position += width + MARGIN_WIDTH; @@ -617,7 +618,7 @@ export default class TabRowWidget extends BasicWidget { // update tab id for the new main context this.getTabById(oldMainNtxId).attr("data-ntx-id", newMainNtxId); - this.updateTabById(newMainNtxId); + this.updateTabById(newMainNtxId); } contextsReopenedEvent({mainNtxId, tabPosition}) {