Название сайта вынесено в отдельную строку перевода (а как иначе мы напишем Ёly.by в белорусской версии?)

Исправлен косяк с неимпортнутыми шрифтами при доступе к переменной толстоты шрифта в стилях языковой панели
This commit is contained in:
ErickSkrauch 2016-05-20 00:30:28 +03:00
parent 574ddfd91c
commit 76669dfebd
5 changed files with 10 additions and 1 deletions

View File

@ -1,4 +1,5 @@
@import "~components/ui/colors.scss"; @import "~components/ui/colors.scss";
@import "~components/ui/fonts.scss";
.container { .container {
position: relative; position: relative;

View File

@ -92,6 +92,7 @@
"enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.", "enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.",
"logout": "Logout", "logout": "Logout",
"newEmailPlaceholder": "Enter new E-mail", "newEmailPlaceholder": "Enter new E-mail",
"pages.root.siteName": "Ely.by",
"pleaseEnterPassword": "Please, enter your current password", "pleaseEnterPassword": "Please, enter your current password",
"pressButtonToStart": "Press the button below to send a message with the code for E-mail change initialization.", "pressButtonToStart": "Press the button below to send a message with the code for E-mail change initialization.",
"register": "Join", "register": "Join",

View File

@ -92,6 +92,7 @@
"enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.", "enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.",
"logout": "Выход", "logout": "Выход",
"newEmailPlaceholder": "Новый E-mail", "newEmailPlaceholder": "Новый E-mail",
"pages.root.siteName": "Ely.by",
"pleaseEnterPassword": "Пожалуйста, введите пароль от аккаунта", "pleaseEnterPassword": "Пожалуйста, введите пароль от аккаунта",
"pressButtonToStart": "Нажмите на кнопку ниже, чтобы отправить письмо с кодом для инициализации процесса смены E-mail адреса.", "pressButtonToStart": "Нажмите на кнопку ниже, чтобы отправить письмо с кодом для инициализации процесса смены E-mail адреса.",
"register": "Регистрация", "register": "Регистрация",

View File

@ -0,0 +1,3 @@
{
"siteName": "Ely.by"
}

View File

@ -1,5 +1,6 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import { FormattedMessage as Message } from 'react-intl';
import { Link } from 'react-router'; import { Link } from 'react-router';
import classNames from 'classnames'; import classNames from 'classnames';
@ -8,6 +9,8 @@ import PopupStack from 'components/ui/popup/PopupStack';
import styles from './root.scss'; import styles from './root.scss';
import messages from './RootPage.intl.json';
function RootPage(props) { function RootPage(props) {
return ( return (
<div className={styles.root}> <div className={styles.root}>
@ -17,7 +20,7 @@ function RootPage(props) {
<div className={styles.header}> <div className={styles.header}>
<div className={styles.headerContent}> <div className={styles.headerContent}>
<Link to="/" className={styles.logo}> <Link to="/" className={styles.logo}>
Ely.by <Message {...messages.siteName} />
</Link> </Link>
<div className={styles.userbar}> <div className={styles.userbar}>
<Userbar {...props} onLogout={props.logout} /> <Userbar {...props} onLogout={props.logout} />