Added Jitsi Logo to navbar
This commit is contained in:
akshitkrnagpal
Saúl Ibarra Corretgé
parent
1d229dd9ec
commit
c98037f9be
|
|
@ -0,0 +1,27 @@
|
||||||
|
// @flow
|
||||||
|
|
||||||
|
import Icon from '@atlaskit/icon';
|
||||||
|
|
||||||
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
|
import LogoSVG from '../../../images/logo.svg';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Logo component.
|
||||||
|
*/
|
||||||
|
export default class Logo extends Component<*> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render function of component.
|
||||||
|
*
|
||||||
|
* @returns {ReactElement}
|
||||||
|
*/
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<Icon
|
||||||
|
glyph = { LogoSVG }
|
||||||
|
size = 'xlarge' />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -8,11 +8,21 @@ import React, { Component } from 'react';
|
||||||
import { isElectronMac } from '../../utils';
|
import { isElectronMac } from '../../utils';
|
||||||
|
|
||||||
import HelpAction from './HelpAction';
|
import HelpAction from './HelpAction';
|
||||||
|
import Logo from './Logo';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Navigation Bar component.
|
* Navigation Bar component.
|
||||||
*/
|
*/
|
||||||
class Navbar extends Component<*> {
|
class Navbar extends Component<*> {
|
||||||
|
/**
|
||||||
|
* Get the primary icon of Global Navigation.
|
||||||
|
*
|
||||||
|
* @returns {ReactElement}
|
||||||
|
*/
|
||||||
|
_getPrimaryIcon() {
|
||||||
|
return <Logo />;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the array of Secondary actions of Global Navigation.
|
* Get the array of Secondary actions of Global Navigation.
|
||||||
*
|
*
|
||||||
|
|
@ -34,6 +44,7 @@ class Navbar extends Component<*> {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<Navigation
|
<Navigation
|
||||||
|
globalPrimaryIcon = { this._getPrimaryIcon() }
|
||||||
globalSecondaryActions = { this._getSecondaryActions() }
|
globalSecondaryActions = { this._getSecondaryActions() }
|
||||||
isElectronMac = { isElectronMac() }
|
isElectronMac = { isElectronMac() }
|
||||||
isOpen = { false }
|
isOpen = { false }
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<svg width='24' height='24' viewBox='0 0 24 24' focusable='false' role='presentation'>
|
||||||
|
<g fill='#fff'>
|
||||||
|
<path d='M13.016 9.59a.12.12 0 0 0 .039.004c.289 0 .937-.422 1.058-.614l.012-.015.012-.012c.043-.039.16-.254.218-.379-.617-.187-.683-.52-.746-.816a.564.564 0 0 0-.02-.094.78.78 0 0 0-.019-.101c-.918.304-1.195.476-1.347.601-.082.066-.13.254.101.774.117.261.52.62.692.652' />
|
||||||
|
<path d='M10.531 13.328c.543 0 1.688-.324 2.442-.539l.304-.086a.64.64 0 0 0 .043-.012c-.039-.043-.113-.105-.226-.203-.504-.34-.98-.5-1.496-.5-.114 0-.23.008-.36.024-.437.05-.8.152-.976.203a.556.556 0 0 1-.145.035.126.126 0 0 1-.117-.082.131.131 0 0 1 .04-.137h.003c.3-.254.867-.726 1.934-.937.183-.035.382-.055.59-.055.476 0 .972.098 1.472.293.676.266 1.14.605 1.512.879.203.144.375.273.527.344.04.02.059.023.067.023a.27.27 0 0 0 .043-.098c.007-.015.05-.195-.254-1.218a18.24 18.24 0 0 0-.5-1.469c-.215-.523-.164-.89-.098-1.11a2.3 2.3 0 0 0-.563.317l-.011.008a5.1 5.1 0 0 0-.305.25c-.629.566-1.102.86-1.406.875h-.016c-.265-.024-.668-.41-.832-.606a.214.214 0 0 0-.125-.035c-.05 0-.11.012-.168.024-.039.007-.082.015-.125.02a3.925 3.925 0 0 0-.496.097 13.46 13.46 0 0 0-.36.082c-.445.129-.78.281-.945.426l-.011.011c-.114.078-.38.301-.461.684v.004c-.168.707.086 1.578.425 2.078.16.234.329.379.47.402.034.004.077.008.124.008m-2.308 2.477a.644.644 0 0 1-.145-.504c.082-.973-.031-1.207-.082-1.262-.012-.016-.02-.016-.023-.016h-.008c-.094.024-.735.457-.875 1.75-.07.625.05 1.426.152 1.915.082-.29.211-.606.461-.93.234-.305.488-.543.805-.754a.759.759 0 0 1-.285-.2m.437-1.534c-.004.207-.031.398-.055.59a7.008 7.008 0 0 0-.039.316c-.015.215.032.289.051.308.012.016.031.028.07.028a.288.288 0 0 0 .106-.024c.383-.16.746-.441.922-.593-.27-.122-.68-.38-1.055-.625m5.395-6.825c-.004.008-.008.016-.012.02-.074.219.027.52.223.629.05.031.101.05.148.054h.02c.148 0 .27-.109.359-.324a.943.943 0 0 0 .023-.531 1.342 1.342 0 0 0-.175-.383c-.102.07-.305.227-.442.348a.566.566 0 0 0-.144.187m-.461-.355c.457-.41.73-1.09.847-1.492-.394.379-.879.586-1.187.718A3.02 3.02 0 0 0 13 6.43c-.02.015-.047.027-.07.043-.188.109-.47.273-.512.37v.009c-.129.27-.2.675-.227.906.301-.18.606-.301.86-.403.238-.093.441-.171.543-.265m1.414-2.352c-.078.504-.2.985-.434 1.492.254-.289.403-.601.453-.949.02-.144.04-.285-.02-.543m-1.433 8.278c-.004-.004-.008-.008-.008-.012-.011.004-.03.008-.062.016l-.012.003c-.16.059-.449.157-.781.27-.402.137-.856.289-1.234.426-.485.18-.641.25-.692.273l-.031.09c-.113.348-.375 1.145-1.668 1.703.27.27.848.754 1.992.754.098 0 .203-.004.305-.012a3.522 3.522 0 0 0 2.285-1.074c.555-.574.867-1.293.875-1.98a1.823 1.823 0 0 1-.578-.145c0-.004-.242-.121-.39-.312' />
|
||||||
|
<path d='M17.29 10.754c-.048.89-.192 1.684-.43 2.355a4.692 4.692 0 0 1-.766 1.399c-.516.633-1.055.844-1.168.847-.078 0-.117-.027-.278-.14-.015-.008-.035-.024-.05-.035-.305.543-.778 1.011-1.375 1.363a4.263 4.263 0 0 1-2.114.59c-.828 0-1.566-.27-2.132-.774-.68.438-1.122.828-1.485 2.465l-.125.563-.27-.508a3.943 3.943 0 0 1-.304-.813 7.953 7.953 0 0 1-.25-2.191c.012-.914.285-1.508.52-1.84.269-.394.62-.637.917-.637h.055c.473.055.77.254 1.317.614l.171.113c.188.121.41.246.48.273.048-.027.161-.21.196-.484l.008-.039v-.012c-.004-.004-.004-.004-.008-.004-.367-.125-.87-.703-1.129-1.562-.246-.86-.195-1.57.149-2.117.558-.89 1.754-1.094 2.144-1.16.121-.024.246-.047.367-.067.024-.004.043-.012.06-.015a.269.269 0 0 1-.013-.04c-.007-.035-.02-.078-.03-.128-.122-.551-.06-1.012.015-1.387.086-.418.136-.668.343-.906.278-.383.758-.543 1.047-.641a2.42 2.42 0 0 0 .172-.063c.82-.394 1.078-.796 1.153-1.066.058-.223.156-.812.113-1.219a.233.233 0 0 1 .058-.187.21.21 0 0 1 .16-.07c.141 0 .258 0 .688 1.332.227.699.059 1.359-.5 1.953l-.02.023c.004.004.004.008.008.012.235.386.364.87.325 1.23a1.83 1.83 0 0 1-.04.235v.004c.047-.004.102-.008.165-.008.277 0 .675.043 1 .25.195.125.445.316.625.695.207.438.285 1.043.23 1.797m.438-2.117a2.342 2.342 0 0 0-1.633-1.293l-.059-.016-.012-.062a2.924 2.924 0 0 0-.156-.582l-.015-.047.023-.04a2.537 2.537 0 0 0 .324-2.261c-.199-.625-.355-1.024-.488-1.262-.27-.484-.637-.586-.902-.586a.971.971 0 0 0-.711.317.971.971 0 0 0-.243.757c.028.286-.046.778-.093.954-.004.011-.09.265-.746.586a1.188 1.188 0 0 0-.098.035c-.34.113-.973.324-1.39.879-.317.382-.4.77-.489 1.218a4.182 4.182 0 0 0-.098 1.036v.074l-.074.02c-1.062.234-1.828.714-2.273 1.421-.461.735-.54 1.649-.23 2.727.003.015.011.035.015.054l.047.145-.149-.024c-.054-.011-.105-.015-.16-.023a1.516 1.516 0 0 0-.137-.008c-.515 0-1.066.328-1.472.875-.313.426-.692 1.172-.707 2.336-.008.875.086 1.68.277 2.395.145.527.305.851.367.965l1.215 2.277.555-2.52c.226-1.011.445-1.394.707-1.656l.05-.05.063.038c.602.364 1.32.555 2.074.555a5.01 5.01 0 0 0 2.485-.687c.492-.29.91-.645 1.246-1.055l.043-.031.078-.004c.195-.004.469-.106.75-.274.234-.14.598-.402.957-.843a5.44 5.44 0 0 0 .887-1.622c.261-.734.422-1.593.476-2.554.063-.883-.043-1.61-.304-2.164' />
|
||||||
|
<path d='M16.43 8.98c-.153-.238-.344-.382-.5-.382a.181.181 0 0 0-.082.015c-.082.032-.215.41-.157.688.04.191.266.828.38 1.133.038.117.062.171.066.195a.38.38 0 0 1 .023.07c.09.27.317.965.387 1.531a8.28 8.28 0 0 0 .187-2.19 2.092 2.092 0 0 0-.304-1.06m-1.09 4.032c.164-.043.293-.082.39-.11-.199-.136-.43-.312-.742-.554-.77-.598-1.593-.903-2.449-.903-.469 0-.879.09-1.2.2.079-.004.161-.004.247-.004.098 0 .203 0 .309.007.335.024 1.195.176 1.968 1.102.157.184.325.34.805.34.168 0 .367-.02.605-.059l.067-.02m-.348.458c-.012.14-.035.41-.07.617a3.292 3.292 0 0 1-.164.566l.207.188c.2-.133.863-.637 1.32-1.777a2.191 2.191 0 0 1-.62.261c-.27.078-.532.121-.673.145' />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 5.4 KiB |
|
|
@ -1482,6 +1482,28 @@
|
||||||
"babel-runtime": "6.26.0"
|
"babel-runtime": "6.26.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"babel-plugin-inline-react-svg": {
|
||||||
|
"version": "0.5.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/babel-plugin-inline-react-svg/-/babel-plugin-inline-react-svg-0.5.2.tgz",
|
||||||
|
"integrity": "sha1-9MnqU4To0Ip6T5ahnyKl6rDd86k=",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"babel-template": "6.26.0",
|
||||||
|
"babel-traverse": "6.26.0",
|
||||||
|
"babylon": "6.18.0",
|
||||||
|
"lodash.isplainobject": "4.0.6",
|
||||||
|
"resolve-from": "2.0.0",
|
||||||
|
"svgo": "0.7.2"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"resolve-from": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
|
||||||
|
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"babel-plugin-syntax-async-functions": {
|
"babel-plugin-syntax-async-functions": {
|
||||||
"version": "6.13.0",
|
"version": "6.13.0",
|
||||||
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
|
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
|
||||||
|
|
@ -7052,7 +7074,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"jitsi-meet-electron-utils": {
|
"jitsi-meet-electron-utils": {
|
||||||
"version": "github:jitsi/jitsi-meet-electron-utils#7d7138701b253d73e00fe16ed1b7f970525b9df2",
|
"version": "github:jitsi/jitsi-meet-electron-utils#1972c3bf0884ace68eb496894dabae593d6dbf49",
|
||||||
"requires": {
|
"requires": {
|
||||||
"nan": "2.10.0",
|
"nan": "2.10.0",
|
||||||
"postis": "2.2.0",
|
"postis": "2.2.0",
|
||||||
|
|
@ -7696,6 +7718,12 @@
|
||||||
"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
|
"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"lodash.isplainobject": {
|
||||||
|
"version": "4.0.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
|
||||||
|
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"lodash.memoize": {
|
"lodash.memoize": {
|
||||||
"version": "4.1.2",
|
"version": "4.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
||||||
|
|
@ -10757,6 +10785,12 @@
|
||||||
"simple-concat": "1.0.0"
|
"simple-concat": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"simple-html-tokenizer": {
|
||||||
|
"version": "0.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.1.1.tgz",
|
||||||
|
"integrity": "sha1-BcLuxXn//+FFoDCsJs/qYbmA+r4=",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"single-line-log": {
|
"single-line-log": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
|
||||||
|
|
@ -11241,6 +11275,31 @@
|
||||||
"has-flag": "1.0.0"
|
"has-flag": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"svg-inline-loader": {
|
||||||
|
"version": "0.8.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/svg-inline-loader/-/svg-inline-loader-0.8.0.tgz",
|
||||||
|
"integrity": "sha512-rynplY2eXFrdNomL1FvyTFQlP+dx0WqbzHglmNtA9M4IHRC3no2aPAl3ny9lUpJzFzFMZfWRK5YIclNU+FRePA==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"loader-utils": "0.2.17",
|
||||||
|
"object-assign": "4.1.1",
|
||||||
|
"simple-html-tokenizer": "0.1.1"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"loader-utils": {
|
||||||
|
"version": "0.2.17",
|
||||||
|
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
|
||||||
|
"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"big.js": "3.2.0",
|
||||||
|
"emojis-list": "2.1.0",
|
||||||
|
"json5": "0.5.1",
|
||||||
|
"object-assign": "4.1.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"svgo": {
|
"svgo": {
|
||||||
"version": "0.7.2",
|
"version": "0.7.2",
|
||||||
"resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@
|
||||||
"babel-core": "6.26.3",
|
"babel-core": "6.26.3",
|
||||||
"babel-eslint": "8.2.3",
|
"babel-eslint": "8.2.3",
|
||||||
"babel-loader": "7.1.4",
|
"babel-loader": "7.1.4",
|
||||||
|
"babel-plugin-inline-react-svg": "0.5.2",
|
||||||
"babel-preset-env": "1.7.0",
|
"babel-preset-env": "1.7.0",
|
||||||
"babel-preset-react": "6.24.1",
|
"babel-preset-react": "6.24.1",
|
||||||
"babel-preset-stage-1": "6.24.1",
|
"babel-preset-stage-1": "6.24.1",
|
||||||
|
|
@ -70,6 +71,7 @@
|
||||||
"html-webpack-plugin": "3.2.0",
|
"html-webpack-plugin": "3.2.0",
|
||||||
"precommit-hook": "3.0.0",
|
"precommit-hook": "3.0.0",
|
||||||
"style-loader": "0.21.0",
|
"style-loader": "0.21.0",
|
||||||
|
"svg-inline-loader": "0.8.0",
|
||||||
"webpack": "4.8.1",
|
"webpack": "4.8.1",
|
||||||
"webpack-cli": "2.1.3"
|
"webpack-cli": "2.1.3"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,9 @@ const commonConfig = {
|
||||||
],
|
],
|
||||||
require.resolve('babel-preset-react'),
|
require.resolve('babel-preset-react'),
|
||||||
require.resolve('babel-preset-stage-1')
|
require.resolve('babel-preset-stage-1')
|
||||||
|
],
|
||||||
|
plugins: [
|
||||||
|
require.resolve('babel-plugin-inline-react-svg')
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
test: /\.js$/
|
test: /\.js$/
|
||||||
|
|
@ -32,6 +35,10 @@ const commonConfig = {
|
||||||
{ loader: 'css-loader' }
|
{ loader: 'css-loader' }
|
||||||
],
|
],
|
||||||
test: /\.css$/
|
test: /\.css$/
|
||||||
|
},
|
||||||
|
{
|
||||||
|
loader: 'svg-inline-loader',
|
||||||
|
test: /\.svg$/
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue