Bläddra i källkod

fix(toolbar) Fix styles (#12863)

factor2
Robert Pintilii 2 år sedan
förälder
incheckning
a594aac078
Inget konto är kopplat till bidragsgivarens mejladress

+ 6
- 6
css/_settings-button.scss Visa fil

@@ -30,24 +30,24 @@
30 30
     right: -4px;
31 31
     top: -3px;
32 32
 
33
-   &:hover {
33
+    &:hover {
34 34
         background: #F2F3F4;
35 35
         box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.1);
36 36
 
37
-        &> svg {
38
-            fill: #000;
37
+        & > svg {
38
+            fill: #040404;
39 39
         }
40 40
 
41 41
         &.settings-button-small-icon--disabled {
42 42
             background: #36383C;
43 43
 
44 44
             &> svg {
45
-               fill: #929292;
46
-           }
45
+                fill: #929292;
46
+            }
47 47
         }
48 48
     }
49 49
 
50
-    &> svg {
50
+    & > svg {
51 51
         fill: #fff;
52 52
     }
53 53
 

+ 14
- 6
css/_toolbars.scss Visa fil

@@ -120,12 +120,16 @@
120 120
     margin: 8px 0;
121 121
 }
122 122
 
123
-.hangup-button {
124
-    background-color: $hangupColor;
123
+div.hangup-button {
124
+    background-color: #CB2233;
125 125
 
126 126
     @media (hover: hover) and (pointer: fine) {
127 127
         &:hover {
128
-            background-color: $hangupHoverColor;
128
+            background-color: #E04757;
129
+        }
130
+
131
+        &:active {
132
+            background-color: #A21B29;
129 133
         }
130 134
     }
131 135
 
@@ -134,12 +138,16 @@
134 138
     }
135 139
 }
136 140
 
137
-.hangup-menu-button {
138
-    background-color: $hangupColor;
141
+div.hangup-menu-button {
142
+    background-color: #CB2233;
139 143
 
140 144
     @media (hover: hover) and (pointer: fine) {
141 145
         &:hover {
142
-            background-color: $hangupHoverColor;
146
+            background-color: #E04757;
147
+        }
148
+
149
+        &:active {
150
+            background-color: #A21B29;
143 151
         }
144 152
     }
145 153
 

+ 0
- 2
css/_variables.scss Visa fil

@@ -4,8 +4,6 @@
4 4
  * Style variables
5 5
  */
6 6
 $baseFontFamily: -apple-system, BlinkMacSystemFont, 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
7
-$hangupColor:#DD3849;
8
-$hangupHoverColor: #F25363;
9 7
 
10 8
 /**
11 9
  * Size variables.

+ 15
- 3
react/features/base/ui/constants.web.ts Visa fil

@@ -228,7 +228,11 @@ export const commonStyles = (theme: Theme) => {
228 228
 
229 229
             '@media (hover: hover) and (pointer: fine)': {
230 230
                 '&:hover': {
231
-                    background: theme.palette.ui04
231
+                    backgroundColor: theme.palette.ui04
232
+                },
233
+
234
+                '&:active': {
235
+                    backgroundColor: theme.palette.ui03
232 236
                 }
233 237
             },
234 238
             [theme.breakpoints.down(320)]: {
@@ -237,7 +241,7 @@ export const commonStyles = (theme: Theme) => {
237 241
             },
238 242
 
239 243
             '&.toggled': {
240
-                background: theme.palette.ui03
244
+                backgroundColor: theme.palette.ui03
241 245
             },
242 246
 
243 247
             '&.disabled': {
@@ -265,7 +269,15 @@ export const commonStyles = (theme: Theme) => {
265 269
             padding: 6,
266 270
             textAlign: 'center' as const,
267 271
             pointerEvents: 'all' as const,
268
-            boxShadow: '0px 2px 8px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.15)'
272
+            boxShadow: '0px 2px 8px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.15)',
273
+
274
+            '& > div': {
275
+                marginRight: theme.spacing(2),
276
+
277
+                '&:last-of-type': {
278
+                    marginRight: 0
279
+                }
280
+            }
269 281
         }
270 282
     };
271 283
 };

+ 2
- 2
react/features/participants-pane/components/web/ParticipantsCounter.tsx Visa fil

@@ -16,8 +16,8 @@ const useStyles = makeStyles()(theme => {
16 16
             ...withPixelLineHeight(theme.typography.labelBold),
17 17
             pointerEvents: 'none',
18 18
             position: 'absolute',
19
-            right: '-3px',
20
-            top: '-2px'
19
+            right: '-4px',
20
+            top: '-3px'
21 21
         }
22 22
     };
23 23
 });

Laddar…
Avbryt
Spara