diff --git a/frontend/drabinka/css/collapsible.css b/frontend/drabinka/css/collapsible.css new file mode 100644 index 0000000..a50a176 --- /dev/null +++ b/frontend/drabinka/css/collapsible.css @@ -0,0 +1,42 @@ +/*COLLAPSIBLE*/ + +/*Wersja zwinięta*/ +.collapsible { + background-color: #777; + color: white; + cursor: pointer; + padding: 18px; + /*szerokość zwiniętego boxa*/ + width: 100%; + border: none; + text-align: left; + outline: none; + font-size: 15px; +} + +.active, .collapsible:hover { + background-color: #555; +} + +.collapsible:after { + content: '\002B'; + color: white; + font-weight: bold; + float: right; + margin-left: 5px; +} + +.active:after { + content: "\2212"; +} + +/*Wersja rozwinięta*/ +.content { + padding: 0 18px; + max-height: 0; + /*szerokość drabinki*/ + width: 75%; + overflow: hidden; + transition: max-height 0.2s ease-out; + background-color: #f1f1f1; +} \ No newline at end of file diff --git a/frontend/drabinka/css/li.css b/frontend/drabinka/css/li.css new file mode 100644 index 0000000..d0aeae4 --- /dev/null +++ b/frontend/drabinka/css/li.css @@ -0,0 +1,36 @@ +li.game { + padding-left: 20px; +} + +li.game.winner { + font-weight: bold; +} + +/*Tekst wewnątrz boxa*/ +li.game span { + float: right; + margin-right: 10px; +} + +/*Górna linia drabinki*/ +li.game-top { + border-bottom: 1px solid #aaa; +} + +/*Róznica wysokości między rundami*/ +li.game-spacer { + border-right: 1px solid #aaa; + min-height: 40px; +} + +/*Dolna linia drabinki*/ +li.game-bottom { + border-top: 1px solid #aaa; +} + +/*Box drużyny*/ +li.teambox { + border-radius: 25px; + background-color: #FFFFFF; + padding: 10px; +} \ No newline at end of file diff --git a/frontend/drabinka/css/round.css b/frontend/drabinka/css/round.css new file mode 100644 index 0000000..1ccb313 --- /dev/null +++ b/frontend/drabinka/css/round.css @@ -0,0 +1,22 @@ + +.round { + display: flex; + flex-direction: column; + justify-content: center; + width: 200px; + list-style: none; + padding: 0; +} + +.round .spacer { + flex-grow: 1; +} + +.round .spacer:first-child, +.round .spacer:last-child { + flex-grow: .5; +} + +.round .game-spacer { + flex-grow: 1; +} diff --git a/frontend/drabinka/style.css b/frontend/drabinka/css/style.css similarity index 58% rename from frontend/drabinka/style.css rename to frontend/drabinka/css/style.css index d78e3bf..fd611eb 100644 --- a/frontend/drabinka/style.css +++ b/frontend/drabinka/css/style.css @@ -1,7 +1,19 @@ +@import "li.css"; +@import "collapsible.css"; +@import "round.css"; + + /* * Flex Layout Specifics */ +body { + background-color: #C0C0C0; + font-family: sans-serif; + font-size: small; + padding: 10px; + line-height: 1.4em; +} img { width: 150px; @@ -43,7 +55,7 @@ header { flex-flow: row wrap; align-items: center; justify-content: space-between; - background-color: #0f64f2; + background-color: #065FD4; margin: auto; padding-top: 10px; padding-bottom: 10px; @@ -52,8 +64,6 @@ header { } - - header>p { text-align: center; line-height: 0; @@ -78,28 +88,6 @@ header>p { align-items: center; } -.round { - display: flex; - flex-direction: column; - justify-content: center; - width: 200px; - list-style: none; - padding: 0; -} - -.round .spacer { - flex-grow: 1; -} - -.round .spacer:first-child, -.round .spacer:last-child { - flex-grow: .5; -} - -.round .game-spacer { - flex-grow: 1; -} - /* * Flex Layout Specifics */ @@ -108,60 +96,3 @@ main { flex-direction: row; } -.round { - display: flex; - flex-direction: column; - justify-content: center; - width: 200px; - list-style: none; - padding: 0; -} - -.round .spacer { - flex-grow: 1; -} - -.round .spacer:first-child, -.round .spacer:last-child { - flex-grow: .5; -} - -.round .game-spacer { - flex-grow: 1; -} - -/* - * General Styles -*/ -body { - font-family: sans-serif; - font-size: small; - padding: 10px; - line-height: 1.4em; -} - -li.game { - padding-left: 20px; -} - -li.game.winner { - font-weight: bold; -} - -li.game span { - float: right; - margin-right: 5px; -} - -li.game-top { - border-bottom: 1px solid #aaa; -} - -li.game-spacer { - border-right: 1px solid #aaa; - min-height: 40px; -} - -li.game-bottom { - border-top: 1px solid #aaa; -} \ No newline at end of file diff --git a/frontend/drabinka/index.html b/frontend/drabinka/index.html index 833f13a..268a863 100644 --- a/frontend/drabinka/index.html +++ b/frontend/drabinka/index.html @@ -5,14 +5,17 @@ - Document - - + Padel Tournaments System + + + + +
- + Wiadomości Kalendarz turniejów Ranking @@ -23,111 +26,184 @@

Padel tournament

-
- + + +
+
- + + \ No newline at end of file diff --git a/frontend/drabinka/myscript.js b/frontend/drabinka/myscript.js new file mode 100644 index 0000000..ca79021 --- /dev/null +++ b/frontend/drabinka/myscript.js @@ -0,0 +1,14 @@ +var coll = document.getElementsByClassName("collapsible"); +var i; + +for (i = 0; i < coll.length; i++) { + coll[i].addEventListener("click", function() { + this.classList.toggle("active"); + var content = this.nextElementSibling; + if (content.style.maxHeight){ + content.style.maxHeight = null; + } else { + content.style.maxHeight = content.scrollHeight + "px"; + } + }); +} \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index bc86b1b..8496a91 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -5,18 +5,18 @@ - Strona główna + Padel Tournaments System
- - Wiadomości + + Kalendarz turniejów Ranking Wyniki - Kontakt +
diff --git a/frontend/logowanie/index.html b/frontend/logowanie/index.html index e4ca6c1..48d3360 100644 --- a/frontend/logowanie/index.html +++ b/frontend/logowanie/index.html @@ -5,7 +5,7 @@ - Paddle tournament system + Padel Tournaments System diff --git a/frontend/panel_organizatora/index.html b/frontend/panel_organizatora/index.html index f8890ab..60a02a6 100644 --- a/frontend/panel_organizatora/index.html +++ b/frontend/panel_organizatora/index.html @@ -1,16 +1,14 @@ - Todo App + Padel Tournaments System - -
- + Wiadomości Kalendarz turniejów Ranking @@ -42,11 +40,11 @@ } button.edit { - padding: 10; + padding: 10px; } button.delete { - padding: 10; + padding: 10px; } button { diff --git a/frontend/rejestracja/index.html b/frontend/rejestracja/index.html index e241251..66c619e 100644 --- a/frontend/rejestracja/index.html +++ b/frontend/rejestracja/index.html @@ -5,10 +5,9 @@ - Paddle tournament system + Padel Tournaments System - @@ -43,15 +42,14 @@ +
+ +
-
-
- -
-

Zapomniałeś hasła?
+ Masz już konto? Zaloguj się diff --git a/frontend/rejestracja/myscript.js b/frontend/rejestracja/myscript.js index 6a1c862..2b2ec61 100644 --- a/frontend/rejestracja/myscript.js +++ b/frontend/rejestracja/myscript.js @@ -17,18 +17,18 @@ form.addEventListener('submit', function (e) { e.preventDefault(); }); -<<<<<<< HEAD +// <<<<<<< HEAD // var token = ""; // // document.getElementById("loginButton").addEventListener("click", function () { // // document.getElementById("login").style.display = "block"; // // }); -======= -//REST API -var token = ""; -document.getElementById("loginButton").addEventListener("click", function () { - document.getElementById("login").style.display = "block"; -}); ->>>>>>> b44b5f1fc14af7c8da4ca602072af953974b49af +// // ======= +// //REST API +// var token = ""; +// document.getElementById("loginButton").addEventListener("click", function () { +// document.getElementById("login").style.display = "block"; +// }); +// >>>>>>> b44b5f1fc14af7c8da4ca602072af953974b49af // // document.getElementById("regButton").addEventListener("click", function () { // // document.getElementById("reg").style.display = "block"; diff --git a/frontend/zalogowany_organizator/index.html b/frontend/zalogowany_organizator/index.html index 7764cd2..3afe144 100644 --- a/frontend/zalogowany_organizator/index.html +++ b/frontend/zalogowany_organizator/index.html @@ -5,13 +5,13 @@ - Strona główna + Padel Tournaments System
- + Wiadomości Kalendarz turniejów Ranking