Sfoglia il codice sorgente

feat: apply color brand guidelines

master
Bettenbuk Zoltan 5 anni fa
parent
commit
1993ad10eb

+ 3
- 3
react/features/base/color-scheme/defaultScheme.js Vedi File

1
 // @flow
1
 // @flow
2
 
2
 
3
-import { ColorPalette } from '../styles';
3
+import { ColorPalette, getRGBAFormat } from '../styles';
4
 
4
 
5
 /**
5
 /**
6
  * The default color scheme of the application.
6
  * The default color scheme of the application.
40
     },
40
     },
41
     'Toolbox': {
41
     'Toolbox': {
42
         button: 'rgb(255, 255, 255)',
42
         button: 'rgb(255, 255, 255)',
43
-        buttonToggled: 'rgba(255, 255, 255, 0)',
44
-        buttonToggledBorder: '#a4b8d1',
43
+        buttonToggled: 'rgb(38, 58, 76)',
44
+        buttonToggledBorder: getRGBAFormat('#a4b8d1', 0.6),
45
         hangup: 'rgb(225, 45, 45)'
45
         hangup: 'rgb(225, 45, 45)'
46
     }
46
     }
47
 };
47
 };

+ 1
- 1
react/features/conference/components/native/Conference.js Vedi File

256
                         pointerEvents = 'none'
256
                         pointerEvents = 'none'
257
                         start = {{
257
                         start = {{
258
                             x: 0.0,
258
                             x: 0.0,
259
-                            y: applyGradientStretching ? 0.5 : 1.0
259
+                            y: 1.0
260
                         }}
260
                         }}
261
                         style = { [
261
                         style = { [
262
                             styles.bottomGradient,
262
                             styles.bottomGradient,

+ 1
- 1
react/features/conference/components/native/NavigationBar.js Vedi File

46
                 pointerEvents = 'none'
46
                 pointerEvents = 'none'
47
                 style = { styles.gradient }>
47
                 style = { styles.gradient }>
48
                 <SafeAreaView>
48
                 <SafeAreaView>
49
-                    <View style = { styles.gradientStretch } />
49
+                    <View style = { styles.gradientStretchTop } />
50
                 </SafeAreaView>
50
                 </SafeAreaView>
51
             </LinearGradient>,
51
             </LinearGradient>,
52
             <View
52
             <View

+ 7
- 6
react/features/conference/components/native/styles.js Vedi File

2
 
2
 
3
 import { FILMSTRIP_SIZE } from '../../../filmstrip';
3
 import { FILMSTRIP_SIZE } from '../../../filmstrip';
4
 
4
 
5
-export const NAVBAR_GRADIENT_COLORS = [ '#0000007F', '#00000000' ];
5
+export const NAVBAR_GRADIENT_COLORS = [ '#000000FF', '#00000000' ];
6
 
6
 
7
 // From brand guideline
7
 // From brand guideline
8
-const GRADIENT_HEIGHT = 116;
8
+const BOTTOM_GRADIENT_HEIGHT = 290;
9
+const DEFAULT_GRADIENT_SIZE = 140;
9
 
10
 
10
 /**
11
 /**
11
  * The styles of the feature conference.
12
  * The styles of the feature conference.
16
         bottom: 0,
17
         bottom: 0,
17
         flexDirection: 'column',
18
         flexDirection: 'column',
18
         justifyContent: 'flex-end',
19
         justifyContent: 'flex-end',
19
-        minHeight: GRADIENT_HEIGHT,
20
+        minHeight: DEFAULT_GRADIENT_SIZE,
20
         left: 0,
21
         left: 0,
21
         position: 'absolute',
22
         position: 'absolute',
22
         right: 0
23
         right: 0
40
     },
41
     },
41
 
42
 
42
     gradientStretchBottom: {
43
     gradientStretchBottom: {
43
-        height: GRADIENT_HEIGHT + FILMSTRIP_SIZE
44
+        height: BOTTOM_GRADIENT_HEIGHT
44
     },
45
     },
45
 
46
 
46
-    gradientStretch: {
47
-        height: GRADIENT_HEIGHT
47
+    gradientStretchTop: {
48
+        height: DEFAULT_GRADIENT_SIZE
48
     },
49
     },
49
 
50
 
50
     /**
51
     /**

Loading…
Annulla
Salva