diff --git a/src/components/auth/SignIn.jsx b/src/components/auth/SignIn.jsx index bd56ce7..df27222 100644 --- a/src/components/auth/SignIn.jsx +++ b/src/components/auth/SignIn.jsx @@ -5,7 +5,7 @@ import classNames from 'classnames'; import buttons from 'components/ui/buttons.scss'; import icons from 'components/ui/icons.scss'; -import { Panel, PanelBody, PanelFooter, PanelError } from 'components/ui/Panel'; +import { Panel, PanelBody, PanelFooter, PanelBodyHeader } from 'components/ui/Panel'; import { Input, Checkbox } from 'components/ui/Form'; import styles from './signIn.scss'; @@ -56,19 +56,17 @@ export default class SignIn extends Component {
}> - - -
- - - - ) - }} /> - - } /> + + +
+ + + + ) + }} /> +
{/**/} @@ -101,17 +99,20 @@ export default class SignIn extends Component {
}> -
-
- + +
+
+ {/**/} + +
+
+ +
+
+ erickskrauch@yandex.ru +
-
- -
-
- erickskrauch@yandex.ru -
-
+
diff --git a/src/components/auth/signIn.scss b/src/components/auth/signIn.scss index 9660c8d..aa8863d 100644 --- a/src/components/auth/signIn.scss +++ b/src/components/auth/signIn.scss @@ -37,7 +37,7 @@ width: 90px; height: 90px; font-size: 90px; - line-height: 90px; + line-height: 1; margin: 0 auto; img { @@ -70,3 +70,62 @@ font-size: 16px; line-height: 1.2; } + +// app permissions +.authInfo { + padding: 0 5px; + overflow: hidden; + text-align: left; +} + +.authInfoAvatar { + float: left; + height: 40px; + width: 40px; + font-size: 40px; + line-height: 1; + margin-right: 10px; + color: #aaa; + + img { + width: 100%; + } +} + +.authInfoTitle { + font-size: 14px; + color: #666; +} + +.authInfoEmail { + font-family: $font-family-title; + font-size: 20px; + color: #fff; +} + +.disclaimer { + font-family: $font-family-title; + font-size: 18px; + color: #dd8650; +} + +.permissionsList { + text-align: left; + list-style: none; + margin: 10px 0; + + li { + color: #a9a9a9; + + &:before { + content: "• "; + color: lighter($light_violet); + font-size: 30px; + line-height: 20px; + display: inline-block; + height: 20px; + vertical-align: middle; + margin-right: 5px; + } + } +} diff --git a/src/components/ui/Panel.jsx b/src/components/ui/Panel.jsx index ed75772..211c420 100644 --- a/src/components/ui/Panel.jsx +++ b/src/components/ui/Panel.jsx @@ -56,13 +56,21 @@ export function PanelFooter(props) { ); } -export function PanelError(props) { - var { message } = props; +export function PanelBodyHeader(props) { + var { type = 'default' } = props; + + var close; + + if (type === 'error') { + close = ( + + ); + } return ( -
- - {message} +
+ {close} + {props.children}
); } diff --git a/src/components/ui/panel.scss b/src/components/ui/panel.scss index 1a7e48d..c0cfe56 100644 --- a/src/components/ui/panel.scss +++ b/src/components/ui/panel.scss @@ -61,11 +61,15 @@ } } -.error { +.bodyHeader { position: relative; padding: 10px; margin: -15px; margin-bottom: 15px; +} + +.errorBodyHeader { + composes: bodyHeader; background: #e66c69; border: 1px #e15457 solid; @@ -75,6 +79,19 @@ color: #fff; } +.defaultBodyHeader { + composes: bodyHeader; + + background: darker($black); + border: lighter($black) solid; + border-bottom-width: 5px; + border-top-width: 4px; + + font-size: 14px; + line-height: 1.3; + color: #fff; +} + .close { composes: close from './icons.scss'; diff --git a/src/index.scss b/src/index.scss index 0e471b0..a6a19f4 100644 --- a/src/index.scss +++ b/src/index.scss @@ -18,6 +18,8 @@ a { text-decoration: none; } +ul, +li, h1, h2,