ソースを参照

fix(context-menu) Minor style fixes (#12874)

factor2
Robert Pintilii 2年前
コミット
ae7e441e21
コミッターのメールアドレスに関連付けられたアカウントが存在しません

+ 3
- 3
css/_popup_menu.scss ファイルの表示

5
 .popupmenu__contents {
5
 .popupmenu__contents {
6
     .popupmenu__volume-slider {
6
     .popupmenu__volume-slider {
7
             &::-webkit-slider-runnable-track {
7
             &::-webkit-slider-runnable-track {
8
-                background-color: $popupSliderColor;
8
+                background-color: #246FE5;
9
             }
9
             }
10
 
10
 
11
             &::-moz-range-track {
11
             &::-moz-range-track {
12
-                background-color: $popupSliderColor;
12
+                background-color: #246FE5;
13
             }
13
             }
14
 
14
 
15
             &::-ms-fill-lower {
15
             &::-ms-fill-lower {
16
-                background-color: $popupSliderColor;
16
+                background-color: #246FE5;
17
             }
17
             }
18
         }
18
         }
19
 }
19
 }

+ 0
- 1
css/themes/_light.scss ファイルの表示

65
 
65
 
66
 // Popover colors
66
 // Popover colors
67
 $popoverFontColor: #ffffff !important;
67
 $popoverFontColor: #ffffff !important;
68
-$popupSliderColor: #0376da;
69
 
68
 
70
 // Toolbar
69
 // Toolbar
71
 $toolbarBackground: rgba(0, 0, 0, 0.5);
70
 $toolbarBackground: rgba(0, 0, 0, 0.5);

+ 1
- 1
react/features/base/ui/components/web/ContextMenu.tsx ファイルの表示

108
             backgroundColor: theme.palette.ui01,
108
             backgroundColor: theme.palette.ui01,
109
             border: `1px solid ${theme.palette.ui04}`,
109
             border: `1px solid ${theme.palette.ui04}`,
110
             borderRadius: `${Number(theme.shape.borderRadius)}px`,
110
             borderRadius: `${Number(theme.shape.borderRadius)}px`,
111
-            boxShadow: '0px 4px 25px 4px rgba(20, 20, 20, 0.6)',
111
+            boxShadow: '0px 1px 2px rgba(41, 41, 41, 0.25)',
112
             color: theme.palette.text01,
112
             color: theme.palette.text01,
113
             ...withPixelLineHeight(theme.typography.bodyShortRegular),
113
             ...withPixelLineHeight(theme.typography.bodyShortRegular),
114
             marginTop: `${(participantsPaneTheme.panePadding * 2) + theme.typography.bodyShortRegular.fontSize}px`,
114
             marginTop: `${(participantsPaneTheme.panePadding * 2) + theme.typography.bodyShortRegular.fontSize}px`,

+ 5
- 1
react/features/base/ui/components/web/ContextMenuItem.tsx ファイルの表示

90
 
90
 
91
             '&:active': {
91
             '&:active': {
92
                 backgroundColor: theme.palette.ui03
92
                 backgroundColor: theme.palette.ui03
93
+            },
94
+
95
+            '&:focus': {
96
+                boxShadow: `inset 0 0 0 2px ${theme.palette.action01Hover}`
93
             }
97
             }
94
         },
98
         },
95
 
99
 
154
                     className = { styles.contextMenuItemIcon }
158
                     className = { styles.contextMenuItemIcon }
155
                     size = { 20 }
159
                     size = { 20 }
156
                     src = { icon } />}
160
                     src = { icon } />}
157
-            <span className = { cx(textClassName) }>{text}</span>
161
+            <span className = { cx(styles.text, textClassName) }>{text}</span>
158
         </div>
162
         </div>
159
     );
163
     );
160
 };
164
 };

+ 1
- 1
react/features/base/ui/components/web/ContextMenuItemGroup.tsx ファイルの表示

25
             },
25
             },
26
 
26
 
27
             '& + &:not(:empty)': {
27
             '& + &:not(:empty)': {
28
-                borderTop: `1px solid ${theme.palette.ui04}`
28
+                borderTop: `1px solid ${theme.palette.ui03}`
29
             },
29
             },
30
 
30
 
31
             '&:first-of-type': {
31
             '&:first-of-type': {

+ 2
- 0
react/features/participants-pane/components/web/FooterContextMenu.tsx ファイルの表示

25
     getParticipantCount,
25
     getParticipantCount,
26
     isEveryoneModerator
26
     isEveryoneModerator
27
 } from '../../../base/participants/functions';
27
 } from '../../../base/participants/functions';
28
+import { withPixelLineHeight } from '../../../base/styles/functions.web';
28
 import ContextMenu from '../../../base/ui/components/web/ContextMenu';
29
 import ContextMenu from '../../../base/ui/components/web/ContextMenu';
29
 import ContextMenuItemGroup from '../../../base/ui/components/web/ContextMenuItemGroup';
30
 import ContextMenuItemGroup from '../../../base/ui/components/web/ContextMenuItemGroup';
30
 import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
31
 import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
45
         },
46
         },
46
 
47
 
47
         text: {
48
         text: {
49
+            ...withPixelLineHeight(theme.typography.bodyShortRegular),
48
             color: theme.palette.text02,
50
             color: theme.palette.text02,
49
             padding: '10px 16px',
51
             padding: '10px 16px',
50
             height: '40px',
52
             height: '40px',

+ 2
- 1
react/features/toolbox/components/web/Toolbox.tsx ファイルの表示

358
             right: 'auto',
358
             right: 'auto',
359
             margin: 0,
359
             margin: 0,
360
             marginBottom: '8px',
360
             marginBottom: '8px',
361
-            maxHeight: 'calc(100vh - 100px)'
361
+            maxHeight: 'calc(100vh - 100px)',
362
+            width: '240px'
362
         },
363
         },
363
 
364
 
364
         hangupMenu: {
365
         hangupMenu: {

+ 4
- 5
react/features/video-menu/components/web/VolumeSlider.tsx ファイルの表示

54
             cursor: 'pointer',
54
             cursor: 'pointer',
55
             display: 'flex',
55
             display: 'flex',
56
             alignItems: 'center',
56
             alignItems: 'center',
57
-            padding: '0 5px',
57
+            padding: '10px 16px',
58
 
58
 
59
             '&:hover': {
59
             '&:hover': {
60
-                backgroundColor: theme.palette.ui04
60
+                backgroundColor: theme.palette.ui02
61
             }
61
             }
62
         },
62
         },
63
 
63
 
64
         icon: {
64
         icon: {
65
             minWidth: '20px',
65
             minWidth: '20px',
66
-            padding: '5px',
66
+            marginRight: '16px',
67
             position: 'relative' as const
67
             position: 'relative' as const
68
         },
68
         },
69
 
69
 
70
         sliderContainer: {
70
         sliderContainer: {
71
             position: 'relative' as const,
71
             position: 'relative' as const,
72
-            width: '100%',
73
-            paddingRight: '5px'
72
+            width: '100%'
74
         },
73
         },
75
 
74
 
76
         slider: {
75
         slider: {

読み込み中…
キャンセル
保存