Commit 5249e7f9 by talequale

wip

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