Skip to content

K
kus-admin
Commit dd35f9ba by talequale
Options

orange button and welcome page fixed

parent 9b54ad7c
Showing with 80 additions and 47 deletions
src/view/cmp/button/button.scss
...@@ -121,10 +121,36 @@ ...@@ -121,10 +121,36 @@
} }
} }
.button--thirdery { .button-orange {
background: $persimmon; color: $bg-main;
color: #fff background-color: $persimmon;
border-color: $persimmon;
@media (max-width: $mobile) {
font-size: 16px;
}
&:hover,
&:active {
color: $bg-main;
background-color: darken($persimmon, 10%);
border-color: darken($persimmon, 10%);
}
&:focus {
color: $bg-main;
background-color: $persimmon;
border-color: lighten($persimmon, 10%);
outline: none;
}
&:disabled {
color: $bg-main;
background-color: $gray-medium;
border-color: $gray-medium;
}
} }
.button--bordered { .button--bordered {
padding: 5px 44px; padding: 5px 44px;
min-width: 200px; min-width: 200px;
......
src/view/page/account/welcomePage.scss
...@@ -246,5 +246,6 @@ ...@@ -246,5 +246,6 @@
} }
button.welcome-page__button--wide { button.welcome-page__button--wide {
padding-left: 20px;
min-width: 275px; min-width: 275px;
} }
src/view/page/test/demo/WelcomeDemoFinal.jsx
...@@ -4,28 +4,32 @@ import Arr from "/svg/arr.svg"; ...@@ -4,28 +4,32 @@ import Arr from "/svg/arr.svg";
import Info from "/view/block/info/Info"; import Info from "/view/block/info/Info";
const WelcomeDemoFinal = D.declare( 'view.page.WelcomeDemoFinal', () => { const WelcomeDemoFinal = D.declare( 'view.page.WelcomeDemoFinal', () => {
return <Info return <div className="welcome-page">
img={ <div className="welcome-page__wrapper">
<picture> <Info
<source srcset="/uploads/images/assistant-final-mob.svg" media={"(max-width: 767px)"}/> img={
<img src="/uploads/images/assistant-final.svg" width="450" height="360" alt={"Изображение помощника"}/> <picture>
</picture> <source srcset="/uploads/images/assistant-final-mob.svg" media={"(max-width: 767px)"}/>
} <img src="/uploads/images/assistant-final.svg" width="450" height="360" alt={"Изображение помощника"}/>
buttons={[ </picture>
<Button class={"button button--thirdery welcome-page__button"} type={"button"} }
onclick={ACTION.TEST.DEMO.GOTO_FINAL_LAST_NOTIFICATION.execute}> buttons={[
<span>Начать тестирование</span><Arr width="17" height="11"/> <Button class={"button button--primary button-orange welcome-page__button welcome-page__button--wide"} type={"button"}
</Button> onclick={ACTION.TEST.DEMO.GOTO_FINAL_LAST_NOTIFICATION.execute}>
]}> <span>Начать тестирование</span><Arr width="17" height="11"/>
<div className="welcome-page__message"> </Button>
<h1 className="welcome-page__title">Добро пожаловать в&nbsp;пробное итоговое тестирование!</h1> ]}>
<div className="welcome-page__text"> <div className="welcome-page__message">
<p>Текст про тестирование и&nbsp;его правила.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do&nbsp;eiusmod tempor incididunt ut&nbsp;labore et&nbsp;dolore magna aliqua.</p> <h1 className="welcome-page__title">Добро пожаловать в&nbsp;пробное итоговое тестирование!</h1>
<p class="welcome-page__date">Тестирование проходит в&nbsp;период: <time>25.08-30.08</time></p> <div className="welcome-page__text">
</div> <p>Текст про тестирование и&nbsp;его правила.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do&nbsp;eiusmod tempor incididunt ut&nbsp;labore et&nbsp;dolore magna aliqua.</p>
<p class="welcome-page__date">Тестирование проходит в&nbsp;период: <time>25.08-30.08</time></p>
</div>
</div>
</Info>
</div> </div>
</Info> </div>
} ); } );
export default WelcomeDemoFinal; export default WelcomeDemoFinal;
export { WelcomeDemoFinal }; export { WelcomeDemoFinal };
\ No newline at end of file
src/view/page/test/demo/WelcomeDemoFinalLastNotification.jsx
...@@ -4,28 +4,32 @@ import Arr from "/svg/arr.svg"; ...@@ -4,28 +4,32 @@ import Arr from "/svg/arr.svg";
import Info from "/view/block/info/Info"; import Info from "/view/block/info/Info";
const WelcomeDemoFinalLastNotification = D.declare( 'view.page.WelcomeDemoFinalLastNotification', () => { const WelcomeDemoFinalLastNotification = D.declare( 'view.page.WelcomeDemoFinalLastNotification', () => {
return <Info return <div className="welcome-page">
img={ <div className="welcome-page__wrapper">
<picture> <Info
<source srcset="/uploads/images/assistant-warning-mob.svg" media={"(max-width: 767px)"}/> img={
<img src="/uploads/images/assistant-warning.svg" width="450" height="360" alt={"Изображение помощника"}/> <picture>
</picture> <source srcset="/uploads/images/assistant-warning-mob.svg" media={"(max-width: 767px)"}/>
} <img src="/uploads/images/assistant-warning.svg" width="450" height="360" alt={"Изображение помощника"}/>
buttons={[ </picture>
<Button class={"button button--thirdery welcome-page__button welcome-page__button--wide"} type={"button"} }
onclick={ACTION.TEST.DEMO.GOTO_FINAL_TEST.execute} buttons={[
> <Button class={"button button--primary button-orange welcome-page__button welcome-page__button--wide"} type={"button"}
<span>Я готов! Начать</span><Arr width="17" height="11"/> onclick={ACTION.TEST.DEMO.GOTO_FINAL_TEST.execute}
</Button> >
]}> <span>Я готов! Начать</span><Arr width="17" height="11"/>
<div className="welcome-page__message welcome-page__message--warning"> </Button>
<h1 className="welcome-page__title"><em>Внимание!</em>
Тестирование
 невозможно прервать</h1> ]}>
<div className="welcome-page__text"> <div className="welcome-page__message welcome-page__message--warning">
<p>Это последнее предупреждение. Вы&nbsp;уверены, что&nbsp;готовы начать?</p> <h1 className="welcome-page__title"><em>Внимание!</em>
Тестирование
 невозможно прервать</h1>
</div> <div className="welcome-page__text">
<p>Это последнее предупреждение. Вы&nbsp;уверены, что&nbsp;готовы начать?</p>
</div>
</div>
</Info>
</div> </div>
</Info> </div>
} ); } );
export default WelcomeDemoFinalLastNotification; export default WelcomeDemoFinalLastNotification;
export { WelcomeDemoFinalLastNotification }; export { WelcomeDemoFinalLastNotification };
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment