Skip to content

Commit 47fb8d1

Browse files
committed
some bootstrap styling fixes
1 parent 6ac9109 commit 47fb8d1

File tree

1 file changed

+44
-36
lines changed

1 file changed

+44
-36
lines changed

src/App.js

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -297,16 +297,14 @@ class App extends Component {
297297
}
298298

299299
removePatternFromPlaylist = async (pattern, clickedPlaylistIndex, playlistIndex) => {
300-
if (clickedPlaylistIndex !== playlistIndex) {
301-
console.log(`removing pattern ${pattern.name} from playlist`)
302-
const newTempPlaylist = this.state.playlist.slice()
303-
newTempPlaylist.splice(clickedPlaylistIndex, 1)
304-
setTimeout(() => {
305-
const name = pattern.name
306-
this.storePlaylist(name, null, "remove")
307-
}, 100)
308-
this._launchPlaylistNow()
309-
}
300+
console.log(`removing pattern ${pattern.name} from playlist`)
301+
const newTempPlaylist = this.state.playlist.slice()
302+
newTempPlaylist.splice(clickedPlaylistIndex, 1)
303+
setTimeout(() => {
304+
const name = pattern.name
305+
this.storePlaylist(name, null, "remove")
306+
}, 100)
307+
this._launchPlaylistNow()
310308
}
311309

312310
_handleAddClick = async (event, pattern) => {
@@ -574,6 +572,7 @@ class App extends Component {
574572
</div>
575573
)
576574
}
575+
577576
return (
578577
<div className="container">
579578
<header className="header clearfix">
@@ -590,13 +589,15 @@ class App extends Component {
590589
<main role="main">
591590
<hr/>
592591

593-
<div className="row">
594-
<div className="col-lg-12">
595-
592+
<div className="row mx-xl-n2 mx-lg-n3 mx-md-n3 mx-n2">
593+
<div className="py-1 col-xl-10 px-xl-2 col-lg-9 px-lg-3 col-md-8 px-md-3 col-6 px-1">
596594
<div className="row no-gutters">
597595
<h3>Controllers
598-
<button className="btn btn-primary " onClick={this.handleReload} style={{marginLeft:"1em"}}></button>
596+
<button className="btn btn-primary " onClick={this.handleReload} style={{marginLeft:"6px"}}></button>
599597
</h3>
598+
</div>
599+
</div>
600+
<div className="py-1 col-xl-1 px-xl-1 col-lg-3 px-lg-5 col-md-4 px-md-5 col-2 px-1">
600601
<div className="navbrightness no-learning-ui row no-gutters pull-right">
601602
<label>
602603
<span role="img" aria-label="light bulb emoji for pixelblaze brightness">💡</span>
@@ -615,8 +616,9 @@ class App extends Component {
615616
/>
616617
</label>
617618
</div>
618-
</div>
619-
<ul className="list-group col-lg-8" id="list">
619+
</div>
620+
<div className="col-lg-12">
621+
<ul className="list-group" id="list">
620622
{this.state.discoveries.map(d => {
621623
const dName = d.name
622624
return (
@@ -638,26 +640,32 @@ class App extends Component {
638640

639641
{cloneDialog}
640642
{playlistDialog}
641-
<h3>
642-
Patterns
643-
<button
644-
className="btn btn-secondary float-right text-left btn-playlist-bulk"
645-
onClick={(e) => this.openPlaylistDialog(e)}>
646-
View Current Playlist
647-
</button>
648-
<button
649-
className="btn btn-secondary float-right text-left playlist btn-playlist-bulk"
650-
disabled={this.state.deactivateDisableAllButton}
651-
onClick={this.disableAllPatterns}>
652-
Disable All
653-
</button>
654-
<button
655-
className="btn btn-secondary float-right text-left playlist btn-playlist-bulk"
656-
disabled={this.state.deactivateEnableAllButton}
657-
onClick={this.enableAllPatterns}>
658-
Enable All
659-
</button>
660-
</h3>
643+
<div className="row mx-xl-n4 mx-n4">
644+
<div className="py-1 col-xl-7 px-xl-4 col-3 px-4">
645+
<h3>
646+
Patterns
647+
</h3>
648+
</div>
649+
<div className="py-2 col-xl-5 px-xl-5 col-12 px-4">
650+
<button
651+
className="btn btn-secondary text-left playlist btn-playlist-bulk"
652+
disabled={this.state.deactivateEnableAllButton}
653+
onClick={this.enableAllPatterns}>
654+
Enable All
655+
</button>
656+
<button
657+
className="btn btn-secondary text-left playlist btn-playlist-bulk"
658+
disabled={this.state.deactivateDisableAllButton}
659+
onClick={this.disableAllPatterns}>
660+
Disable All
661+
</button>
662+
<button
663+
className="btn btn-secondary text-left btn-playlist-bulk"
664+
onClick={(e) => this.openPlaylistDialog(e)}>
665+
View Current Playlist
666+
</button>
667+
</div>
668+
</div>
661669
<div className="list-group">
662670
{(this.state.isProcessing) &&
663671
<div className="loader-container" role="status">

0 commit comments

Comments
 (0)