Skip to content

feat(UI): consolidate button design (#3063) #3109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PiTrem wants to merge 3 commits into from
Closed

feat(UI): consolidate button design (#3063) #3109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0352c74
feat(UI): consolidate button design (#3063)
JoachimTillessen Apr 7, 2026
92376d1
fix: scope dropdown line-height:0 to toggle button only (#3106)
PiTrem Apr 9, 2026
6d65445
fix: use onSaveClose prop in ElementDetailCard to close panel after save
PiTrem Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
@import "components/CreateElementButton";
@import "components/DragHandle";
@import "components/ElementAllCheckbox";
@import "components/ElementDetails";
@import "components/ElementDragLayer";
@import "components/ElementsTable";
@import "components/ElementGroupsRenderer_ElementListRenderer";
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/components/CollectionTree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
@extend .pe-2;
@extend .gap-2;
&:hover {
@extend .surface-hover-on-grey;
@extend .surface-hover;
}

&--selected {
@extend .surface-active-on-grey;
@extend .surface-active;
&:hover {
@extend .surface-hover-on-grey;
@extend .surface-hover;
}
}

Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/components/CreateElementButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.create-element-button {
@extend .position-fixed;
bottom: 1.5rem;
right: 1.5rem;
z-index: 100;
width: fit-content;
padding: 8px 14px 8px 8px !important;
@extend .rounded-pill;
&__label {
@extend .text-uppercase;
}
}
10 changes: 10 additions & 0 deletions app/assets/stylesheets/components/ElementDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.elements-details {
&__tabs {
// Compensate position of the create button
margin-top: -1.25rem;
margin-right: 8rem;
}
.tab-content {
min-width: 520px;
}
}
4 changes: 4 additions & 0 deletions app/assets/stylesheets/components/PanelCollapseButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
cursor: pointer !important;
}
font-size: 1rem;
i {
width: auto !important;
min-width: 0 !important;
}
}
.panel-collapse-button--indented,
.sidebar .panel-collapse-button {
Expand Down
7 changes: 3 additions & 4 deletions app/assets/stylesheets/components/ReactionSchemeGraphic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
}

&__toolbar {
position: absolute;
top: 0;
right: 0;
display: flex;
@extend .position-absolute;
@extend .top-0;
@extend .end-0;
z-index: 11;
}

Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/components/SearchModal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@
.btn:first-child:active,
.btn.active,
.btn.show {
background-color: $chemstrap-silicon-active1 !important;
background-color: $chemstrap-silicon-active !important;
color: $primary !important;
&:hover {
@extend .text-body;;
@extend .text-body;
}
}

.btn-check + .btn:hover,
:not(.btn-check) + btn:hover {
color: $primary !important;
@extend .surface-hover-on-white;
@extend .surface-hover;
}

i {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/SelectionActions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
display: none;
}

@container selection-actions (width > 39rem) {
@container selection-actions (width > 43rem) {
.selection-action-text-label {
display: inline;
}
Expand Down
14 changes: 7 additions & 7 deletions app/assets/stylesheets/components/Sidebar_Topbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,27 @@ $topbar-height: 35px;
map-get($silicon-shades, lighten4),
map-get($silicon-shades, lighten4),
$body-color,
$chemstrap-silicon-hover2,
$chemstrap-silicon-hover2,
$chemstrap-silicon-hover,
$chemstrap-silicon-hover,
$body-color,
$chemstrap-silicon-active2,
$chemstrap-silicon-active2,
$chemstrap-silicon-active,
$chemstrap-silicon-active,
$body-color
);
&.sidebar-button--expandable {
.expand-icon {
display: none;
@extend .d-none;
@extend .text-lighten1;
&:hover {
@extend .text-active;
}
}
&:hover {
.expand-icon {
display: inline-block;
@extend .d-inline-block;
}
.type-icon {
display: none;
@extend .d-none;
}
}
}
Expand Down
45 changes: 43 additions & 2 deletions app/assets/stylesheets/global-styles/bootstrap-config.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$white: $chemstrap-white;
$primary: $chemstrap-blue;
$secondary: $chemstrap-silicon;
$primary: $chemstrap-blue-dark;
$secondary: $chemstrap-blue-dark;
$success: $chemstrap-green;
$info: #5bc0de; // to be removed application wide
$warning: $chemstrap-orange;
Expand Down Expand Up @@ -30,9 +30,12 @@ $border-color: map-get($carbon-shades, lighten3);
$border-radius: 0.3rem;
$body-bg: $chemstrap-white;
$body-color: $chemstrap-carbon;
$link-color: $chemstrap-blue;

$font-family-sans-serif: "Roboto", sans-serif;
$font-size-root: clamp(12px, 0.95vw, 16px);
$font-size-base: 1rem;

$heading-color: $body-color;
$h1-font-size: $font-size-base * 2;
$h2-font-size: $font-size-base * 1.75;
Expand All @@ -56,16 +59,43 @@ $accordion-body-padding-x: 0.5rem;
$accordion-icon-transition:
transform 0.2s,
padding-top 0.2s;

$modal-content-bg: $chemstrap-white;
$modal-inner-padding: 0.75rem;
$modal-header-padding: $modal-inner-padding $modal-inner-padding;

$close-button-margin: $modal-inner-padding - 0.25rem; // -gap-1

$list-group-bg: $chemstrap-white;
$list-group-color: $body-color;

$popover-header-bg: $chemstrap-silicon-active;
$popover-bg: $chemstrap-white;
$popover-body-color: $body-color;
$popover-max-width: 50vw;
$popover-body-padding-y: 0.5rem;

$input-btn-line-height: (18 / 14) * 1em;
$input-line-height: $input-btn-line-height;
$btn-line-height: $input-btn-line-height;
$input-btn-padding-y: 0.3rem;
$input-padding-y: $input-btn-padding-y;
$input-btn-padding-x-xsm: 5px;
$input-btn-padding-y-xsm: 3px;
$input-btn-padding-x-xxsm: 4px;
$input-btn-padding-y-xxsm: 1px;
$input-height: add(
$input-line-height,
add($input-padding-y * 2, $input-height-border, false)
);
$input-height-sm: add(
$input-line-height,
add($input-padding-y-sm * 2, $input-height-border, false)
);
$input-height-lg: add(
$input-line-height,
add($input-padding-y-lg * 2, $input-height-border, false)
);
$input-bg: $chemstrap-white;
$input-border-color: $border-color;
$form-select-bg: $input-bg;
Expand All @@ -76,6 +106,17 @@ $form-label-font-weight: $font-weight-bold;

$box-shadow: 0 0.5rem 1.5rem rgba($black, 0.25);

$btn-close-width: $input-btn-line-height;
$btn-close-height: $input-btn-line-height;
$btn-close-padding-x: $input-btn-padding-y-xsm;
$btn-close-padding-y: $input-btn-padding-y-xsm;
$btn-close-focus-shadow: none;
$btn-close-opacity: 1;
$btn-close-hover-opacity: 1;
$btn-close-focus-opacity: 1;
$btn-close-disabled-opacity: 1;
$btn-close-white-filter: none;

$modal-xxxl: 90vw;

$gray-shades: (
Expand Down
Loading
Loading