From f5520c0ce543bb85b3c4f5072a5c1d1590b5ab9b Mon Sep 17 00:00:00 2001 From: Codewithme-25 Date: Wed, 5 Oct 2022 18:56:17 +0530 Subject: [PATCH 1/8] refactoring navbar sticky --- css/discord.css | 6 ++++-- css/index.css | 9 ++++++++- css/navbar-linked-pages.css | 2 ++ css/navbar.css | 20 +++++++++++--------- index.html | 4 ++-- 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/css/discord.css b/css/discord.css index dff6515..bbf6178 100644 --- a/css/discord.css +++ b/css/discord.css @@ -11,7 +11,7 @@ --color-text: #e1e1ec; --color-bg-card: #312f3b; --color-links: #0080ff; - --color-events: #ff0090; + --color-events: #ff0090; } * { margin: 0; @@ -20,7 +20,9 @@ } body { - font: 16px 'Roboto', sans-serif; + box-sizing: border-box; + font-family:'raleway'; + font-size: 16px; background-color: var(--color-bg); } diff --git a/css/index.css b/css/index.css index 09e5595..3274bd6 100644 --- a/css/index.css +++ b/css/index.css @@ -23,6 +23,13 @@ body { font-family: 'raleway'; background-color: var(--color-bg); } +header{ + position: sticky; top: 0; + background-color: #1d1283; + margin: 0px; +} + + h1 { font-size: 4.5rem; @@ -282,7 +289,7 @@ footer { @media (max-width: 1024px) { .rds-logo-banner { display: block; - margin: 25px auto 0px auto; + margin: 0px auto 0px auto; } h1 { diff --git a/css/navbar-linked-pages.css b/css/navbar-linked-pages.css index 9c66e66..ea9f672 100644 --- a/css/navbar-linked-pages.css +++ b/css/navbar-linked-pages.css @@ -1,5 +1,7 @@ nav { font-weight: 700; + position: sticky; top: 0; + background-color: #1d1283; } nav li a { diff --git a/css/navbar.css b/css/navbar.css index 273ba95..b2ac087 100644 --- a/css/navbar.css +++ b/css/navbar.css @@ -1,6 +1,8 @@ nav { font-family: 'roboto'; font-weight: 700; + position: sticky; top: 0; + background-color: #1d1283; } .nav-menu { @@ -15,16 +17,16 @@ nav li { } .rds-logo { - height: 100px; - width: 100px; - margin: 20px; + height: 80px; + width: 80px; + margin: 10px; } .nav-element { display: block; text-decoration: none; color: #ffffff; - margin: 55px 40px; + margin: 40px 40px; } .nav-element.active-tab { @@ -42,7 +44,7 @@ nav li { position: absolute; right: 0; top: 0; - margin: 50px 40px; + margin: 40px 40px; } .btn-login-text { @@ -114,12 +116,12 @@ nav li { .hamburger { display: inline-block; - margin: 20px; + margin: 10px; cursor: pointer; } .nav-login { - margin: 20px 20px; + margin: 10px 10px; } nav li { @@ -127,8 +129,8 @@ nav li { } .nav-element { - padding: 10px 40px; - margin: 10px; + padding: 10px 10px; + } .nav-element.active-tab { diff --git a/index.html b/index.html index c512d07..7ab7b44 100644 --- a/index.html +++ b/index.html @@ -32,7 +32,7 @@ -
+
@@ -115,7 +115,7 @@
- +
Date: Wed, 5 Oct 2022 19:38:49 +0530 Subject: [PATCH 2/8] refactoring navbar sticky --- css/discord.css | 4 +- css/index.css | 7 +- css/navbar-linked-pages.css | 3 +- css/navbar.css | 4 +- index.html | 157 ++++++++++++++++++----------------- package.json | 2 +- yarn.lock | 158 ++++++++++++++++++++++++++++++++++++ 7 files changed, 246 insertions(+), 89 deletions(-) create mode 100644 yarn.lock diff --git a/css/discord.css b/css/discord.css index bbf6178..9af213d 100644 --- a/css/discord.css +++ b/css/discord.css @@ -11,7 +11,7 @@ --color-text: #e1e1ec; --color-bg-card: #312f3b; --color-links: #0080ff; - --color-events: #ff0090; + --color-events: #ff0090; } * { margin: 0; @@ -21,7 +21,7 @@ body { box-sizing: border-box; - font-family:'raleway'; + font-family: 'raleway'; font-size: 16px; background-color: var(--color-bg); } diff --git a/css/index.css b/css/index.css index 3274bd6..fa66fe3 100644 --- a/css/index.css +++ b/css/index.css @@ -23,14 +23,13 @@ body { font-family: 'raleway'; background-color: var(--color-bg); } -header{ - position: sticky; top: 0; +header { + position: sticky; + top: 0; background-color: #1d1283; margin: 0px; } - - h1 { font-size: 4.5rem; } diff --git a/css/navbar-linked-pages.css b/css/navbar-linked-pages.css index ea9f672..c3e694a 100644 --- a/css/navbar-linked-pages.css +++ b/css/navbar-linked-pages.css @@ -1,6 +1,7 @@ nav { font-weight: 700; - position: sticky; top: 0; + position: sticky; + top: 0; background-color: #1d1283; } diff --git a/css/navbar.css b/css/navbar.css index b2ac087..ebc3bae 100644 --- a/css/navbar.css +++ b/css/navbar.css @@ -1,7 +1,8 @@ nav { font-family: 'roboto'; font-weight: 700; - position: sticky; top: 0; + position: sticky; + top: 0; background-color: #1d1283; } @@ -130,7 +131,6 @@ nav li { .nav-element { padding: 10px 10px; - } .nav-element.active-tab { diff --git a/index.html b/index.html index 7ab7b44..1010c10 100644 --- a/index.html +++ b/index.html @@ -32,90 +32,89 @@ - -
-
-
-
-
-
+
+
+
+
+
+
- - -
-
+
+
+
Date: Sat, 15 Oct 2022 14:27:28 +0530 Subject: [PATCH 3/8] removed yarn lock file --- .vscode/settings.json | 3 + yarn.lock | 158 ------------------------------------------ 2 files changed, 3 insertions(+), 158 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 yarn.lock diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6b665aa --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 4b5b9aa..0000000 --- a/yarn.lock +++ /dev/null @@ -1,158 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -concat-stream@^1.4.7: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -os-shim@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - integrity sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A== - -pre-commit@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/pre-commit/-/pre-commit-1.2.2.tgz#dbcee0ee9de7235e57f79c56d7ce94641a69eec6" - integrity sha512-qokTiqxD6GjODy5ETAIgzsRgnBWWQHQH2ghy86PU7mIn/wuWeTwF3otyNQZxWBwVn8XNr8Tdzj/QfUXpH+gRZA== - dependencies: - cross-spawn "^5.0.1" - spawn-sync "^1.0.15" - which "1.2.x" - -prettier@2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== - -readable-stream@^2.2.2: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== - -spawn-sync@^1.0.15: - version "1.0.15" - resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" - integrity sha512-9DWBgrgYZzNghseho0JOuh+5fg9u6QWhAWa51QC7+U5rCheZ/j1DrEZnyE0RBBRqZ9uEXGPgSSM0nky6burpVw== - dependencies: - concat-stream "^1.4.7" - os-shim "^0.1.2" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -which@1.2.x: - version "1.2.14" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" - integrity sha512-16uPglFkRPzgiUXYMi1Jf8Z5EzN1iB4V0ZtMXcHZnwsBtQhhHeCqoWw7tsUY42hJGNDWtUsVLTjakIa5BgAxCw== - dependencies: - isexe "^2.0.0" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== From 62f8a7d277c938d5d28825c8131c18230f725ea5 Mon Sep 17 00:00:00 2001 From: Codewithme-25 Date: Sat, 15 Oct 2022 14:34:14 +0530 Subject: [PATCH 4/8] fixed package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c6639dc..6d5bf55 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "license": "ISC", "devDependencies": { "pre-commit": "^1.2.2", - "prettier": "2.7.1" + "prettier": "2.2.1" }, "pre-commit": [ "check" ] -} +} \ No newline at end of file From 49e71d18d361e0430d9cd9771fefd0c711c673a2 Mon Sep 17 00:00:00 2001 From: Codewithme-25 Date: Sat, 15 Oct 2022 14:38:05 +0530 Subject: [PATCH 5/8] fixed package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d5bf55..26a2d18 100644 --- a/package.json +++ b/package.json @@ -17,4 +17,4 @@ "pre-commit": [ "check" ] -} \ No newline at end of file +} From 3652cf408a59f5ec8ac6deb873f6462bff7182db Mon Sep 17 00:00:00 2001 From: Codewithme-25 Date: Sat, 15 Oct 2022 14:41:10 +0530 Subject: [PATCH 6/8] removed vscode file --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 6b665aa..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "liveServer.settings.port": 5501 -} From af41724bcd3f7c38ac56dff733f9325df2bd2a4b Mon Sep 17 00:00:00 2001 From: Codewithme-25 Date: Sat, 15 Oct 2022 15:30:32 +0530 Subject: [PATCH 7/8] fixed navbar height --- css/navbar.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/css/navbar.css b/css/navbar.css index ebc3bae..65be3f0 100644 --- a/css/navbar.css +++ b/css/navbar.css @@ -18,16 +18,16 @@ nav li { } .rds-logo { - height: 80px; - width: 80px; - margin: 10px; + height: 50px; + width: 50px; + margin: 10px 20px; } .nav-element { display: block; text-decoration: none; color: #ffffff; - margin: 40px 40px; + margin: 30px 40px; } .nav-element.active-tab { @@ -45,7 +45,9 @@ nav li { position: absolute; right: 0; top: 0; - margin: 40px 40px; + margin-top: 32px; + margin: 10px; + padding: 12px; } .btn-login-text { @@ -55,6 +57,7 @@ nav li { color: white; cursor: pointer; border: 2px solid white; + display: flex; } .user-greet { From 87a9d99c15f79e713d3838c1886b4981bacc04d9 Mon Sep 17 00:00:00 2001 From: Codewithme-25 Date: Sat, 15 Oct 2022 15:54:39 +0530 Subject: [PATCH 8/8] commit --- css/navbar.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/navbar.css b/css/navbar.css index 65be3f0..1ba634b 100644 --- a/css/navbar.css +++ b/css/navbar.css @@ -125,7 +125,8 @@ nav li { } .nav-login { - margin: 10px 10px; + margin-top: auto; + margin-bottom: 10px; } nav li {