Merge remote-tracking branch 'origin/master'

# Conflicts:
#	frontend/panel_organizatora/style.css
#	frontend/style.css
#	frontend/zalogowany_organizator/style.css
This commit is contained in:
Lewy 2022-05-31 16:39:04 +02:00
commit c7b7a78cc9
6 changed files with 18 additions and 4 deletions

View File

@ -3,6 +3,7 @@
body { body {
background-color: #EBEBEB; background-color: #EBEBEB;
margin: 0;
} }
.form { .form {

View File

@ -56,4 +56,3 @@ html {
padding: 5px 15px; padding: 5px 15px;
width: 50%; width: 50%;
} }

View File

@ -1,5 +1,10 @@
@import "../_global/header.css"; @import "../_global/header.css";
body {
margin: 0;
}
.container { .container {
height: 100%; height: 100%;
width: 100%; width: 100%;

View File

@ -1,6 +1,10 @@
@import "_global/header.css"; @import "_global/header.css";
@import "event.css"; @import "event.css";
body {
margin: 0;
}
.container { .container {
height: 100%; height: 100%;
width: 100%; width: 100%;

View File

@ -1,5 +1,10 @@
@import "../_global/header.css"; @import "../_global/header.css";
body {
margin: 0;
}
.container { .container {
height: 100%; height: 100%;
width: 100%; width: 100%;