From 5b7b9a2948cab36261ffed6b99fc704e72c9118d Mon Sep 17 00:00:00 2001
From: Brian Peiris <brianpeiris@gmail.com>
Date: Thu, 26 Apr 2018 06:54:03 -0700
Subject: [PATCH] bug/ui-fixes
---
src/assets/stylesheets/info-dialog.scss | 3 ++-
src/react-components/home-root.js | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/assets/stylesheets/info-dialog.scss b/src/assets/stylesheets/info-dialog.scss
index 7e67c1f4c..ae46af24e 100644
--- a/src/assets/stylesheets/info-dialog.scss
+++ b/src/assets/stylesheets/info-dialog.scss
@@ -140,7 +140,8 @@
&__submit {
@extend %bottom-button;
border: 0;
- margin-top: 16px;
+ margin-top: 0;
+ margin-bottom: 0;
}
&__privacy {
diff --git a/src/react-components/home-root.js b/src/react-components/home-root.js
index 99b3706ab..8422af8d4 100644
--- a/src/react-components/home-root.js
+++ b/src/react-components/home-root.js
@@ -10,13 +10,14 @@ import { ENVIRONMENT_URLS } from "../assets/environments/environments";
import HubCreatePanel from "./hub-create-panel.js";
import InfoDialog from "./info-dialog.js";
-const navigatorLang = (navigator.languages && navigator.languages[0]) || navigator.language || navigator.userLanguage;
-
-const lang = navigatorLang.toLowerCase().split(/[_-]+/)[0];
+const navigatorLang = ((navigator.languages && navigator.languages[0]) || navigator.language || navigator.userLanguage)
+ .toLowerCase()
+ .split(/[_-]+/)[0];
import localeData from "../assets/translations.data.json";
addLocaleData([...en]);
+const lang = (navigatorLang && localeData[navigatorLang]) || "en";
const messages = localeData[lang] || localeData.en;
class HomeRoot extends Component {
@@ -69,7 +70,7 @@ class HomeRoot extends Component {
const dialogTypes = InfoDialog.dialogTypes;
return (
- <IntlProvider locale={lang} messages={messages}>
+ <IntlProvider defaultLocale="en" locale={lang} messages={messages}>
<div className="home">
<div className={mainContentClassNames}>
<div className="header-content">
--
GitLab