Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #11801 from luixxiul/fix-regression-torrentViewer
Browse files Browse the repository at this point in the history
Fix action buttons placement on torrentViewer
  • Loading branch information
cezaraugusto authored Nov 14, 2017
2 parents 13e00e8 + 2432642 commit ed9cb40
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
25 changes: 22 additions & 3 deletions js/webtorrent/components/torrentViewer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const React = require('react')
const cx = require('../../lib/classSet')

const {css} = require('aphrodite/no-important')
const {StyleSheet, css} = require('aphrodite/no-important')
const commonStyles = require('../../../app/renderer/components/styles/commonStyles')

// Components
Expand Down Expand Up @@ -99,10 +99,10 @@ class TorrentViewer extends React.Component {

return (
<div className='siteDetailsPage'>
<div className='siteDetailsPageHeader'>
<div className={css(styles.siteDetailsPage__header)}>
{titleElem}

<div className='headerActions'>
<div className={css(styles.siteDetailsPage__header__actions)}>
{mainButton}
{saveButton}
</div>
Expand All @@ -127,4 +127,23 @@ class TorrentViewer extends React.Component {
}
}

const styles = StyleSheet.create({
siteDetailsPage__header: {
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',

// See: .siteDetailsPageHeader
padding: '0 24px'
},

siteDetailsPage__header__actions: {
display: 'flex',
alignItems: 'center',

// See: .siteDetailsPageHeader
marginLeft: '24px'
}
})

module.exports = TorrentViewer
6 changes: 0 additions & 6 deletions less/webtorrent.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
.siteDetailsPage {
min-width: 704px;

.siteDetailsPageHeader {
.mainButton {
font-weight: 400;
}
}

.siteDetailsPageContent {
.sortableTable {
user-select: none;
Expand Down

0 comments on commit ed9cb40

Please sign in to comment.