m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix styling in initialization

Browse Source
This commit is contained in:
Alexander Tseung 2018-01-09 16:45:39 -08:00 committed by Chi Kei Chan
parent 5c1dcf3e9b
commit bdcee058dc
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/scripts/popup.js
View File

@ -26,8 +26,13 @@ const container = document.getElementById('app-content')
startPopup({ container, connectionStream }, (err, store) => { startPopup({ container, connectionStream }, (err, store) => {
if (err) return displayCriticalError(err) if (err) return displayCriticalError(err)
let betaUIState = store.getState().metamask.featureFlags.betaUI const { isMascara, identities = {}, featureFlags = {} } = store.getState().metamask
let css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() const firstTime = Object.keys(identities).length === 0
let betaUIState = featureFlags.betaUI
const useBetaCss = isMascara || firstTime || betaUIState
let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
let deleteInjectedCss = injectCss(css) let deleteInjectedCss = injectCss(css)
let newBetaUIState let newBetaUIState

6
ui/app/app.js
View File

@ -3,6 +3,8 @@ const Component = require('react').Component
const connect = require('react-redux').connect const connect = require('react-redux').connect
const h = require('react-hyperscript') const h = require('react-hyperscript')
const actions = require('./actions') const actions = require('./actions')
const classnames = require('classnames')
// mascara // mascara
const MascaraFirstTime = require('../../mascara/src/app/first-time').default const MascaraFirstTime = require('../../mascara/src/app/first-time').default
const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default
@ -243,7 +245,9 @@ App.prototype.renderAppBar = function () {
}, [ }, [
h('.app-header.flex-row.flex-space-between', { h('.app-header.flex-row.flex-space-between', {
style: {}, className: classnames({
'app-header--initialized': !isOnboarding,
}),
}, [ }, [
h('div.app-header-contents', {}, [ h('div.app-header-contents', {}, [
h('div.left-menu-wrapper', { h('div.left-menu-wrapper', {

13
ui/app/css/itcss/components/header.scss
View File

@ -17,7 +17,16 @@
@media screen and (min-width: 576px) { @media screen and (min-width: 576px) {
height: 75px; height: 75px;
justify-content: center; justify-content: center;
}
.metafox-icon {
cursor: pointer;
}
}
.app-header--initialized {
@media screen and (min-width: 576px) {
&::after { &::after {
content: ''; content: '';
position: absolute; position: absolute;
@ -27,10 +36,6 @@
bottom: -32px; bottom: -32px;
} }
} }
.metafox-icon {
cursor: pointer;
}
} }
.app-header-contents { .app-header-contents {