Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kus-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Кубота
kus-admin
Commits
dd35f9ba
Commit
dd35f9ba
authored
Feb 02, 2020
by
talequale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
orange button and welcome page fixed
parent
9b54ad7c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
7 deletions
+42
-7
button.scss
src/view/cmp/button/button.scss
+29
-3
welcomePage.scss
src/view/page/account/welcomePage.scss
+1
-0
WelcomeDemoFinal.jsx
src/view/page/test/demo/WelcomeDemoFinal.jsx
+6
-2
WelcomeDemoFinalLastNotification.jsx
src/view/page/test/demo/WelcomeDemoFinalLastNotification.jsx
+6
-2
No files found.
src/view/cmp/button/button.scss
View file @
dd35f9ba
...
...
@@ -121,10 +121,36 @@
}
}
.button--thirdery
{
background
:
$persimmon
;
color
:
#fff
.button-orange
{
color
:
$bg-main
;
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
{
padding
:
5px
44px
;
min-width
:
200px
;
...
...
src/view/page/account/welcomePage.scss
View file @
dd35f9ba
...
...
@@ -246,5 +246,6 @@
}
button
.welcome-page__button--wide
{
padding-left
:
20px
;
min-width
:
275px
;
}
src/view/page/test/demo/WelcomeDemoFinal.jsx
View file @
dd35f9ba
...
...
@@ -4,7 +4,9 @@ import Arr from "/svg/arr.svg";
import
Info
from
"/view/block/info/Info"
;
const
WelcomeDemoFinal
=
D
.
declare
(
'view.page.WelcomeDemoFinal'
,
()
=>
{
return
<
Info
return
<
div
className=
"welcome-page"
>
<
div
className=
"welcome-page__wrapper"
>
<
Info
img=
{
<
picture
>
<
source
srcset=
"/uploads/images/assistant-final-mob.svg"
media=
{
"(max-width: 767px)"
}
/>
...
...
@@ -12,7 +14,7 @@ const WelcomeDemoFinal = D.declare( 'view.page.WelcomeDemoFinal', () => {
</
picture
>
}
buttons=
{
[
<
Button
class=
{
"button button--thirdery welcome-page__button
"
}
type=
{
"button"
}
<
Button
class=
{
"button button--primary button-orange welcome-page__button welcome-page__button--wide
"
}
type=
{
"button"
}
onclick=
{
ACTION
.
TEST
.
DEMO
.
GOTO_FINAL_LAST_NOTIFICATION
.
execute
}
>
<
span
>
Начать тестирование
</
span
><
Arr
width=
"17"
height=
"11"
/>
</
Button
>
...
...
@@ -25,6 +27,8 @@ const WelcomeDemoFinal = D.declare( 'view.page.WelcomeDemoFinal', () => {
</
div
>
</
div
>
</
Info
>
</
div
>
</
div
>
}
);
export
default
WelcomeDemoFinal
;
...
...
src/view/page/test/demo/WelcomeDemoFinalLastNotification.jsx
View file @
dd35f9ba
...
...
@@ -4,7 +4,9 @@ import Arr from "/svg/arr.svg";
import
Info
from
"/view/block/info/Info"
;
const
WelcomeDemoFinalLastNotification
=
D
.
declare
(
'view.page.WelcomeDemoFinalLastNotification'
,
()
=>
{
return
<
Info
return
<
div
className=
"welcome-page"
>
<
div
className=
"welcome-page__wrapper"
>
<
Info
img=
{
<
picture
>
<
source
srcset=
"/uploads/images/assistant-warning-mob.svg"
media=
{
"(max-width: 767px)"
}
/>
...
...
@@ -12,7 +14,7 @@ const WelcomeDemoFinalLastNotification = D.declare( 'view.page.WelcomeDemoFinalL
</
picture
>
}
buttons=
{
[
<
Button
class=
{
"button button--thirdery
welcome-page__button welcome-page__button--wide"
}
type=
{
"button"
}
<
Button
class=
{
"button button--primary button-orange
welcome-page__button welcome-page__button--wide"
}
type=
{
"button"
}
onclick=
{
ACTION
.
TEST
.
DEMO
.
GOTO_FINAL_TEST
.
execute
}
>
<
span
>
Я готов! Начать
</
span
><
Arr
width=
"17"
height=
"11"
/>
...
...
@@ -25,6 +27,8 @@ const WelcomeDemoFinalLastNotification = D.declare( 'view.page.WelcomeDemoFinalL
</
div
>
</
div
>
</
Info
>
</
div
>
</
div
>
}
);
export
default
WelcomeDemoFinalLastNotification
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment