Skip to content

Commit fdf5ed2

Browse files
committed
chore: address PR feedback
1 parent d9e66ee commit fdf5ed2

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

ts/components/basic/SessionToggle.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ const StyledKnob = styled.div<{ active: boolean }>`
2626
const StyledSessionToggle = styled.div<{ active: boolean; disabled: boolean }>`
2727
width: 51px;
2828
height: 25px;
29-
background-color: (--toggle-switch-off-background-color);
3029
border: 1px solid var(--toggle-switch-off-border-color);
3130
border-radius: 16px;
3231
position: relative;

ts/components/buttons/panel/PanelButton.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ const StyledRoundedPanelButtonGroup = styled.div`
7272
`;
7373

7474
const PanelButtonContainer = styled.div`
75-
--panel-button-container-min-height: 50px;
7675
overflow: auto;
7776
min-height: var(--panel-button-container-min-height);
7877
max-height: 100%;
@@ -116,11 +115,15 @@ export const StyledPanelButton = styled.button<{
116115
padding-block: var(--margins-sm);
117116
118117
&:hover {
119-
background-color: ${props =>
120-
!props.disabled &&
121-
(props.isDarkTheme
122-
? 'var(--background-primary-color)'
123-
: 'var(--background-secondary-color)')};
118+
background-color: ${props => {
119+
if (props.disabled) {
120+
return 'transparent'; // let the PanelButtonGroup background be visible
121+
}
122+
if (props.isDarkTheme) {
123+
return 'color-mix(in srgb, var(--background-tertiary-color) 95%, white)';
124+
}
125+
return 'color-mix(in srgb, var(--background-tertiary-color) 95%, black)';
126+
}};
124127
}
125128
`;
126129

ts/components/dialog/user-settings/pages/HelpSettingsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export function HelpSettingsPage(modalState: UserSettingsModalState) {
8585
text={{ token: 'helpSupport' }}
8686
subText={{ token: 'supportDescription' }}
8787
onClick={async () => {
88-
showLinkVisitWarningDialog('https://sessionapp.zendesk.com/hc/en-us', dispatch);
88+
showLinkVisitWarningDialog('https://getsession.org/support', dispatch);
8989
}}
9090
/>
9191
</PanelButtonGroup>

ts/themes/globals.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ type ThemeGlobals = {
8080
'--main-view-header-height': string;
8181
'--composition-container-height': string;
8282
'--search-input-height': string;
83+
// The min height of the panel button container.
84+
// Used to make sure all the types of panel items have the same height, even if only text is displayed
85+
'--panel-button-container-min-height': string;
8386

8487
/* Durations */
8588
'--default-duration': string;
@@ -227,6 +230,7 @@ export const THEME_GLOBALS: ThemeGlobals = {
227230
'--main-view-header-height': '68px',
228231
'--composition-container-height': '60px',
229232
'--search-input-height': '34px',
233+
'--panel-button-container-min-height': '50px',
230234

231235
'--default-duration': setDuration('0.25s'),
232236
'--default-duration-seconds': setDuration(0.25), // framer-motion requires a number

0 commit comments

Comments
 (0)