Merge branch 'responsiveness' into 'master'

Responsiveness

See merge request !39
This commit is contained in:
Lucas 2017-01-28 15:42:43 +00:00
commit 92b86bbe13
4 changed files with 36 additions and 21 deletions

View File

@ -12,7 +12,7 @@ export default function ListFilter(props) {
placeholder={props.controlPlaceHolder} placeholder={props.controlPlaceHolder}
updateOn="change" updateOn="change"
/> />
<span className="input-group-btn"> <span className="input-group-btn hidden-xs">
<button className="btn btn-default btn-sm" type="button">Filter</button> <button className="btn btn-default btn-sm" type="button">Filter</button>
</span> </span>
</Form> </Form>

View File

@ -3,14 +3,28 @@ import React from 'react'
export default function ListPoster(props) { export default function ListPoster(props) {
const selected = props.selected ? ' thumbnail-selected' : ''; const selected = props.selected ? ' thumbnail-selected' : '';
const imgClass = 'thumbnail' + selected; const imgClass = 'thumbnail' + selected;
const displayClearFixLg = (props.index % 6) === 0;
const displayClearFixMd = (props.index % 4) === 0;
const displayClearFixSm = (props.index % 2) === 0;
return ( return (
<div className="col-xs-12 col-sm-6 col-md-3 col-lg-2"> <div>
<a className={imgClass}> {displayClearFixLg &&
<img <div className="clearfix visible-lg"></div>
src={props.data.poster_url} }
onClick={props.onClick} {displayClearFixMd &&
/> <div className="clearfix visible-md"></div>
</a> }
{displayClearFixSm &&
<div className="clearfix visible-sm"></div>
}
<div className="col-xs-12 col-sm-6 col-md-3 col-lg-2">
<a className={imgClass}>
<img
src={props.data.poster_url}
onClick={props.onClick}
/>
</a>
</div>
</div> </div>
); );
} }

View File

@ -48,6 +48,7 @@ export default function ListPosters(props) {
const selected = (el.imdb_id === props.selectedImdbId) ? true : false; const selected = (el.imdb_id === props.selectedImdbId) ? true : false;
return ( return (
<ListPoster <ListPoster
index={index}
data={el} data={el}
key={el.imdb_id} key={el.imdb_id}
selected={selected} selected={selected}

View File

@ -11,19 +11,6 @@ function MovieButtons(props) {
const hasMovie = (props.movie.polochon_url !== "") const hasMovie = (props.movie.polochon_url !== "")
return ( return (
<div className="list-details-buttons btn-toolbar"> <div className="list-details-buttons btn-toolbar">
{hasMovie &&
<a type="button" className="btn btn-primary btn-sm" href={props.movie.polochon_url}>
<i className="fa fa-download"></i> Download
</a>
}
{props.movie.torrents &&
<TorrentsButton
torrents={props.movie.torrents}
addTorrent={props.addTorrent}
/>
}
<ActionsButton <ActionsButton
fetching={props.fetching} fetching={props.fetching}
movieId={props.movie.imdb_id} movieId={props.movie.imdb_id}
@ -36,6 +23,19 @@ function MovieButtons(props) {
deleteFromWishlist={props.deleteFromWishlist} deleteFromWishlist={props.deleteFromWishlist}
/> />
{props.movie.torrents &&
<TorrentsButton
torrents={props.movie.torrents}
addTorrent={props.addTorrent}
/>
}
{hasMovie &&
<a type="button" className="btn btn-primary btn-sm" href={props.movie.polochon_url}>
<i className="fa fa-download"></i> Download
</a>
}
<a type="button" className="btn btn-warning btn-sm" href={imdb_link}> <a type="button" className="btn btn-warning btn-sm" href={imdb_link}>
<i className="fa fa-external-link"></i> IMDB <i className="fa fa-external-link"></i> IMDB
</a> </a>