From 466f6952d450c3b7629177497b435f3cc21b6c21 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 10:54:43 +0100 Subject: [PATCH 01/19] z-index --- assets/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/style.css b/assets/style.css index 48a228f..1d45ea5 100644 --- a/assets/style.css +++ b/assets/style.css @@ -31,6 +31,7 @@ nav { -moz-box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2); box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2); height: 75px !important; + z-index: 500; } ul { @@ -155,6 +156,7 @@ header hr { max-height: 0; border: 0 solid transparent; transition: max-height 0.1s ease, border 0.1s ease; + z-index: 999; } .navsite_item:hover .navpage_list { From c5fa19cfd56f73f51046444733eae0a71a063e14 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 10:56:24 +0100 Subject: [PATCH 02/19] relative pos --- assets/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/style.css b/assets/style.css index 1d45ea5..6deb869 100644 --- a/assets/style.css +++ b/assets/style.css @@ -31,6 +31,7 @@ nav { -moz-box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2); box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2); height: 75px !important; + position: relative; z-index: 500; } @@ -156,6 +157,7 @@ header hr { max-height: 0; border: 0 solid transparent; transition: max-height 0.1s ease, border 0.1s ease; + position: relative; z-index: 999; } From c40ab302961056c35c4141bb496780da6da1b2c4 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 10:59:26 +0100 Subject: [PATCH 03/19] slow animations of dropdown --- assets/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/style.css b/assets/style.css index 6deb869..1a13b4c 100644 --- a/assets/style.css +++ b/assets/style.css @@ -156,7 +156,7 @@ header hr { overflow: hidden; max-height: 0; border: 0 solid transparent; - transition: max-height 0.1s ease, border 0.1s ease; + transition: max-height 0.3s ease, border 0.2s ease; position: relative; z-index: 999; } @@ -169,7 +169,7 @@ header hr { .navsite_item:not(:hover) .navpage_list { max-height: 0; border: 0 solid transparent; - transition-delay: 0.1s; + transition-delay: 0.3s; } From 1119d1197d0a1f1476fcdb008cf65d4dbb163765 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 10:59:56 +0100 Subject: [PATCH 04/19] shortened transition delay --- assets/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/style.css b/assets/style.css index 1a13b4c..1fcc864 100644 --- a/assets/style.css +++ b/assets/style.css @@ -169,7 +169,7 @@ header hr { .navsite_item:not(:hover) .navpage_list { max-height: 0; border: 0 solid transparent; - transition-delay: 0.3s; + transition-delay: 0.1s; } From 4daf15a2c3414082ca33131ce789b282920b2edd Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:00:26 +0100 Subject: [PATCH 05/19] slow the border down --- assets/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/style.css b/assets/style.css index 1fcc864..51a7ca2 100644 --- a/assets/style.css +++ b/assets/style.css @@ -156,7 +156,7 @@ header hr { overflow: hidden; max-height: 0; border: 0 solid transparent; - transition: max-height 0.3s ease, border 0.2s ease; + transition: max-height 0.3s ease, border 0.325s ease; position: relative; z-index: 999; } From 26cc5822ee5b97cf59eee6f646c83bfe0d989a82 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:04:39 +0100 Subject: [PATCH 06/19] php testing --- lib/navpages.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/navpages.php b/lib/navpages.php index f3084d2..2ef35e7 100644 --- a/lib/navpages.php +++ b/lib/navpages.php @@ -41,7 +41,11 @@ function generateNavigation() $page_name = str_replace("_", " ", $page_dir); $page_name = explode(".", $page_name)[0]; - $page_name = ucfirst($page_name); + if ($page_name == "smp") { + $page_name = "SMP"; + } else { + $page_name = ucfirst($page_name); + } $navpages .= "
  • $page_name
    • "; } From 4867edf63049f1851ece4d7556b94e6a22ce0f93 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:06:02 +0100 Subject: [PATCH 07/19] more php testing --- lib/navpages.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/navpages.php b/lib/navpages.php index 2ef35e7..9664e79 100644 --- a/lib/navpages.php +++ b/lib/navpages.php @@ -17,7 +17,12 @@ function generateNavigation() $site_name = "misc"; $site_dir = $routerConfig["default_site"]; } - $site_name = ucfirst($site_name); + + if ($site_name == "smp") { + $site_name = "SMP" + } else{ + $site_name = ucfirst($site_name); + } $site_location = $routerConfig["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $routerConfig["default_page"]; @@ -41,11 +46,7 @@ function generateNavigation() $page_name = str_replace("_", " ", $page_dir); $page_name = explode(".", $page_name)[0]; - if ($page_name == "smp") { - $page_name = "SMP"; - } else { - $page_name = ucfirst($page_name); - } + $page_name = ucfirst($page_name); $navpages .= "
  • $page_name
    • "; } From 155d8aff9f496507e0d965b122882e689d52a8f8 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:06:53 +0100 Subject: [PATCH 08/19] i forgor ; --- lib/navpages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/navpages.php b/lib/navpages.php index 9664e79..a94bd1a 100644 --- a/lib/navpages.php +++ b/lib/navpages.php @@ -19,7 +19,7 @@ function generateNavigation() } if ($site_name == "smp") { - $site_name = "SMP" + $site_name = "SMP"; } else{ $site_name = ucfirst($site_name); } From bd12c3064a0fb92804bde8036f940c1bcd0ccb2a Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:08:07 +0100 Subject: [PATCH 09/19] asdg --- pages/smp/domov.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/smp/domov.html b/pages/smp/domov.html index c37072b..618034e 100644 --- a/pages/smp/domov.html +++ b/pages/smp/domov.html @@ -1,6 +1,6 @@

    Vitaj na oficiálnej AdlerkaSMP stránke

    -

    Najlepší Minecraft™ server na Adlerke

    +

    Najlepší Minecraft™ server na Adlerke

    Čo u nás môžeš nájsť?

    From 36bb7f98a308fac9f37e9996afee1fceccc98a59 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:21:16 +0100 Subject: [PATCH 10/19] =?UTF-8?q?added=20=C2=AE=20to=20Minecraft=C2=AE?= =?UTF-8?q?=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/smp/domov.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/smp/domov.html b/pages/smp/domov.html index 618034e..2a44df0 100644 --- a/pages/smp/domov.html +++ b/pages/smp/domov.html @@ -1,6 +1,6 @@

    Vitaj na oficiálnej AdlerkaSMP stránke

    -

    Najlepší Minecraft™ server na Adlerke

    +

    Najlepší Minecraft®™ server na Adlerke

    Čo u nás môžeš nájsť?

    From 1e37ff3458ffff91f84df34cfbf18409e3c7296b Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 11:24:19 +0100 Subject: [PATCH 11/19] added icons to login --- templates/login.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/login.html b/templates/login.html index 535db55..305f9c6 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,7 +1,7 @@
    -
    +

    -
    +

    \ No newline at end of file From 6dba647d55b1b9faefde7259ca973f492f4bc493 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:45:11 +0100 Subject: [PATCH 12/19] =?UTF-8?q?nov=C3=A9=20veci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/smp/domov.html | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pages/smp/domov.html b/pages/smp/domov.html index 2a44df0..1942d0c 100644 --- a/pages/smp/domov.html +++ b/pages/smp/domov.html @@ -3,18 +3,32 @@

    Najlepší Minecraft®™ server na Adlerke

    -

    Čo u nás môžeš nájsť?

    -
      -
    • Vlastné pluginy
      • +

      What you can expect from AdlerkaSMP:

      + +
        +
      • + Custom plugins:
        • Plugin 1
        • Plugin 2
        -
      • Kvalitné pluginy
        • + + +
      • + Quality plugins:
        • Oraxen
        • ModelManager
        -
      + + +
    • + Great staff: +
        +
      • Keeping you safe
        • +
      • Making AdlerkaSMP a happy place
        • +
      +
      • +
    \ No newline at end of file From 8335278a752bd0eecf647e67ad8c0a9a9971bdb9 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:46:10 +0100 Subject: [PATCH 13/19] display: block; --- assets/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/style.css b/assets/style.css index 51a7ca2..e955beb 100644 --- a/assets/style.css +++ b/assets/style.css @@ -197,4 +197,5 @@ header ul li { .feature-list { margin: auto; width: fit-content; + display: block; } \ No newline at end of file From 6964c70dd88407fb775dd999fedad13eae0ca3c4 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:48:02 +0100 Subject: [PATCH 14/19] Indents --- assets/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/style.css b/assets/style.css index e955beb..faf8aa9 100644 --- a/assets/style.css +++ b/assets/style.css @@ -198,4 +198,9 @@ header ul li { margin: auto; width: fit-content; display: block; +} + +.feature-list ul ul { + margin-top: 5px; + margin-left: 20px; } \ No newline at end of file From 821445c36bbe93e20c7b383d1da6da8dce413d9e Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:48:21 +0100 Subject: [PATCH 15/19] changes --- assets/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/style.css b/assets/style.css index faf8aa9..90d93f0 100644 --- a/assets/style.css +++ b/assets/style.css @@ -200,7 +200,7 @@ header ul li { display: block; } -.feature-list ul ul { +ul ul { margin-top: 5px; margin-left: 20px; } \ No newline at end of file From fd358882875028ccf77724f2836d6afc235cfea0 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:50:45 +0100 Subject: [PATCH 16/19] changes --- assets/style.css | 4 ++++ pages/smp/domov.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/style.css b/assets/style.css index 90d93f0..3120b1f 100644 --- a/assets/style.css +++ b/assets/style.css @@ -200,6 +200,10 @@ header ul li { display: block; } +.feature-list-ul { + margin: auto; +} + ul ul { margin-top: 5px; margin-left: 20px; diff --git a/pages/smp/domov.html b/pages/smp/domov.html index 1942d0c..9838319 100644 --- a/pages/smp/domov.html +++ b/pages/smp/domov.html @@ -5,7 +5,7 @@

    What you can expect from AdlerkaSMP:

    -
      +
      • Custom plugins:
          From ab19c710187331cca7c1030cb41f11deb419f40e Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:52:12 +0100 Subject: [PATCH 17/19] asdt --- pages/smp/domov.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/smp/domov.html b/pages/smp/domov.html index 9838319..77a6437 100644 --- a/pages/smp/domov.html +++ b/pages/smp/domov.html @@ -3,11 +3,11 @@

          Najlepší Minecraft®™ server na Adlerke

          -

          What you can expect from AdlerkaSMP:

          +

          Čo môžeš očakávať od AdlerkaSMP:

          • - Custom plugins: + Vlastné pluginy:
            • Plugin 1
            • Plugin 2
              • @@ -15,7 +15,7 @@
            • - Quality plugins: + Kvalitné pluginy:
              • Oraxen
              • ModelManager
                • @@ -23,10 +23,10 @@
              • - Great staff: + Super admini:
                  -
                • Keeping you safe
                  • -
                • Making AdlerkaSMP a happy place
                  • +
                • Robíme celý server..
                  • +
                • Vďaka nám je AdlerkaSMP bezpečné miesto.
              From a0315ebb3f06102f30aa7d6cd59c1d68dd91c8ab Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:53:08 +0100 Subject: [PATCH 18/19] =?UTF-8?q?br=C4=8Dn=C3=A9=20miesto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/smp/domov.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/smp/domov.html b/pages/smp/domov.html index 77a6437..3a4f6e3 100644 --- a/pages/smp/domov.html +++ b/pages/smp/domov.html @@ -26,7 +26,7 @@ Super admini:
              • Robíme celý server..
                • -
              • Vďaka nám je AdlerkaSMP bezpečné miesto.
                • +
              • Vďaka nám je AdlerkaSMP
                bezpečné miesto.
            From 445fdbe947a5b1491eb6833cb7c5af33008ee3b0 Mon Sep 17 00:00:00 2001 From: AkisYTB3 Date: Wed, 17 Jan 2024 13:54:10 +0100 Subject: [PATCH 19/19] test --- assets/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/style.css b/assets/style.css index 3120b1f..ed44688 100644 --- a/assets/style.css +++ b/assets/style.css @@ -204,7 +204,7 @@ header ul li { margin: auto; } -ul ul { +.feature-list-ul ul { margin-top: 5px; margin-left: 20px; } \ No newline at end of file