Merge branch 'master' into csstheming

# Conflicts:
#	src/elements/PageTitle/PageTitle.module.css
#	src/elements/Preview/Preview.module.css
#	src/elements/SideBar/SideBar.module.css
#	src/index.css
#	src/pages/Player/Player.js
#	src/pages/Player/Player.module.css
#	src/pages/SettingsPage/SettingsPage.module.css
This commit is contained in:
2020-08-05 22:55:03 +02:00
24 changed files with 147 additions and 185 deletions

View File

@ -1,17 +1,18 @@
.closebutton {
color: white;
background-color: #FF0000;
border: none;
border-radius: 10px;
padding: 5px 15px 5px 15px;
background-color: #FF0000;
margin-top: 25px;
color: white;
margin-left: 25px;
margin-top: 25px;
padding: 5px 15px 5px 15px;
}
.videowrapper {
margin-left: 20px;
display: block;
float: left;
margin-left: 20px;
margin-top: 25px;
width: 60%;
margin-top: 20px;
}