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:
@ -1,22 +1,22 @@
|
||||
.sideinfo {
|
||||
width: 20%;
|
||||
float: left;
|
||||
padding: 20px;
|
||||
margin-top: 25px;
|
||||
margin-left: 15px;
|
||||
border-radius: 20px;
|
||||
border: 2px #3574fe solid;
|
||||
border-radius: 20px;
|
||||
float: left;
|
||||
margin-left: 15px;
|
||||
margin-top: 25px;
|
||||
overflow: hidden;
|
||||
padding: 20px;
|
||||
width: 20%;
|
||||
}
|
||||
|
||||
.sidebartitle {
|
||||
font-weight: bold;
|
||||
font-size: larger;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.sidebarinfo {
|
||||
margin-top: 5px;
|
||||
border-radius: 5px;
|
||||
margin-top: 5px;
|
||||
padding: 2px 10px 2px 15px;
|
||||
width: 220px;
|
||||
}
|
||||
|
Reference in New Issue
Block a user