From ce83d4f9c92a8551458af810c5a1433edfb5b3f0 Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Sun, 28 Aug 2022 09:57:19 -0700 Subject: [PATCH 01/10] Site Improvements. Fixes class dark + small header improvements. --- public/css/app.css | 22 +++++++----- public/css/appdark.css | 4 +-- public/css/classicapp.css | 7 ++++ public/css/classicappdark.css | 38 ++++++++++++++++++--- resources/views/index.blade.php | 2 +- resources/views/layouts/app.blade.php | 2 ++ resources/views/layouts/loggedout.blade.php | 4 ++- 7 files changed, 62 insertions(+), 17 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index eeae142..66a2f73 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -362,6 +362,14 @@ div.mySubmenuFixed { background-position: 0 -54px; } +#NavigationRedesignBannerContainer .HeaderDivider { + margin: -5px 5px 0 5px; + float: right; + height: 25px; + width: 0; + Border-left: 1px solid #5355a0; +} + #NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited { border: 0 solid black; font-size: 13px; @@ -577,8 +585,6 @@ html { font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif; font-style: normal; height: 100%; - color: #000; - background-color: #cccccc; } .loggedout { @@ -593,12 +599,11 @@ html { } body { - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; - margin-bottom: 0px; + margin: 0px; height: 100%; padding-bottom: 0px; + background: #e6e6e6; + color: #000; } .content_special, @@ -671,6 +676,7 @@ body { } .hyperlink { display: block; + text-align: center; } #footer { @@ -683,9 +689,9 @@ body { width: calc(100% - 30px); padding-bottom: 5px; padding-top: 5px; - background: rgb(172, 172, 172); + background: #e6e6e6; /* Fallback for IE 11*/ - background-color: rgb(172, 172, 172); + background-color: #e6e6e6; min-height: fit-content; bottom: 0; } diff --git a/public/css/appdark.css b/public/css/appdark.css index 6552f4e..839a474 100644 --- a/public/css/appdark.css +++ b/public/css/appdark.css @@ -47,7 +47,7 @@ background: linear-gradient(#303030 10%, #000000 100%); } -html { +body { background-color: rgb(31, 31, 31); color: white; } @@ -77,7 +77,7 @@ html { } #footer { - background: rgb(0, 0, 0); + background: rgb(31, 31, 31); } #footer_signup { diff --git a/public/css/classicapp.css b/public/css/classicapp.css index 98d45a7..83b84c4 100644 --- a/public/css/classicapp.css +++ b/public/css/classicapp.css @@ -23,6 +23,9 @@ html { animation-duration: 50s; animation-iteration-count: infinite; } +body { + background: transparent; +} #alert, #success { @@ -172,6 +175,10 @@ html { top: 44px; } +#NavigationRedesignBannerContainer .HeaderDivider { + display: none; +} + #footer_signup a, #footer_signup p a, #footer a, #footer p a { transition: none; } diff --git a/public/css/classicappdark.css b/public/css/classicappdark.css index ece7693..5123af2 100644 --- a/public/css/classicappdark.css +++ b/public/css/classicappdark.css @@ -23,6 +23,9 @@ html { animation-duration: 50s; animation-iteration-count: infinite; } +body { + background: transparent; +} .content, #footer { max-width: 1000px; @@ -54,19 +57,20 @@ html { .content_signup { background: rgba(25, 25, 25,0.75); } - +.content, #footer { + max-width: 1000px; + width: 1000px; + margin: auto; +} .content { margin-top: 105px; background: rgba(25, 25, 25,0.75); min-height: 550px; } -#footer { - width: max-content; -} - #logo_full { display: none; + margin-right: 0; } #logo_small { @@ -168,6 +172,30 @@ html { height: 29px; top: 44px; } +#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited, .navbarbutton { + position: relative; + padding-right: 5px; + text-align: center; + font-size: 18px; + font-family: "Helvetica Neue"; + font-weight: bold; + text-shadow: none; +} + +#navbarsignedincontainer { + display: block; +} +#navbarsignedincontainer a:nth-child(1)::after { + content: ' | '; +} + +#NavigationRedesignBannerContainer .HeaderDivider { + display: none; +} + +.content_signup a:hover, .content_signup p a:hover, #footer_signup a:hover, #footer_signup p a:hover, #footer a:hover, #footer p a:hover { + color: inherit; +} @media (min-width: 1688px) { #logo_full { diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index ab23a88..030153c 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -15,5 +15,5 @@

Sign Up or Login


-Join our Discord! +Join our Discord! @endsection \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b511a04..652455b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -127,9 +127,11 @@
diff --git a/resources/views/layouts/loggedout.blade.php b/resources/views/layouts/loggedout.blade.php index f108b8c..d0f17cf 100644 --- a/resources/views/layouts/loggedout.blade.php +++ b/resources/views/layouts/loggedout.blade.php @@ -53,7 +53,9 @@ $splash = array( 'promise me you\'ll never install archblox ooghghIMFUCKING DYING', 'okay mr krabs', 'conkley is EPIC', -'skeuomorphism is awesome' +'skeuomorphism is awesome', +'It\'s free!', +'It\'s archtastic!' ); @endphp From 68c3ee6190fff84291c19313ed91224393f071ab Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Sun, 28 Aug 2022 10:03:56 -0700 Subject: [PATCH 02/10] Updated 2018.css Removes dividers in 2018. --- public/css/2018.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/css/2018.css b/public/css/2018.css index 56210bf..e0ae5cf 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -642,7 +642,8 @@ button:hover a { color: #b8b8b8; } -iframe { +#NavigationRedesignBannerContainer .HeaderDivider { + display: none; } #logo_full { From 3f24d06d2feb2e8055fad8f36d0cf0412ef17138 Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Mon, 29 Aug 2022 00:17:37 -0700 Subject: [PATCH 03/10] Dark theme fixes Fixes a few issues regarding login pages and older browsers. --- public/css/appdark.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/public/css/appdark.css b/public/css/appdark.css index 839a474..c29d39a 100644 --- a/public/css/appdark.css +++ b/public/css/appdark.css @@ -52,18 +52,22 @@ body { color: white; } +.loggedout body { + background-color: transparent; +} + .loggedout { background-image: url('../img/animateddark.png'); background-color: rgb(1, 17, 48); } .content { - color: rgb(167 167 167); + color: rgb(167, 167, 167); background: rgb(25, 25, 25); } .content_signup { - color: rgb(167 167 167); + color: rgb(167, 167, 167); background: rgb(25, 25, 25); } @@ -122,7 +126,6 @@ input { color: rgb(200,200,200); } - .tab_selected { background: linear-gradient(180deg, #00a2ff 0%, #01639c 100%) } From 8ba4f5afea689147d98886c7a4a0a03099a0abae Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Thu, 1 Sep 2022 02:08:07 -0700 Subject: [PATCH 04/10] Admin Tree Resign Replaces the admin tree list with an improved version. --- public/css/NewAdminCSS.css | 110 +++++++++++++++++++-------- resources/views/admin/tree.blade.php | 37 ++++++--- 2 files changed, 106 insertions(+), 41 deletions(-) diff --git a/public/css/NewAdminCSS.css b/public/css/NewAdminCSS.css index 2c1efe1..339f130 100644 --- a/public/css/NewAdminCSS.css +++ b/public/css/NewAdminCSS.css @@ -370,41 +370,91 @@ h6 { .NewPanel.AdminPanel .flex { display: table!important; } -.NewPanel .InvitationUserName { - text-align: center; - margin-top: 20px; - font-size: 20px; - font-weight: 600; +/*Heavily based off of the roblox developer tree list (because it looks cool)*/ +.NewPanel .SearchTree { + width: 260px; + height: 100%; + padding: 0; + margin: 10px auto 0; + min-height: 550px; +} +.NewPanel .SearchTree .Menu { + list-style-type: none; + position: relative; + top: 0; + bottom: 0; + line-height: 20px; + min-height: 550px; +} +.NewPanel .SearchTree a { + color: #9b9b9b; + transition: .15s all ease-in-out; + font-size: 14px; + margin: 0 0 0 38px; + padding-right: 5px; + position: relative; + top: 18px; + display: inline-block; +} +.NewPanel .SearchTree a:hover { + color: #00b7ff; +} +.NewPanel .SearchTree a:after { + content: ''; + border: 1px solid #555; + border-radius: 100%; + width: 2px; + height: 2px; + display: inline-block; + left: -10px; + position: absolute; + top: 9px; +} +.NewPanel .SearchTree a span { display: block; } -.NewPanel .InvitationSubName { - text-align: center; - font-size: 18px; - font-weight: 100; -} -.NewPanel .InvitationSubName .InvitationText { +.NewPanel .SearchTree .forwardArrow { + transform: rotate(180deg); + position: relative; display: inline-block; - font-weight: 100; - cursor: default; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + margin: 0; + padding: 0; + top: 21px; + line-height: 14px; } -.NewPanel .InvitationSubText { - text-align: center; - cursor: default; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; +.NewPanel .SearchTree .forwardArrow::after { + display: none; } -.NewPanel .InvitationSubName li { - list-style: none; +.NewPanel .TreeList { + border-left: 1px dashed #555; + margin: 13px 0 0 30px; + padding: 0; +} +.NewPanel #DropDown.TreeList { + min-height: 550px; +} +.NewPanel .SearchTree li ul li { + list-style-type: none; + position: relative; + top: 3px; + bottom: 0; + padding-bottom: 16px; +} +.NewPanel .SearchTree li ul li:last-child { + padding-bottom: 11px; +} +.NewPanel .SearchTree li ul li.subList { + padding-bottom: 0; +} +.NewPanel .SearchTree li ul li:before { + content: ''; + display: inline-block; + width: 25px; + height: 0; + position: absolute; + left: 0em; + top: 28px; + border-top: 1px dashed #555; } @media (max-width:1000px) { diff --git a/resources/views/admin/tree.blade.php b/resources/views/admin/tree.blade.php index 591191d..72aff4b 100644 --- a/resources/views/admin/tree.blade.php +++ b/resources/views/admin/tree.blade.php @@ -37,17 +37,32 @@ @if ($user) - {{ $user->name }} -
-

Invited By

- {{ $invited_by }} -
{{ $user->name }} Invited
- @foreach ($children as $child) -
  • - {{ $child->name }} -
    • - @endforeach -
    + @endif From d28df2f38b9fe330ae2c122d46a26d538aaa5341 Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Thu, 1 Sep 2022 02:16:20 -0700 Subject: [PATCH 05/10] Updated Tree List Contains fixes for admin tree list. --- resources/views/admin/tree.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/admin/tree.blade.php b/resources/views/admin/tree.blade.php index 72aff4b..0f71fa6 100644 --- a/resources/views/admin/tree.blade.php +++ b/resources/views/admin/tree.blade.php @@ -36,8 +36,8 @@ ID - @if ($user) - @endif + @endsection From a4d7eab5dec362d6900f480b095972918b7ed8c9 Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Thu, 1 Sep 2022 02:36:27 -0700 Subject: [PATCH 06/10] Minor fixes and changes. Slightly altered the text in Admin Home, fixed an issue with the tree list. --- resources/views/admin/index.blade.php | 4 ++-- resources/views/admin/tree.blade.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 1561ef6..8e366c3 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -41,7 +41,7 @@ {{ App\Models\InviteKey::count() }} - Invite Keys + Invite Key(s)
    @@ -49,7 +49,7 @@ {{ App\Models\InviteKey::where('active', true)->count() }} - Unused Invite Keys + Unused Invite Key(s)
    diff --git a/resources/views/admin/tree.blade.php b/resources/views/admin/tree.blade.php index 0f71fa6..220aa41 100644 --- a/resources/views/admin/tree.blade.php +++ b/resources/views/admin/tree.blade.php @@ -36,8 +36,8 @@ ID -     - @endif + @endif @endsection From e5273ee19c3c1d9c6ffec94a46dac37a974e597a Mon Sep 17 00:00:00 2001 From: tersiswilvin <52929976+tersiswilvin@users.noreply.github.com> Date: Thu, 1 Sep 2022 03:18:00 -0700 Subject: [PATCH 07/10] Updated Admin Tree Small fixes for admin tree. --- resources/views/admin/tree.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/admin/tree.blade.php b/resources/views/admin/tree.blade.php index 220aa41..d6739da 100644 --- a/resources/views/admin/tree.blade.php +++ b/resources/views/admin/tree.blade.php @@ -45,10 +45,9 @@ ←