Merge branch 'subtitles' into 'master'

Fix show buttons layout

See merge request !73
This commit is contained in:
Lucas 2017-05-29 12:56:06 +00:00
commit e53306686f
2 changed files with 6 additions and 6 deletions

View File

@ -186,9 +186,10 @@ function Episode(props) {
/>
{props.data.episode}
</th>
<td className="col-xs-5">{props.data.title}</td>
<td className="col-xs-6 list-details-button">
<span className="pull-right episode-buttons btn-toolbar">
<td className="col-xs-12">
{props.data.title}
<span className="pull-right episode-buttons">
<SubtitlesButton
url={props.data.polochon_url}
subtitles={props.data.subtitles}

View File

@ -47,9 +47,8 @@ body {
}
.episode-buttons {
display: flex;
span {
margin-left: 5px;
div, span {
margin: 2px;
}
}