haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: apply color brand guidelines

This commit is contained in:
Bettenbuk Zoltan 2019-07-12 15:03:14 +02:00 committed by Zoltan Bettenbuk
parent d305caf910
commit 1993ad10eb
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
react/features/base/color-scheme/defaultScheme.js
View File

@ -1,6 +1,6 @@
// @flow // @flow
import { ColorPalette } from '../styles'; import { ColorPalette, getRGBAFormat } from '../styles';
/** /**
* The default color scheme of the application. * The default color scheme of the application.
@ -40,8 +40,8 @@ export default {
}, },
'Toolbox': { 'Toolbox': {
button: 'rgb(255, 255, 255)', button: 'rgb(255, 255, 255)',
buttonToggled: 'rgba(255, 255, 255, 0)', buttonToggled: 'rgb(38, 58, 76)',
buttonToggledBorder: '#a4b8d1', buttonToggledBorder: getRGBAFormat('#a4b8d1', 0.6),
hangup: 'rgb(225, 45, 45)' hangup: 'rgb(225, 45, 45)'
} }
}; };

2
react/features/conference/components/native/Conference.js
View File

@ -256,7 +256,7 @@ class Conference extends AbstractConference<Props, *> {
pointerEvents = 'none' pointerEvents = 'none'
start = {{ start = {{
x: 0.0, x: 0.0,
y: applyGradientStretching ? 0.5 : 1.0 y: 1.0
}} }}
style = { [ style = { [
styles.bottomGradient, styles.bottomGradient,

2
react/features/conference/components/native/NavigationBar.js
View File

@ -46,7 +46,7 @@ class NavigationBar extends Component<Props> {
pointerEvents = 'none' pointerEvents = 'none'
style = { styles.gradient }> style = { styles.gradient }>
<SafeAreaView> <SafeAreaView>
<View style = { styles.gradientStretch } /> <View style = { styles.gradientStretchTop } />
</SafeAreaView> </SafeAreaView>
</LinearGradient>, </LinearGradient>,
<View <View

13
react/features/conference/components/native/styles.js
View File

@ -2,10 +2,11 @@ import { BoxModel, ColorPalette, fixAndroidViewClipping } from '../../../base/st
import { FILMSTRIP_SIZE } from '../../../filmstrip'; import { FILMSTRIP_SIZE } from '../../../filmstrip';
export const NAVBAR_GRADIENT_COLORS = [ '#0000007F', '#00000000' ]; export const NAVBAR_GRADIENT_COLORS = [ '#000000FF', '#00000000' ];
// From brand guideline // From brand guideline
const GRADIENT_HEIGHT = 116; const BOTTOM_GRADIENT_HEIGHT = 290;
const DEFAULT_GRADIENT_SIZE = 140;
/** /**
* The styles of the feature conference. * The styles of the feature conference.
@ -16,7 +17,7 @@ export default {
bottom: 0, bottom: 0,
flexDirection: 'column', flexDirection: 'column',
justifyContent: 'flex-end', justifyContent: 'flex-end',
minHeight: GRADIENT_HEIGHT, minHeight: DEFAULT_GRADIENT_SIZE,
left: 0, left: 0,
position: 'absolute', position: 'absolute',
right: 0 right: 0
@ -40,11 +41,11 @@ export default {
}, },
gradientStretchBottom: { gradientStretchBottom: {
height: GRADIENT_HEIGHT + FILMSTRIP_SIZE height: BOTTOM_GRADIENT_HEIGHT
}, },
gradientStretch: { gradientStretchTop: {
height: GRADIENT_HEIGHT height: DEFAULT_GRADIENT_SIZE
}, },
/** /**