From 8b401e8b39696e2a15c452f7989bf7c5d53be602 Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Sun, 8 Jun 2025 17:55:00 +0300 Subject: [PATCH 1/3] Fix incorrectly rounded buttons in group paginator --- styles/templates/_groupPaginator.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/styles/templates/_groupPaginator.scss b/styles/templates/_groupPaginator.scss index b135bc5d..74eee1c2 100644 --- a/styles/templates/_groupPaginator.scss +++ b/styles/templates/_groupPaginator.scss @@ -12,10 +12,16 @@ &__previous { @include codicon-button("chevron-left"); + + border-top-right-radius: unset; + border-bottom-right-radius: unset; } &__next { @include codicon-button("chevron-right"); + + border-top-left-radius: unset; + border-bottom-left-radius: unset; } &__status { From 9ac25c78dbde0ffa64d9ba0d91efc16b1ec27570 Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Sun, 8 Jun 2025 17:56:05 +0300 Subject: [PATCH 2/3] Add `--reactodia-border-radius-s` theme CSS property for lesser-rounded components --- styles/diagram/_linkLayer.scss | 2 +- styles/editor/_authoringState.scss | 2 +- styles/templates/_standard.scss | 12 ++++++------ styles/theme/_common.scss | 1 + styles/theme/_theme.scss | 1 + styles/utility/_listElementView.scss | 4 ++-- styles/widgets/_classTree.scss | 2 +- styles/widgets/_connectionsMenu.scss | 2 +- styles/widgets/_halo.scss | 2 +- styles/widgets/_linkAction.scss | 2 +- styles/widgets/_navigator.scss | 2 +- styles/widgets/_selection.scss | 4 ++-- 12 files changed, 19 insertions(+), 17 deletions(-) diff --git a/styles/diagram/_linkLayer.scss b/styles/diagram/_linkLayer.scss index cb4c8830..54a578bd 100644 --- a/styles/diagram/_linkLayer.scss +++ b/styles/diagram/_linkLayer.scss @@ -57,7 +57,7 @@ .reactodia-link-label { margin-top: calc(1.5em * var(--reactodia-link-label-line, 0)); padding: 0 2px; - border-radius: 2px; + border-radius: theme.$border-radius-s; color: theme.$font-color-base; background-color: theme.$canvas-background-color; white-space: nowrap; diff --git a/styles/editor/_authoringState.scss b/styles/editor/_authoringState.scss index f294d61f..0bdf4479 100644 --- a/styles/editor/_authoringState.scss +++ b/styles/editor/_authoringState.scss @@ -100,7 +100,7 @@ gap: theme.$spacing-horizontal; bottom: 0; background: theme.$canvas-underlay-color; - border-radius: 2px; + border-radius: theme.$border-radius-s; padding: 1px; height: 22px; } diff --git a/styles/templates/_standard.scss b/styles/templates/_standard.scss index 4b19f8a2..d21acf00 100644 --- a/styles/templates/_standard.scss +++ b/styles/templates/_standard.scss @@ -11,7 +11,7 @@ $standard-new-entity-stripe: theme.$element-background-color; float: left; &--group { - border-radius: 2px; + border-radius: theme.$border-radius-s; border: 1px solid; border-color: var(--reactodia-standard-group-color); background: $standard-template-background; @@ -19,7 +19,7 @@ $standard-new-entity-stripe: theme.$element-background-color; } &__main { - border-radius: 2px; + border-radius: theme.$border-radius-s; border: 1px solid; border-color: $standard-template-color; background-color: $standard-template-color; @@ -27,7 +27,7 @@ $standard-new-entity-stripe: theme.$element-background-color; &__body { margin-left: 8px; - border-radius: 0 2px 2px 0; + border-radius: 0 theme.$border-radius-s theme.$border-radius-s 0; border-left: 1px solid; border-left-color: $standard-template-color; padding: 3px 0; @@ -53,7 +53,7 @@ $standard-new-entity-stripe: theme.$element-background-color; &__item { display: flex; - border-radius: 2px; + border-radius: theme.$border-radius-s; border: 0px; } @@ -145,7 +145,7 @@ $standard-new-entity-stripe: theme.$element-background-color; &__photo-image { width: 100%; - border-radius: 2px 2px 0 0; + border-radius: theme.$border-radius-s theme.$border-radius-s 0 0; } &__type { @@ -239,7 +239,7 @@ $standard-new-entity-stripe: theme.$element-background-color; &__dropdown { border: 1px solid; border-color: $standard-template-color; - border-radius: 2px; + border-radius: theme.$border-radius-s; background-color: $standard-template-background; margin-top: 5px; } diff --git a/styles/theme/_common.scss b/styles/theme/_common.scss index c9e83e38..68c31e9b 100644 --- a/styles/theme/_common.scss +++ b/styles/theme/_common.scss @@ -76,6 +76,7 @@ --reactodia-spacing-horizontal: var(--reactodia-spacing-base); --reactodia-border-radius-base: 4px; + --reactodia-border-radius-s: 2px; --reactodia-border-width-base: 1px; --reactodia-transition-duration: 0.3s; diff --git a/styles/theme/_theme.scss b/styles/theme/_theme.scss index 770717a1..2b8def59 100644 --- a/styles/theme/_theme.scss +++ b/styles/theme/_theme.scss @@ -109,6 +109,7 @@ $spacing-horizontal: var(--reactodia-spacing-horizontal); /* Borders */ $border-width-base: var(--reactodia-border-width-base); $border-radius-base: var(--reactodia-border-radius-base); +$border-radius-s: var(--reactodia-border-radius-s); $border-color-base: var(--reactodia-border-color-base); /* Transitions */ diff --git a/styles/utility/_listElementView.scss b/styles/utility/_listElementView.scss index 1a2d483b..ae45b5a9 100644 --- a/styles/utility/_listElementView.scss +++ b/styles/utility/_listElementView.scss @@ -5,7 +5,7 @@ display: block; background: var(--reactodia-element-style-color); padding: 1px 1px 1px 10px; - border-radius: 2px; + border-radius: theme.$border-radius-s; margin: 0 0 2px 0; opacity: 1.0; cursor: move; @@ -20,7 +20,7 @@ &__label { background: theme.$element-background-color; - border-radius: 0 2px 2px 0; + border-radius: 0 theme.$border-radius-s theme.$border-radius-s 0; font-family: theme.$font-family-base; font-size: 15px; min-height: 1.3em; diff --git a/styles/widgets/_classTree.scss b/styles/widgets/_classTree.scss index 0ede65b9..7d572835 100644 --- a/styles/widgets/_classTree.scss +++ b/styles/widgets/_classTree.scss @@ -62,7 +62,7 @@ padding: 1px; border: 1px solid; border-color: transparent; - border-radius: 2px; + border-radius: theme.$border-radius-s; &:hover { background: theme.$tree-background-color-focus; border-color: theme.$tree-border-color-focus; diff --git a/styles/widgets/_connectionsMenu.scss b/styles/widgets/_connectionsMenu.scss index 29ec890d..96653dcb 100644 --- a/styles/widgets/_connectionsMenu.scss +++ b/styles/widgets/_connectionsMenu.scss @@ -119,7 +119,7 @@ $no-results-color: theme.$color-emphasis-400; align-items: center; margin-bottom: 4px; background: theme.$color-emphasis-200; - border-radius: 2px; + border-radius: theme.$border-radius-s; &:hover { background-color: theme.$color-emphasis-400; diff --git a/styles/widgets/_halo.scss b/styles/widgets/_halo.scss index 6aaaf1c8..cb11eb4c 100644 --- a/styles/widgets/_halo.scss +++ b/styles/widgets/_halo.scss @@ -5,6 +5,6 @@ pointer-events: none; border: 1.5px dashed #d8956d; - border-radius: 2px; + border-radius: theme.$border-radius-s; box-shadow: theme.$selection-single-box-shadow; } diff --git a/styles/widgets/_linkAction.scss b/styles/widgets/_linkAction.scss index 71d51a21..ef06234f 100644 --- a/styles/widgets/_linkAction.scss +++ b/styles/widgets/_linkAction.scss @@ -58,7 +58,7 @@ margin-left: 5px; padding: 0; border: 0 none; - border-radius: 2px; + border-radius: theme.$border-radius-s; outline: none; cursor: pointer; diff --git a/styles/widgets/_navigator.scss b/styles/widgets/_navigator.scss index 50f4c7bc..dbb3c573 100644 --- a/styles/widgets/_navigator.scss +++ b/styles/widgets/_navigator.scss @@ -7,7 +7,7 @@ background: theme.$navigator-background-fill; border: theme.$border-width-base solid theme.$border-color-base; - border-radius: 2px; + border-radius: theme.$border-radius-s; box-shadow: theme.$canvas-box-shadow; transition: diff --git a/styles/widgets/_selection.scss b/styles/widgets/_selection.scss index bf893d04..8b598fd9 100644 --- a/styles/widgets/_selection.scss +++ b/styles/widgets/_selection.scss @@ -10,7 +10,7 @@ position: absolute; background-color: rgba(255, 166, 0, 0.06); border: 1px solid orange; - border-radius: 2px; + border-radius: theme.$border-radius-s; box-shadow: theme.$selection-multiple-box-shadow; cursor: move; user-select: none; @@ -31,7 +31,7 @@ position: absolute; background-color: rgba(0, 219, 255, 0.13); border: 2px dashed rgb(0, 179, 209); - border-radius: 2px; + border-radius: theme.$border-radius-s; } &__highlightedItem { From 60d4bcb5b0c629c083c4cd03caa2575d6f941baa Mon Sep 17 00:00:00 2001 From: Alexey Morozov Date: Sun, 8 Jun 2025 18:04:00 +0300 Subject: [PATCH 3/3] Make remove value button in authoring forms more lightweight --- styles/editor/_propertyInput.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/styles/editor/_propertyInput.scss b/styles/editor/_propertyInput.scss index e178e95b..1db1dd4d 100644 --- a/styles/editor/_propertyInput.scss +++ b/styles/editor/_propertyInput.scss @@ -13,6 +13,9 @@ &__value-remove { @include codicon-button("trash"); + align-self: flex-start; + border: none; + height: 34px; padding: 6px 4px; }