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
5249e7f9
Commit
5249e7f9
authored
Jan 30, 2020
by
talequale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip
parent
328caf10
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
29 deletions
+27
-29
Card.jsx
src/view/cmp/card/Card.jsx
+1
-1
card.scss
src/view/cmp/card/card.scss
+4
-6
CardSlider.jsx
src/view/cmp/cardSlider/CardSlider.jsx
+8
-7
CardSlider.scss
src/view/cmp/cardSlider/CardSlider.scss
+13
-14
Account.jsx
src/view/page/account/Account.jsx
+1
-1
No files found.
src/view/cmp/card/Card.jsx
View file @
5249e7f9
...
...
@@ -10,7 +10,7 @@ const Card = D.declare('view.cmp.Card', (cfg) => {
<
div
className=
"card__image"
>
<
img
src=
{
cfg
.
image
}
alt=
""
/>
</
div
>
<
h3
className=
"card__title"
><
Format
>
{
cfg
.
title
}
</
Format
></
h3
>
<
h3
className=
"card__title"
><
span
><
Format
>
{
cfg
.
title
}
</
Format
></
span
></
h3
>
<
div
className=
"card__footer"
>
{
cfg
.
disabled
?
null
:(
cfg
.
seen
?
...
...
src/view/cmp/card/card.scss
View file @
5249e7f9
...
...
@@ -62,11 +62,6 @@ $cardTypes: (
}
}
.cards-list
{
display
:
flex
;
flex-wrap
:
wrap
;
}
.card__image
{
width
:
140px
;
height
:
90px
;
...
...
@@ -87,7 +82,6 @@ $cardTypes: (
flex-grow
:
1
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
margin
:
10px
0
;
max-width
:
100%
;
max-height
:
4em
;
...
...
@@ -98,6 +92,10 @@ $cardTypes: (
overflow
:
hidden
;
}
.card__title
span
{
margin
:
auto
0
;
}
button
.card__button
{
@include
hover
;
color
:
$bg-main
;
...
...
src/view/cmp/cardSlider/CardSlider.jsx
View file @
5249e7f9
...
...
@@ -75,10 +75,12 @@ const CardSlider = D.declare( 'view.cmp.CardSlider', (cfg) => {
clearTimeout
(
waitTimeout
);
waitTimeout
=
setTimeout
(
tuneScrollPosition
,
200
);
};
let
dom
;
let
theDOM
=
<
div
class=
"card-slider"
>
let
dom
=
<
div
class=
'cmp-CardSlider'
>
{
wrap
=
<
div
class=
'slides-wrap'
>
{
' '
}
</
div
>
}
{
dom
=
<
div
class=
'card-slider__scroller'
>
{
wrap
=
<
div
class=
'card-slider__wrapper'
>
{
' '
}
</
div
>
}
</
div
>
}
</
div
>;
let
lastFrom
,
lastTo
,
last
=
false
;
...
...
@@ -96,7 +98,7 @@ const CardSlider = D.declare( 'view.cmp.CardSlider', (cfg) => {
if
(
!
(
i
in
hash
)){
hash
[
i
]
=
{
dom
:
(
function
(
item
,
n
)
{
return
<
div
className=
"card
s-list
__item"
>
return
<
div
className=
"card
-slider
__item"
>
<
Card
type=
{
'product,info,other'
.
split
(
','
)[
n
%
3
]
}
disabled=
{
n
%
5
===
0
}
...
...
@@ -151,8 +153,8 @@ const CardSlider = D.declare( 'view.cmp.CardSlider', (cfg) => {
});
return
dom
;
return
theDOM
;
}
);
export
default
CardSlider
;
export
{
CardSlider
};
\ No newline at end of file
export
{
CardSlider
};
src/view/cmp/cardSlider/CardSlider.scss
View file @
5249e7f9
.slides-wrap
{
min-height
:
260px
;
.card-slider__scroller
{
width
:
100%
;
position
:
relative
;
overflow-x
:
scroll
;
}
.cmp-CardSlider
{
width
:
100%
;
position
:
relative
;
overflow-x
:
scroll
;
.card-slider__wrapper
{
min-height
:
260px
;
}
.cards-list__item
{
position
:
absolute
;
display
:
flex
;
flex-direction
:
column
;
//margin-right: 30px;
margin-bottom
:
30px
;
}
\ No newline at end of file
.card-slider__item
{
position
:
absolute
;
display
:
flex
;
flex-direction
:
column
;
margin-bottom
:
30px
;
}
src/view/page/account/Account.jsx
View file @
5249e7f9
...
...
@@ -19,7 +19,7 @@ const Account = D.declare('view.page.Account', () => {
</
div
>
<
div
class=
"account-page__content"
>
<
div
class=
"account-page__content-inner"
>
<
div
class=
"
cards-list
"
>
<
div
class=
"
account-page__cards
"
>
<
h2
class=
"readers-only"
>
Список непросмотренных карточек
</
h2
>
<
CardSlider
items=
{
_
=>
store
.
sub
(
...
...
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