Skip to content

fix: fix scrollbar styles for Belize theme #4958

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

Merged
merged 2 commits into from
Aug 10, 2023
Merged

fix: fix scrollbar styles for Belize theme #4958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5900331
fix: fix scrollbar styles for Belize theme
Lukas742 Aug 9, 2023
53155cf
Update CustomVariables.ts
Lukas742 Aug 9, 2023
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
7 changes: 5 additions & 2 deletions packages/main/src/components/ThemeProvider/GlobalStyleClasses.jss.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { CompactSizes, CozySizes, ThemingParameters } from '@ui5/webcomponents-react-base';
import { GlobalStyleClasses } from '../../enums/index.js';
import { baseParameters } from '../../themes/base.js';
import { CustomThemingParameters } from '../../themes/CustomVariables.js';
import { sapBelizeParameters } from '../../themes/sap_belize.js';
import { sapBelizeHcbParameters } from '../../themes/sap_belize_hcb.js';
import { sapBelizeHcwParameters } from '../../themes/sap_belize_hcw.js';
Expand All @@ -18,6 +19,7 @@ export const GlobalStyleClassesStyles = {
[`.${GlobalStyleClasses.inheritingSapScrollBar} *:not([data-native-scrollbar])`]: {
'&::-webkit-scrollbar': {
backgroundColor: ThemingParameters.sapScrollBar_TrackColor,
borderInlineStart: CustomThemingParameters.ScrollbarBorder,
'&:horizontal': {
height: ThemingParameters.sapScrollBar_Dimension
},
Expand All @@ -27,7 +29,7 @@ export const GlobalStyleClassesStyles = {
},
'&::-webkit-scrollbar-thumb': {
backgroundColor: ThemingParameters.sapScrollBar_FaceColor,
borderRadius: '0.25rem',
borderRadius: CustomThemingParameters.ScrollbarBorderRadius,
'&:hover': {
backgroundColor: ThemingParameters.sapScrollBar_Hover_FaceColor
},
Expand All @@ -45,6 +47,7 @@ export const GlobalStyleClassesStyles = {
[`.${GlobalStyleClasses.sapScrollBar}:not([data-native-scrollbar])`]: {
'&::-webkit-scrollbar': {
backgroundColor: ThemingParameters.sapScrollBar_TrackColor,
borderInlineStart: CustomThemingParameters.ScrollbarBorder,
'&:horizontal': {
height: ThemingParameters.sapScrollBar_Dimension
},
Expand All @@ -54,7 +57,7 @@ export const GlobalStyleClassesStyles = {
},
'&::-webkit-scrollbar-thumb': {
backgroundColor: ThemingParameters.sapScrollBar_FaceColor,
borderRadius: '0.25rem',
borderRadius: CustomThemingParameters.ScrollbarBorderRadius,
'&:hover': {
backgroundColor: ThemingParameters.sapScrollBar_Hover_FaceColor
},
Expand Down
4 changes: 3 additions & 1 deletion packages/main/src/themes/CustomVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ export enum CustomVariables {
SplitterContentBorderColor = '--_ui5wcr_Splitter_ContentBorderColor',
SplitterIconColor = '--_ui5wcr_Splitter_IconColor',
ToolbarFocusOutline = '--_ui5wcr_Toolbar_FocusOutline',
ToolbarFocusShadow = '--_ui5wcr_Toolbar_FocusShadow'
ToolbarFocusShadow = '--_ui5wcr_Toolbar_FocusShadow',
ScrollbarBorder = '--_ui5wcr_Scrollbar_Border',
ScrollbarBorderRadius = '--_ui5wcr_Scrollbar_BorderRadius'
}

export const CustomThemingParameters = new Proxy(CustomVariables, {
Expand Down
4 changes: 3 additions & 1 deletion packages/main/src/themes/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,7 @@ export const baseParameters: Partial<Record<CustomVariables, string>> = {
[CustomVariables.SplitterContentBorderColor]: ThemingParameters.sapHighlightColor,
[CustomVariables.SplitterIconColor]: ThemingParameters.sapButton_Lite_TextColor,
[CustomVariables.ToolbarFocusOutline]: `${ThemingParameters.sapContent_FocusWidth} ${ThemingParameters.sapContent_FocusStyle} ${ThemingParameters.sapContent_FocusColor}`,
[CustomVariables.ToolbarFocusShadow]: 'none'
[CustomVariables.ToolbarFocusShadow]: 'none',
[CustomVariables.ScrollbarBorder]: 'none',
[CustomVariables.ScrollbarBorderRadius]: ThemingParameters.sapElement_BorderCornerRadius
};
5 changes: 3 additions & 2 deletions packages/main/src/themes/sap_belize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { ThemingParameters } from '@ui5/webcomponents-react-base';
import { CustomVariables } from './CustomVariables.js';

export const sapBelizeParameters: Partial<Record<CustomVariables, string>> = {
export const sapBelizeParameters: Partial<Record<CustomVariables, string | number>> = {
[CustomVariables.ActionSheetTopBorderRadius]: ThemingParameters.sapElement_BorderCornerRadius,
[CustomVariables.ActionSheetBoxShadow]: ThemingParameters.sapContent_HeaderShadow,
[CustomVariables.SplitterBarBorderFocus]: `.0625rem dotted ${ThemingParameters.sapContent_FocusColor}`,
[CustomVariables.SplitterBarBorderFix]: `.0625rem dotted ${ThemingParameters.sapContent_FocusColor}`
[CustomVariables.SplitterBarBorderFix]: `.0625rem dotted ${ThemingParameters.sapContent_FocusColor}`,
[CustomVariables.ScrollbarBorderRadius]: 0
};
6 changes: 4 additions & 2 deletions packages/main/src/themes/sap_belize_hcb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { ThemingParameters } from '@ui5/webcomponents-react-base';
import { CustomVariables } from './CustomVariables.js';

export const sapBelizeHcbParameters: Partial<Record<CustomVariables, string>> = {
export const sapBelizeHcbParameters: Partial<Record<CustomVariables, string | number>> = {
[CustomVariables.ActionSheetTopBorderRadius]: ThemingParameters.sapElement_BorderCornerRadius,
[CustomVariables.ActionSheetBoxShadow]: ThemingParameters.sapContent_HeaderShadow
[CustomVariables.ActionSheetBoxShadow]: ThemingParameters.sapContent_HeaderShadow,
[CustomVariables.ScrollbarBorder]: '0.0625rem solid #999',
[CustomVariables.ScrollbarBorderRadius]: 0
};
6 changes: 4 additions & 2 deletions packages/main/src/themes/sap_belize_hcw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { ThemingParameters } from '@ui5/webcomponents-react-base';
import { CustomVariables } from './CustomVariables.js';

export const sapBelizeHcwParameters: Partial<Record<CustomVariables, string>> = {
export const sapBelizeHcwParameters: Partial<Record<CustomVariables, string | number>> = {
[CustomVariables.ActionSheetTopBorderRadius]: ThemingParameters.sapElement_BorderCornerRadius,
[CustomVariables.ActionSheetBoxShadow]: ThemingParameters.sapContent_HeaderShadow
[CustomVariables.ActionSheetBoxShadow]: ThemingParameters.sapContent_HeaderShadow,
[CustomVariables.ScrollbarBorder]: '0.0625rem solid #585858',
[CustomVariables.ScrollbarBorderRadius]: 0
};