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 margin, padding, height for header.

Browse Source
This commit is contained in:
Dan 2017-08-30 21:32:13 -02:30 committed by Chi Kei Chan
parent d5998d3b07
commit 799627189d
3 changed files with 54 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ui/app/app.js
View File

@ -198,46 +198,47 @@ App.prototype.renderAppBar = function () {
h('.app-header.flex-row.flex-space-between', {
style: {},
}, [
h('div.app-header-contents', {}, [
h('div.left-menu-wrapper', {
style: {},
}, [
// mini logo
h('img', {
height: 24,
width: 24,
src: '/images/icon-128.png',
}),
h('div.left-menu-wrapper', {
style: {},
}, [
// mini logo
h('img', {
height: 24,
width: 24,
src: '/images/icon-128.png',
}),
// metamask name
h('h1', {
style: {
position: 'relative',
left: '9px',
},
}, 'MetaMask'),
// metamask name
h('h1', {
style: {
position: 'relative',
left: '9px',
},
}, 'MetaMask'),
]),
]),
h('div.network-component-wrapper', {
style: {},
}, [
// Network Indicator
h(NetworkIndicator, {
network: this.props.network,
provider: this.props.provider,
onClick: (event) => {
event.preventDefault()
event.stopPropagation()
if (this.props.networkDropdownOpen === false) {
this.props.showNetworkDropdown()
} else {
this.props.hideNetworkDropdown()
}
},
}),
h('div.network-component-wrapper', {
style: {},
}, [
// Network Indicator
h(NetworkIndicator, {
network: this.props.network,
provider: this.props.provider,
onClick: (event) => {
event.preventDefault()
event.stopPropagation()
if (this.props.networkDropdownOpen === false) {
this.props.showNetworkDropdown()
} else {
this.props.hideNetworkDropdown()
}
},
}),
]),
]),
])
]),
])

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

@ -3,8 +3,8 @@
visibility: visible;
background: $gallery;
padding: 6px 8px;
height: 12vh;
max-height: 60px;
height: 14.4vh;
max-height: 97px;
position: relative;
z-index: $header-z-index;
@ -17,6 +17,18 @@
}
}
.app-header-contents {
display: flex;
justify-content: inherit;
width: 100%;
@media screen and (min-width: 576px) {
width: 80vw;
margin-left: 10vw;
margin-bottom: 15px;
}
}
.app-header h1 {
font-family: 'Montserrat Regular';
text-transform: uppercase;

6
ui/app/css/itcss/components/newui-sections.scss
View File

@ -106,7 +106,7 @@ $wallet-view-bg: $wild-sand;
@media screen and (min-width: 769px) {
.main-container {
margin-top: 35px;
margin-top: 6.9vh;
width: 80%;
height: 82vh;
box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);
@ -115,7 +115,7 @@ $wallet-view-bg: $wild-sand;
@media screen and (min-width: 1281px) {
.main-container {
margin-top: 35px;
margin-top: 6.9vh;
width: 65%;
height: 82vh;
box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);
@ -162,5 +162,5 @@ $wallet-view-bg: $wild-sand;
.account-options-menu {
align-items: center;
justify-content: flex-start;
margin: 5% 7%;
margin: 5% 7% 0%;
}