diff --git a/src/components/auth/AppInfo.jsx b/src/components/auth/AppInfo.jsx index 4e40bf7..f4f8297 100644 --- a/src/components/auth/AppInfo.jsx +++ b/src/components/auth/AppInfo.jsx @@ -1,17 +1,19 @@ import React, { Component } from 'react'; +import styles from './appInfo.scss'; + export default class SignIn extends Component { render() { - var { name, desc } = this.props; + var { name, description } = this.props; return ( -
-
-

{name}

+
+
+

{name}

-
-

- {desc} +

+

+ {description}

diff --git a/src/components/auth/appInfo.scss b/src/components/auth/appInfo.scss new file mode 100644 index 0000000..5cf5802 --- /dev/null +++ b/src/components/auth/appInfo.scss @@ -0,0 +1,41 @@ +@import '~components/ui/colors.scss'; +@import '~components/ui/fonts.scss'; + +.appInfo { + padding: 55px 15px; +} + +.logoContainer { + position: relative; + padding: 15px; + + &:after { + content: ''; + display: block; + + position: absolute; + left: 25px; + bottom: 0; + height: 3px; + width: 40px; + + background: $green; + } +} + +.logo { + font-family: $robotoCondensed; + color: #fff; + font-size: 22px; +} + +.descriptionContainer { + margin: 20px 0; +} + +.description { + font-family: $roboto; + color: #cccccc; + font-size: 13px; + line-height: 1.7; +} diff --git a/src/components/ui/buttons.scss b/src/components/ui/buttons.scss new file mode 100644 index 0000000..f9d5450 --- /dev/null +++ b/src/components/ui/buttons.scss @@ -0,0 +1,24 @@ +@import './colors.scss'; +@import './fonts.scss'; + +.button { + display: inline-block; + height: 50px; + padding: 0 15px; + + font-family: $robotoCondensed; + color: #fff; + font-size: 18px; + line-height: 50px; + text-decoration: none; +} + +.blue { + composes: button; + + background: $blue; + + &:hover { + background: lighter($blue); + } +} diff --git a/src/components/ui/colors.scss b/src/components/ui/colors.scss new file mode 100644 index 0000000..b028e11 --- /dev/null +++ b/src/components/ui/colors.scss @@ -0,0 +1,18 @@ +$green: #207e5c; +$blue: #5b9aa9; +$red: #e66c69; +$violet: #6b5b8c; +$dark_blue: #28555b; +$light_violet: #8b5d79; +$orange: #dd8650; +$light: #ebe8e1; + +$black: #232323; + +@function darker($color) { + @return darken($color, 4%); +} + +@function lighter($color) { + @return lighten($color, 3%); +} diff --git a/src/components/ui/fonts.scss b/src/components/ui/fonts.scss new file mode 100644 index 0000000..47e7e95 --- /dev/null +++ b/src/components/ui/fonts.scss @@ -0,0 +1,4 @@ +// TODO: need more abstract names +// TODO: should we host fonts from our side? +$robotoCondensed: 'Roboto Condensed', Arial, sans-serif; +$roboto: 'Roboto', Arial, sans-serif; diff --git a/src/components/userBar/UserBar.jsx b/src/components/userBar/UserBar.jsx deleted file mode 100644 index 187e6ac..0000000 --- a/src/components/userBar/UserBar.jsx +++ /dev/null @@ -1,18 +0,0 @@ -import React, { Component } from 'react'; - -import { Link } from 'react-router'; -import { FormattedMessage as Message } from 'react-intl'; - -import messages from './UserBar.messages.js'; - -export default class UserBar extends Component { - render() { - return ( -
- - - -
- ); - } -} diff --git a/src/components/userbar/Userbar.jsx b/src/components/userbar/Userbar.jsx new file mode 100644 index 0000000..1c15e65 --- /dev/null +++ b/src/components/userbar/Userbar.jsx @@ -0,0 +1,21 @@ +import React, { Component } from 'react'; + +import { Link } from 'react-router'; +import { FormattedMessage as Message } from 'react-intl'; + +import buttons from 'components/ui/buttons.scss'; + +import messages from './Userbar.messages.js'; +import styles from './userbar.scss'; + +export default class Userbar extends Component { + render() { + return ( +
+ + + +
+ ); + } +} diff --git a/src/components/userBar/UserBar.messages.js b/src/components/userbar/Userbar.messages.js similarity index 100% rename from src/components/userBar/UserBar.messages.js rename to src/components/userbar/Userbar.messages.js diff --git a/src/components/userbar/userbar.scss b/src/components/userbar/userbar.scss new file mode 100644 index 0000000..3139a48 --- /dev/null +++ b/src/components/userbar/userbar.scss @@ -0,0 +1,2 @@ +.userbar { +} diff --git a/src/favicon.ico b/src/favicon.ico new file mode 100644 index 0000000..bae0655 Binary files /dev/null and b/src/favicon.ico differ diff --git a/src/index.html b/src/index.html index 2bc28d4..f740000 100644 --- a/src/index.html +++ b/src/index.html @@ -6,6 +6,8 @@ + + diff --git a/src/index.scss b/src/index.scss index 95c0939..440b50f 100644 --- a/src/index.scss +++ b/src/index.scss @@ -5,3 +5,21 @@ body, margin: 0; padding: 0; } + +a { + text-decoration: none; +} + + +h1, +h2, +h3, +h4, +h5, +h6, +p { + font-weight: normal; + line-height: 1; + padding: 0; + margin: 0; +} diff --git a/src/pages/auth/SignInPage.jsx b/src/pages/auth/SignInPage.jsx index e6ee1df..03b541c 100644 --- a/src/pages/auth/SignInPage.jsx +++ b/src/pages/auth/SignInPage.jsx @@ -9,7 +9,7 @@ export default class SignInPage extends Component { render() { var appInfo = { name: 'TLauncher', - desc: `Лучший альтернативный лаунчер для Minecraft с большим количеством версий и их модификаций, а также возмоностью входа как с лицензионным аккаунтом, так и без него.` + description: `Лучший альтернативный лаунчер для Minecraft с большим количеством версий и их модификаций, а также возмоностью входа как с лицензионным аккаунтом, так и без него.` }; return ( diff --git a/src/pages/root/RootPage.jsx b/src/pages/root/RootPage.jsx index 943b6c7..14fbf5c 100644 --- a/src/pages/root/RootPage.jsx +++ b/src/pages/root/RootPage.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { Link } from 'react-router'; -import UserBar from 'components/userBar/UserBar'; +import Userbar from 'components/userbar/Userbar'; import styles from './root.scss'; @@ -11,13 +11,11 @@ export default function RootPage(props) {
-
- - Ely.by - -
+ + Ely.by +
- +
diff --git a/src/pages/root/root.scss b/src/pages/root/root.scss index f74d01e..ce75a77 100644 --- a/src/pages/root/root.scss +++ b/src/pages/root/root.scss @@ -1,5 +1,8 @@ +@import '~components/ui/colors.scss'; +@import '~components/ui/fonts.scss'; + .root { - background: #ebe8e1; + background: $light; min-height: 100%; } @@ -10,7 +13,7 @@ .header { height: 50px; - background: #207e5c; + background: $green; } .headerContent { @@ -21,7 +24,11 @@ line-height: 50px; padding: 0 20px; display: inline-block; - background: #1a6449; + background: darker($green); + + font-family: $robotoCondensed; + font-size: 33px; + color: #fff; } .body { @@ -40,7 +47,7 @@ left: 0; width: 300px; - background: #232323; + background: $black; } .content { diff --git a/webpack.config.js b/webpack.config.js index c902835..463f338 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -76,6 +76,7 @@ var webpackConfig = { }), new HtmlWebpackPlugin({ template: 'src/index.html', + favicon: 'src/favicon.ico', hash: isProduction, filename: 'index.html', inject: 'body',