From 60962eaed1dfe7dec97951bcccbe69181fd63308 Mon Sep 17 00:00:00 2001 From: Lewy Date: Wed, 1 Jun 2022 15:49:42 +0200 Subject: [PATCH] =?UTF-8?q?style:=20Zmiana=20nag=C5=82=C3=B3wka=20na=20zgo?= =?UTF-8?q?dny=20z=20nowym=20standardem=20bez=20naprawy=20b=C5=82=C4=99d?= =?UTF-8?q?=C3=B3w=20rozbie=C5=BCno=C5=9Bci=20mi=C4=99dzy=20stronami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/_global/header.css | 101 ++++++++++++--------- frontend/_global/logo.svg | 9 ++ frontend/cup.svg | 8 ++ frontend/dodawanie turnieju/index.html | 17 ++-- frontend/drabinka/index.html | 15 +-- frontend/event.css | 1 - frontend/index.html | 39 +++++--- frontend/panel_organizatora/index.html | 19 ++-- frontend/single_tournament.css | 79 ++++++++++++++++ frontend/style.css | 1 + frontend/zalogowany_organizator/index.html | 19 ++-- 11 files changed, 221 insertions(+), 87 deletions(-) create mode 100644 frontend/_global/logo.svg create mode 100644 frontend/cup.svg create mode 100644 frontend/single_tournament.css diff --git a/frontend/_global/header.css b/frontend/_global/header.css index 731c8d6..0a002b1 100644 --- a/frontend/_global/header.css +++ b/frontend/_global/header.css @@ -1,54 +1,69 @@ +/*Main container*/ +header { + /*Box alignment*/ + display: flex; + margin: auto auto 1%; + + /*Content alignment*/ + flex-flow: row wrap; + align-items: center; + justify-content: space-between; + padding: 10px 30px 10px 30px; + + /*Visual*/ + background-color: #FFFFFF; + border-bottom: 1px solid #333333; +} + + +/*Second level*/ +.logoBox { + width: 20%; + height: 100%; + float: left; +} + +.linkBox { + width: 80%; + height: 100%; + float: right; + flex-flow: nowrap; + align-items: center; +} + +/*Content alignment*/ .logo { - width: 150px; - height: 30px; + height: 100%; + float: left; } .header_link{ text-align: center; line-height: 2; - color: white; - text-decoration: none; + + font-family: Montserrat, serif; + font-style: normal; + font-size: 18px; + color: #828282; + + float: right; + margin-left: 10%; } -.loginn { - background-color: skyblue; - border-radius: 31px; - border: 1px solid skyblue; +.loginButton { + /*Alignment*/ + float: right; + margin-left: 10%; + padding: 0.5% 1% 0.5% 1%; + + /*Button visual*/ + background-color: #007C36; + border-radius: 15px; + border: 1px solid; cursor: pointer; + + /*Text visual*/ color: #ffffff; - font-family: Arial; - text-decoration: none; - height: 30px; - + font-family: Montserrat, serif; + font-size: 18px; } - -header { - display: flex; - flex-flow: row wrap; - align-items: center; - justify-content: space-between; - background-color: #0f64f2; - margin: auto; - padding-top: 10px; - padding-bottom: 10px; - padding-right: 30px; - padding-left: 10px; - -} - -header>p { - text-align: center; - line-height: 0; -} - -@media all and (max-width: 800px) { - header { - justify-content: space-around; - } -} - -@media all and (max-width: 800px) { - header { - flex-direction: column; - } -} \ No newline at end of file diff --git a/frontend/_global/logo.svg b/frontend/_global/logo.svg new file mode 100644 index 0000000..2fa2b25 --- /dev/null +++ b/frontend/_global/logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/frontend/cup.svg b/frontend/cup.svg new file mode 100644 index 0000000..e93fe72 --- /dev/null +++ b/frontend/cup.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/frontend/dodawanie turnieju/index.html b/frontend/dodawanie turnieju/index.html index 7e560dc..23c4a97 100644 --- a/frontend/dodawanie turnieju/index.html +++ b/frontend/dodawanie turnieju/index.html @@ -11,13 +11,16 @@
- - Kalendarz turniejów - Ranking - Wyniki -
- -
+
+ +
+
+ + + Kontakt + Ranking + Kalendarz turniejów +
diff --git a/frontend/drabinka/index.html b/frontend/drabinka/index.html index 6b33177..29c0794 100644 --- a/frontend/drabinka/index.html +++ b/frontend/drabinka/index.html @@ -15,12 +15,15 @@
- - Turnieje - Rozgrywki - Ustawienia - Panel uczestnika - JM +
+ +
+
+ + + Kontakt + Ranking + Kalendarz turniejów
diff --git a/frontend/event.css b/frontend/event.css index bdf8e38..ad7fb72 100644 --- a/frontend/event.css +++ b/frontend/event.css @@ -23,7 +23,6 @@ border: solid; border-color: lightgray; padding: 10px; - } .eventInside>p { diff --git a/frontend/index.html b/frontend/index.html index 62bc11f..c78fcef 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -11,17 +11,36 @@
- - Kalendarz turniejów - Ranking - Wyniki -
- -
+
+ +
+
+ + Kontakt + Ranking + Kalendarz turniejów
+ + + + +
+
+
+ +
+ +
+
+ Tu jest text +
+
+ +
+
Nadchodzące turnieje
Turniej majowy 2022 @@ -37,14 +56,8 @@
- - - -
-
-
diff --git a/frontend/panel_organizatora/index.html b/frontend/panel_organizatora/index.html index 339b6a6..d151cf2 100644 --- a/frontend/panel_organizatora/index.html +++ b/frontend/panel_organizatora/index.html @@ -8,14 +8,19 @@
- - Wiadomości - Kalendarz turniejów - Ranking - Drabinka - Kontakt - JM +
+ +
+
+ + + Kontakt + Ranking + Kalendarz turniejów +
+ +