aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-31 04:57:50 +0800
committerkumavis <aaron@kumavis.me>2018-03-31 04:57:50 +0800
commit7dde948c451a24313ca1d98b804a761245cc61c1 (patch)
treefc85c1d727f9dd4b95411e5f822e28d12874a720 /ui
parent32bb09bcb9dd5f9db86967128f7d0fe154fe9922 (diff)
parent8e0f39353dd47c4a201aaf2ee160912846f2e68b (diff)
downloadtangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.tar
tangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.tar.gz
tangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.tar.bz2
tangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.tar.lz
tangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.tar.xz
tangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.tar.zst
tangerine-wallet-browser-7dde948c451a24313ca1d98b804a761245cc61c1.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js2
-rw-r--r--ui/app/components/identicon.js2
-rw-r--r--ui/app/components/modals/deposit-ether-modal.js6
-rw-r--r--ui/app/components/sender-to-recipient.js2
-rw-r--r--ui/app/css/itcss/settings/typography.scss28
-rw-r--r--ui/app/settings.js3
-rw-r--r--ui/i18n-helper.js2
7 files changed, 23 insertions, 22 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index ea88f3039..0b7a7a1e0 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -294,7 +294,7 @@ App.prototype.renderAppBar = function () {
h('img.metafox-icon', {
height: 42,
width: 42,
- src: '/images/metamask-fox.svg',
+ src: './images/metamask-fox.svg',
}),
// metamask name
diff --git a/ui/app/components/identicon.js b/ui/app/components/identicon.js
index b803b7ceb..7cc5a4de0 100644
--- a/ui/app/components/identicon.js
+++ b/ui/app/components/identicon.js
@@ -47,7 +47,7 @@ IdenticonComponent.prototype.render = function () {
)
: (
h('img.balance-icon', {
- src: '../images/eth_logo.svg',
+ src: './images/eth_logo.svg',
style: {
height: diameter,
width: diameter,
diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js
index 8854d258f..0dc611f50 100644
--- a/ui/app/components/modals/deposit-ether-modal.js
+++ b/ui/app/components/modals/deposit-ether-modal.js
@@ -150,7 +150,7 @@ DepositEtherModal.prototype.render = function () {
this.renderRow({
logo: h('img.deposit-ether-modal__logo', {
- src: '../../../images/deposit-eth.svg',
+ src: './images/deposit-eth.svg',
}),
title: DIRECT_DEPOSIT_ROW_TITLE,
text: DIRECT_DEPOSIT_ROW_TEXT,
@@ -171,7 +171,7 @@ DepositEtherModal.prototype.render = function () {
this.renderRow({
logo: h('div.deposit-ether-modal__logo', {
style: {
- backgroundImage: 'url(\'../../../images/coinbase logo.png\')',
+ backgroundImage: 'url(\'./images/coinbase logo.png\')',
height: '40px',
},
}),
@@ -185,7 +185,7 @@ DepositEtherModal.prototype.render = function () {
this.renderRow({
logo: h('div.deposit-ether-modal__logo', {
style: {
- backgroundImage: 'url(\'../../../images/shapeshift logo.png\')',
+ backgroundImage: 'url(\'./images/shapeshift logo.png\')',
},
}),
title: SHAPESHIFT_ROW_TITLE,
diff --git a/ui/app/components/sender-to-recipient.js b/ui/app/components/sender-to-recipient.js
index 6b9cd32ea..9cef8e401 100644
--- a/ui/app/components/sender-to-recipient.js
+++ b/ui/app/components/sender-to-recipient.js
@@ -46,7 +46,7 @@ class SenderToRecipient extends Component {
h('img', {
height: 15,
width: 15,
- src: '/images/arrow-right.svg',
+ src: './images/arrow-right.svg',
}),
]),
]),
diff --git a/ui/app/css/itcss/settings/typography.scss b/ui/app/css/itcss/settings/typography.scss
index 8a56d9c6c..18c444c8a 100644
--- a/ui/app/css/itcss/settings/typography.scss
+++ b/ui/app/css/itcss/settings/typography.scss
@@ -1,4 +1,4 @@
-@import url('/fonts/Font_Awesome/font-awesome.min.css');
+@import url('./fonts/Font_Awesome/font-awesome.min.css');
@font-face {
font-family: 'Roboto';
@@ -338,8 +338,8 @@
@font-face {
font-family: 'Montserrat Regular';
- src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');
- src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
+ src: url('./fonts/Montserrat/Montserrat-Regular.woff') format('woff');
+ src: url('./fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
font-size: 'small';
@@ -347,59 +347,59 @@
@font-face {
font-family: 'Montserrat Bold';
- src: url('/fonts/Montserrat/Montserrat-Bold.woff') format('woff');
- src: url('/fonts/Montserrat/Montserrat-Bold.ttf') format('truetype');
+ src: url('./fonts/Montserrat/Montserrat-Bold.woff') format('woff');
+ src: url('./fonts/Montserrat/Montserrat-Bold.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Montserrat Light';
- src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff');
- src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype');
+ src: url('./fonts/Montserrat/Montserrat-Light.woff') format('woff');
+ src: url('./fonts/Montserrat/Montserrat-Light.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Montserrat UltraLight';
- src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff');
- src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype');
+ src: url('./fonts/Montserrat/Montserrat-UltraLight.woff') format('woff');
+ src: url('./fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'DIN OT';
- src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype');
+ src: url('./fonts/DIN_OT/DINOT-2.otf') format('opentype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'DIN OT Light';
- src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype');
+ src: url('./fonts/DIN_OT/DINOT-2.otf') format('opentype');
font-weight: 200;
font-style: normal;
}
@font-face {
font-family: 'DIN NEXT';
- src: url('/fonts/DIN Next/DIN Next W01 Regular.otf') format('opentype');
+ src: url('./fonts/DIN Next/DIN Next W01 Regular.otf') format('opentype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'DIN NEXT Light';
- src: url('/fonts/DIN Next/DIN Next W10 Light.otf') format('opentype');
+ src: url('./fonts/DIN Next/DIN Next W10 Light.otf') format('opentype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Lato';
- src: url('/fonts/Lato/Lato-Regular.ttf') format('truetype');
+ src: url('./fonts/Lato/Lato-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
diff --git a/ui/app/settings.js b/ui/app/settings.js
index e91ac7340..3aa7b9c6b 100644
--- a/ui/app/settings.js
+++ b/ui/app/settings.js
@@ -108,11 +108,12 @@ class Settings extends Component {
renderCurrentLocale () {
const { updateCurrentLocale, currentLocale } = this.props
const currentLocaleMeta = locales.find(locale => locale.code === currentLocale)
+ const currentLocaleName = currentLocaleMeta ? currentLocaleMeta.name : ''
return h('div.settings__content-row', [
h('div.settings__content-item', [
h('span', 'Current Language'),
- h('span.settings__content-description', `${currentLocaleMeta.name}`),
+ h('span.settings__content-description', `${currentLocaleName}`),
]),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
diff --git a/ui/i18n-helper.js b/ui/i18n-helper.js
index 3ce24ddfb..db2fd2dc4 100644
--- a/ui/i18n-helper.js
+++ b/ui/i18n-helper.js
@@ -27,7 +27,7 @@ const getMessage = (locale, key, substitutions) => {
function fetchLocale (localeName) {
return new Promise((resolve, reject) => {
- return fetch(`/_locales/${localeName}/messages.json`)
+ return fetch(`./_locales/${localeName}/messages.json`)
.then(response => response.json())
.then(
locale => resolve(locale),