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 {
background-color: #EBEBEB;
margin: 0;
}
.form {
@ -47,4 +48,4 @@ body {
/* DARK GREY */
color: #828282;
}
}

View File

@ -55,5 +55,4 @@ html {
font-size: 12px;
padding: 5px 15px;
width: 50%;
}
}

View File

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

View File

@ -16,7 +16,7 @@ html {
height: 40%;
background-color: #EBEBEB;
display: flex;
;
;
justify-content: center;
align-items: center;
}

View File

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

View File

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