Merge branch 'spacebetweenvideoactions' into 'master'
improved coloring of videoaction buttons on player page See merge request lukas/openmediacenter!25
This commit is contained in:
		@@ -174,11 +174,14 @@ class Player extends React.Component {
 | 
				
			|||||||
                            options={this.options}/> :
 | 
					                            options={this.options}/> :
 | 
				
			||||||
                        <div>not loaded yet</div>}
 | 
					                        <div>not loaded yet</div>}
 | 
				
			||||||
                    <div className={style.videoactions}>
 | 
					                    <div className={style.videoactions}>
 | 
				
			||||||
                        <button className='btn btn-primary' onClick={() => this.likebtn()}>Like this Video!</button>
 | 
					                        <button className={style.button} style={{backgroundColor: 'green'}} onClick={() => this.likebtn()}>Like this Video!</button>
 | 
				
			||||||
                        <button className='btn btn-info' onClick={() => this.setState({popupvisible: true})}>Give this
 | 
					                        <button className={style.button} style={{backgroundColor: '#3574fe'}} onClick={() => this.setState({popupvisible: true})}>
 | 
				
			||||||
                                                                                                             Video a Tag
 | 
					                            Give this Video a Tag
 | 
				
			||||||
 | 
					                        </button>
 | 
				
			||||||
 | 
					                        <button className={style.button} style={{backgroundColor: 'red'}} onClick={() => {
 | 
				
			||||||
 | 
					                            this.deleteVideo();
 | 
				
			||||||
 | 
					                        }}>Delete Video
 | 
				
			||||||
                        </button>
 | 
					                        </button>
 | 
				
			||||||
                        <button className='btn btn-danger' onClick={() => {this.deleteVideo();}}>Delete Video</button>
 | 
					 | 
				
			||||||
                    </div>
 | 
					                    </div>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                <button className={style.closebutton} onClick={() => this.closebtn()}>Close</button>
 | 
					                <button className={style.closebutton} onClick={() => this.closebtn()}>Close</button>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,3 +19,11 @@
 | 
				
			|||||||
.videoactions {
 | 
					.videoactions {
 | 
				
			||||||
    margin-top: 15px;
 | 
					    margin-top: 15px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.button {
 | 
				
			||||||
 | 
					    padding: 6px;
 | 
				
			||||||
 | 
					    border-radius: 5px;
 | 
				
			||||||
 | 
					    margin-right: 15px;
 | 
				
			||||||
 | 
					    color: white;
 | 
				
			||||||
 | 
					    border-width: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user