diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/bookmarks.css b/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/bookmarks.css index 43d4bb6..ea71dca 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/bookmarks.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/bookmarks.css @@ -1,6 +1,5 @@ /*##################*/ ul { - float: left; width: 100%; padding: 0; margin: 0; @@ -19,15 +18,15 @@ li a { color: black; background-color: white; padding: 10px 15px; - margin: 0px 1px 1px 0px; + margin: 0 1px 1px 0; border: 1px solid black; border-radius: 3px; -moz-border-radius: 5px; -webkit-border-radius: 5px; - box-shadow: 0px 2px 3px gray; - -moz-box-shadow: 0px 2px 3px gray; - -webkit-box-shadow: 0px 2px 3px gray; + box-shadow: 0 2px 3px gray; + -moz-box-shadow: 0 2px 3px gray; + -webkit-box-shadow: 0 2px 3px gray; } li a:hover { diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/collapsible.css b/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/collapsible.css index 85261df..3f817ad 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/collapsible.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/css/collapsible.css @@ -3,9 +3,7 @@ /*Wersja zwinięta*/ .collapsible { /*Box alignment*/ - margin-left: 5%; - margin-right: 5%; - width: 80%; + width: 100%; /*Content alignment*/ padding: 1%; @@ -44,7 +42,7 @@ padding: 0 18px; max-height: 0; /*szerokość drabinki*/ - width: 75%; + width: 95%; overflow: hidden; transition: max-height 0.2s ease-out; background-color: #f1f1f1; diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/style.css b/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/style.css index d9766a3..b693385 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/style.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/drabinka/style.css @@ -26,10 +26,11 @@ body { display: flex; flex-direction: column; align-items: center; + flex-flow: row wrap; height: 100%; - width: 100%; - justify-content: flex-end; + width: 80%; + margin: auto; } main { @@ -39,11 +40,9 @@ main { .bookmarks { /*Alignment*/ - margin: auto; - width: 50%; + margin-left: 0; + width: 40%; height: 5vh; + float: left; - /*Others*/ - justify-content: center; - align-items: center; } \ No newline at end of file diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/src/tlo.jpg b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/src/tlo.jpg new file mode 100644 index 0000000..053b30e Binary files /dev/null and b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/src/tlo.jpg differ diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/style.css b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/style.css index 95887e7..77cd627 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/style.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy na turniej/style.css @@ -3,7 +3,7 @@ /*Layer 0*/ html { - background-image: url(src/tlo_logowanie.png); + background-image: url(src/tlo.jpg); background-attachment: fixed; background-size: cover; diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/bookmarks.css b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/bookmarks.css index 43d4bb6..1c7a405 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/bookmarks.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/bookmarks.css @@ -19,15 +19,15 @@ li a { color: black; background-color: white; padding: 10px 15px; - margin: 0px 1px 1px 0px; + margin: 0 1px 1px 0; border: 1px solid black; border-radius: 3px; -moz-border-radius: 5px; -webkit-border-radius: 5px; - box-shadow: 0px 2px 3px gray; - -moz-box-shadow: 0px 2px 3px gray; - -webkit-box-shadow: 0px 2px 3px gray; + box-shadow: 0 2px 3px gray; + -moz-box-shadow: 0 2px 3px gray; + -webkit-box-shadow: 0 2px 3px gray; } li a:hover { diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/css/collapsible.css b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/css/collapsible.css index 85261df..16d72c2 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/css/collapsible.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/css/collapsible.css @@ -3,9 +3,7 @@ /*Wersja zwinięta*/ .collapsible { /*Box alignment*/ - margin-left: 5%; - margin-right: 5%; - width: 80%; + width: 100%; /*Content alignment*/ padding: 1%; @@ -41,11 +39,17 @@ /*Wersja rozwinięta*/ .collapsibleContent { - padding: 0 18px; - max-height: 0; + /*szerokość drabinki*/ - width: 75%; + width: 95%; + margin:auto; + + /*Visual*/ + background-color: #f1f1f1; + + /*Efekt rozwinięcia*/ + max-height: 0; overflow: hidden; transition: max-height 0.2s ease-out; - background-color: #f1f1f1; + } \ No newline at end of file diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/index.html b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/index.html index 23b56a0..bcaacdf 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/index.html +++ b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/index.html @@ -8,7 +8,7 @@ Padel Tournaments System - + @@ -41,10 +41,77 @@ - diff --git a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/style.css b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/style.css index 6ef3ef1..0abc9ad 100644 --- a/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/style.css +++ b/frontend/normal_user/_main page/pojedynczy_turniej/zapisy/style.css @@ -4,6 +4,7 @@ @import "../../../../_global/header.css"; @import "bookmarks.css"; @import "../../../../_global/style.css"; +@import '~pretty-checkbox/src/pretty-checkbox.scss'; body { @@ -16,11 +17,11 @@ body { display: flex; flex-direction: column; align-items: center; - /*flex-flow: row wrap;*/ + margin: auto; + flex-flow: row wrap; height: 100%; - width: 100%; - justify-content: flex-end; + width: 80%; } main { @@ -61,21 +62,66 @@ main { .bookmarks { /*Alignment*/ - margin: auto; - width: 50%; + margin-left: 0; + width: 40%; height: 5vh; + float: left; - /*Others*/ - justify-content: center; - align-items: center; } +/*Participant Box*/ .participant { + /*Size and alignment*/ height: 10vh; - width: 50%; + width: 49.842%; + float: left; - background-color: #0f64f2; - color: #CF2323; + /*Font*/ + font-family: 'Montserrat', serif; + font-weight: 600; + font-size: 18px; + color: #828282; + + /*Visual*/ + background-color: #FFFFFF; + border: 1px solid #AFAFAF; + padding: -2px; +} +/*2'nd Layer*/ +.partID { + width: 6%; + height: 100%; + float: left; + + box-sizing: border-box; + padding-top: 6%; + + text-align: center; + padding-bottom: 0; +} +.partNames{ + width: 47%; + height: 100%; + float: left; + + box-sizing: border-box; + padding-left: 2%; + padding-top: 2%; + + line-height: 200%; + +} +.partParameters{ + width: 47%; + height: 100%; + float: left; + text-align: right; + + /*Padding doesn't change the size of the box*/ + box-sizing: border-box; + /*padding-left: 2%;*/ + padding-top: 2%; + padding-right: 2%; border: 1px solid black; } @@ -85,4 +131,5 @@ main { height: auto; display: flex; flex-direction: column; + line-height: 200%; } \ No newline at end of file diff --git a/frontend/normal_user/logowanie/rejestracja/style.css b/frontend/normal_user/logowanie/rejestracja/style.css index 4bb5fa6..5ff971d 100644 --- a/frontend/normal_user/logowanie/rejestracja/style.css +++ b/frontend/normal_user/logowanie/rejestracja/style.css @@ -3,7 +3,7 @@ /*Layer 0*/ html { - background-image: url(../src/mezczyzna_padel.jpg); + background-image: url(../src/tlo.jpg); background-attachment: fixed; background-size: cover; diff --git a/frontend/normal_user/logowanie/src/tlo.jpg b/frontend/normal_user/logowanie/src/tlo.jpg new file mode 100644 index 0000000..053b30e Binary files /dev/null and b/frontend/normal_user/logowanie/src/tlo.jpg differ diff --git a/frontend/normal_user/logowanie/style.css b/frontend/normal_user/logowanie/style.css index 7a25fb2..0e2a386 100644 --- a/frontend/normal_user/logowanie/style.css +++ b/frontend/normal_user/logowanie/style.css @@ -2,7 +2,7 @@ /*Layer 0*/ html { - background-image: url(src/tlo_logowanie.png); + background-image: url(src/tlo.jpg); background-attachment: fixed; background-size: cover;