File tree Expand file tree Collapse file tree 4 files changed +14
-8
lines changed
dialog/user-settings/pages Expand file tree Collapse file tree 4 files changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,6 @@ const StyledKnob = styled.div<{ active: boolean }>`
26
26
const StyledSessionToggle = styled . div < { active : boolean ; disabled : boolean } > `
27
27
width: 51px;
28
28
height: 25px;
29
- background-color: (--toggle-switch-off-background-color);
30
29
border: 1px solid var(--toggle-switch-off-border-color);
31
30
border-radius: 16px;
32
31
position: relative;
Original file line number Diff line number Diff line change @@ -72,7 +72,6 @@ const StyledRoundedPanelButtonGroup = styled.div`
72
72
` ;
73
73
74
74
const PanelButtonContainer = styled . div `
75
- --panel-button-container-min-height: 50px;
76
75
overflow: auto;
77
76
min-height: var(--panel-button-container-min-height);
78
77
max-height: 100%;
@@ -116,11 +115,15 @@ export const StyledPanelButton = styled.button<{
116
115
padding-block: var(--margins-sm);
117
116
118
117
&: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
+ } } ;
124
127
}
125
128
` ;
126
129
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ export function HelpSettingsPage(modalState: UserSettingsModalState) {
85
85
text = { { token : 'helpSupport' } }
86
86
subText = { { token : 'supportDescription' } }
87
87
onClick = { async ( ) => {
88
- showLinkVisitWarningDialog ( 'https://sessionapp.zendesk.com/hc/en-us ' , dispatch ) ;
88
+ showLinkVisitWarningDialog ( 'https://getsession.org/support ' , dispatch ) ;
89
89
} }
90
90
/>
91
91
</ PanelButtonGroup >
Original file line number Diff line number Diff line change @@ -80,6 +80,9 @@ type ThemeGlobals = {
80
80
'--main-view-header-height' : string ;
81
81
'--composition-container-height' : string ;
82
82
'--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 ;
83
86
84
87
/* Durations */
85
88
'--default-duration' : string ;
@@ -227,6 +230,7 @@ export const THEME_GLOBALS: ThemeGlobals = {
227
230
'--main-view-header-height' : '68px' ,
228
231
'--composition-container-height' : '60px' ,
229
232
'--search-input-height' : '34px' ,
233
+ '--panel-button-container-min-height' : '50px' ,
230
234
231
235
'--default-duration' : setDuration ( '0.25s' ) ,
232
236
'--default-duration-seconds' : setDuration ( 0.25 ) , // framer-motion requires a number
You can’t perform that action at this time.
0 commit comments