diff --git a/public/css/2018.css b/public/css/2018.css index bc82286..749b749 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -376,10 +376,6 @@ body { background: none; } -#NavigationRedesignBannerContainer p { - color: #fff; -} - #logo_full, #logo_full .btn-logo { height: 30px; @@ -402,7 +398,7 @@ body { height: 40px } -.navbarbutton { +#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited, .navbarbutton { color: #fff; font-family: "Source Sans Pro", Arial, Helvetica Neue, sans-serif; padding: 6px 9px; @@ -415,13 +411,14 @@ body { float: left; margin: 4px auto; top: 0; + text-shadow: none; } #NavigationRedesignBannerContainer { font-family: "Source Sans Pro", Arial, Helvetica Neue, sans-serif; } -.navbarbutton:hover { +#NavigationRedesignBannerContainer ul li a:hover, .navbarbutton:hover { background-color: #191919; background-color: rgba(25, 25, 25, .1); border-radius: 5px; @@ -620,8 +617,9 @@ input:focus { border-color: #00A2FF } -#navbarsignedincontainer p a { - color: #fff +#navbarsignedincontainer a { + color: #fff; + height: 25px; } button:hover a { diff --git a/public/css/NewAdminCSS.css b/public/css/NewAdminCSS.css index 1192291..c2dc219 100644 --- a/public/css/NewAdminCSS.css +++ b/public/css/NewAdminCSS.css @@ -1,3 +1,7 @@ +html { + background-color: #111; +} + body { background-color: #111; min-width: 0px; @@ -13,7 +17,7 @@ h2 { } h3 { font-size: 20px; - font-family: 600; + font-weight: 600; } h4 { font-size: 18px; @@ -28,7 +32,7 @@ h6 { font-weight: 200; } -#MasterContainer.AdminPanel.NewPanel { +#MasterContainer.NewPanel.AdminPanel { background-color: #111; } #MasterContainer.NewPanel #BodyWrapper { @@ -36,7 +40,7 @@ h6 { background-color: #111; color: #fff; } -.AdminPanel { +.NewPanel.AdminPanel { height: 100%; } #MasterContainer.NewPanel .iphone-sidebar, #MasterContainer.NewPanel .iphone-content, #MasterContainer #AdminWrapper, #MasterContainer #BodyWrapper { @@ -45,7 +49,7 @@ h6 { #MasterContainer.NewPanel #AdminWrapper, #MasterContainer.NewPanel #BodyWrapper { display: block; } -#AdminWrapper.Navigation { +.NewPanel #AdminWrapper.Navigation { width: 100%; } .NewPanel .AdminHeader { @@ -79,19 +83,25 @@ h6 { } .NewPanel .AdminSubHeader li a { font-size: 14px; + font-weight: 100; color: #bbb; + cursor: pointer; transition: .1s all linear; } -.NewPanel .AdminSubHeader li a:hover { - font-size: 14px; +.NewPanel .AdminSubHeader li:hover a { + color: #ccc +} +.NewPanel .AdminSubHeader li a.Active, .NewPanel .AdminSubHeader li a.Active:active { + box-shadow: 0 2px 0 0 #00b7ff; +} +.NewPanel .AdminSubHeader li a:hover, .NewPanel .AdminSubHeader li a:active { color: #fff; - cursor: pointer; box-shadow: 0 2px 0 0 #fff; transition: .1s all linear; } .NewPanel .AdminHeader .Slogan { font-size: 16px; - font-weight: 600; + font-weight: 100; display: block; text-align: center; cursor: default; @@ -106,41 +116,257 @@ h6 { width: 200px; height: 40px; padding: 5px; - background-image: url(../img/MORBLOXlogo.png); + background-image: url(/img/MORBLOXlogo.png); background-repeat: no-repeat; background-size: contain; background-position: 0; display: block; margin: auto; } -.AdminPanel #Body { +.NewPanel.AdminPanel #Body { background-color: #111; } -.AdminPanel .MainHeader, .AdminPanel .Stats-Wrapper { +.NewPanel.AdminPanel .MainHeader, .NewPanel.AdminPanel .SubHeader { 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; } -.AdminPanel .StatsContainer { +.NewPanel.AdminPanel .Reminder { + color: #ff7300 +} +.NewPanel .text-error { + display: block; + text-align: center; + color: #d6241a; + font-weight: 200; + padding: 5px; +} +.NewPanel .text-header { + display: block; + text-align: center; + padding: 5px 0; +} +.NewPanel .text-secondary { + color: #bbb; + display: inline-block; + text-align: left; +} +.NewPanel.AdminPanel .Stats-Wrapper { + text-align: center; + padding: 4px; +} +.NewPanel.AdminPanel .StatsContainer { margin: 15px 15px 0 15px; padding: 15px; - border: 1px dotted #ff7300; + border: 1px dashed #ff7300; background-color: #080808; } -.AdminPanel .Stats { - font-size: 16px; - font-weight: 400; - color: #a7a7a7; +.NewPanel.AdminPanel .Userlist { + margin: 10px; } -.AdminPanel .Stats.Counter { - font-weight: 600; +.NewPanel.AdminPanel form div { + display: flex; + justify-content: center; +} +.NewPanel .SearchCloseBtn{ + color: #af1400; + left: auto; + margin-left: -105px; + margin-top: 1px; + position: absolute; + font-size: 16px; +} +.NewPanel .SearchCloseBtn:hover { + color: #d41900; +} +.NewPanel.AdminPanel #SearchInput { + border: 1px solid #757575; + border-radius: 3px; + color: #b8b8b8; + background-color: #000; +} +.NewPanel.AdminPanel #SearchInput:focus, .AdminPanel #SearchInput:active { + border-color: #0099ff; +} +.NewPanel #SearchInput, .NewPanel .btn-neutral { + margin: 0 5px; +} +.NewPanel.AdminPanel #SearchInput:focus-visible { + outline: none; +} +.NewPanel.AdminPanel .Stats { + font-size: 16px; + font-weight: 100; + color: #a7a7a7; + 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.AdminPanel .Stats.Counter { + font-weight: 400; color: #fff; } -.AdminPanel .Stat-Separator { +.NewPanel.AdminPanel .Stat-Separator { width: 50%; height: 1px; - background-color: #555; + background: linear-gradient(90deg,rgb(85, 85, 85,0) 0%, #555 50%, rgb(85, 85, 85,0) 100%); display: block; margin: auto; } +.NewPanel.AdminPanel .SearchContainer { + width: 235px; + height: auto; + background-color: #555; + border-radius: 5px; + margin: 62px 25px 0 0; + display: flex; + align-items: center; + align-content: center; + flex-direction: column; +} +.NewPanel .SearchContainer .Thumbnail { + height: 64px; + width: 64px; + margin-top: -37px; + background-color: #555; + border: 5px solid #111; + border-radius: 100%; +} +.NewPanel .SearchBoard { + width: 100%; + height: 100%; + position: relative; + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: center; + align-items: flex-start; +} +.NewPanel .SearchContainer .UserThumbnail { + background-image: url(/img/defaultrender.png); + background-size: contain; + width: 100%; + height: 100%; +} +.NewPanel .SearchContainer .UserDetails { + width: 95%; + padding: 5px; +} +.NewPanel .SearchContainer .SearchBox { + width: 100%; +} +.NewPanel .AuthenticatedUserNameWrapper { + top: 10px; + right: 10px; + font-size: 16px; + font-weight: 100; + display: inline-block; + position: absolute; + color: #fff; + 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 .AuthenticatedUserName { + color: #009dff; + transition: .25s all ease-in-out; + display: inline-block; +} +.NewPanel .AdminHeader .HomeBtn { + color: #009dff; + 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; + display: flex; + flex-direction: row-reverse; +} +.NewPanel .HomeBtn { + top: 10px; + left: 10px; + background: none; + border: 0; + padding: 0; + height: auto; + font-size: 16px; + font-weight: 100; + display: inline-block; + position: absolute; +} +.NewPanel .BackArrow { + cursor: default; + transition: .25s all ease-in-out; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + line-height: 1.1rem; + margin-right: 2px; +} +.NewPanel .Backbtn { + color: inherit; + cursor: pointer; + transition: .25s all ease-in-out; + -webkit-touch-callout: text; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; +} +.NewPanel .UserDetails .Row { + overflow-wrap: anywhere; +} +.NewPanel .AuthenticatedUserName:hover, .NewPanel .Backbtn:hover, .NewPanel .Backbtn:hover + .BackArrow { + color: #2fcfff; + transition: .25s all ease-in-out; +} +.NewPanel .SearchContainer .Thumbnail a { + width: 12px; + height: 12px; + display: block; + float: right; + top: -6px; + position: relative; + border-radius: 50%; +} +.NewPanel .website { + background: linear-gradient(0deg, #0087e0 0%, #005085 49%,#005a85 50%, #0099ff 95%, #fff 100%); + width: 12px; + height: 12px; + display: block; + border-radius: 50%; + margin: -5px; +} +.NewPanel .offline { + background: linear-gradient(0deg, #a3a3a3 0%, #7a7a7a 49%, #797979 50%, #c9c9c9 95%, #fff 100%); + width: 12px; + height: 12px; + display: block; + border-radius: 50%; + margin: -5px; +} +.NewPanel.AdminPanel .flex { + display: table!important; +} @media (max-width:1000px) { .NewPanel .AdminSubHeader ul { @@ -148,8 +374,8 @@ h6 { } } @media (max-width:990px) { - #Body, #BodyWrapper, #MasterContainer { - width: 100% !important; + .NewPanel.AdminPanel #Body, .NewPanel.AdminPanel #BodyWrapper, .NewPanel.AdminPanel #MasterContainer { + width: 100% !important; /*!important since late 2012 roblox uses element.style CRINGE!*/ padding: 0; } } diff --git a/public/css/app.css b/public/css/app.css index ef1e1d6..6446b60 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -93,10 +93,12 @@ #alert { background: linear-gradient(#f07575 10%, #de2323 100%); + color: #fff; } #success { - background: linear-gradient(#a3e2bd 10%, #02b757 100%) + background: linear-gradient(#a3e2bd 10%, #02b757 100%); + color: #fff; } .warningtext { @@ -111,6 +113,7 @@ #logo_full { display: inline-block; float: left; + margin-right: 5px; } #logo_full, @@ -133,8 +136,7 @@ @media (max-width: 970px) { - .navbarbuttoncontainer a, - #navbarusername, + #navbarsignedincontainer, .arkotcontainer p, #navbarlogincontainer { font-size: 11px; @@ -150,8 +152,7 @@ position: relative; } - .navbarbuttoncontainer a, - #navbarusername, + #navbarsignedincontainer, .arkotcontainer p, #navbarlogincontainer { font-size: 9px; @@ -339,6 +340,21 @@ div.mySubmenuFixed { background-position: 0 -54px; } +#NavigationRedesignBannerContainer ul li a, .NavigationRedesign ul li a:visited { + border: 0 solid black; + font-size: 13px; + padding: 0; + text-decoration: none; + outline: none; + font-family: Arial,Helvetica,sans-serif; + text-shadow: #11111191 1px 1px 1px; +} + +.NavigationRedesign ul { + margin: 0 auto; + padding: 0; +} + iframe { width: 100%; height: 2000px; @@ -532,7 +548,7 @@ html { } .loggedout { - background: url('../img/animated.png'); + background: url('/img/animated.png'); background-color: rgb(49, 107, 223); background-position: center bottom; background-repeat: repeat-x; @@ -589,17 +605,6 @@ body { background-color: rgb(255, 255, 255); } -.content_signup a { - color: #0074bd; - transition: .25s all ease-in-out; -} -.content_signup a:hover { - color: #32cfff; -} -.hyperlink { - display: block; -} - .content_signup h1, .content_signup a, .content_signup p, .content_signup h2, .content_signup h5 { text-align: center; } @@ -621,6 +626,20 @@ body { color: black; } +.content_signup a, .content_signup p a { + color: #0074bd; + transition: .25s all ease-in-out; +} +#footer_signup a, #footer_signup p a, #footer a, #footer p a { + transition: .25s all ease-in-out; +} +.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: #2fcfff; +} +.hyperlink { + display: block; +} + #footer { text-align: center; margin: auto; @@ -638,7 +657,7 @@ body { bottom: 0; } -/*Button gradients by TersisWilvin*/ +/*Legacy Button gradients by TersisWilvin*/ .tab { background: rgb(255, 255, 255); @@ -732,6 +751,99 @@ button:hover.greenbutton { background: linear-gradient(0deg, #3fc679 0%, #15933f 49%, #3cc175 50%, #46dc86 95%, #53ff9d 100%); } +/*-------------*/ + +.btn-large, .btn-medium, .btn-small { + margin: 0px; + display: inline-block; + zoom: 1; + text-align: center; + font-weight: normal; + text-decoration: none; + border-width: 1px; + border-style: solid; + cursor: pointer; + *display: inline; + *vertical-align: top; +} +.btn-small { + padding: 1px 7px 0px 7px; + height: 20px; + min-width: 40px; + font-size: 14px; + line-height: 18px; + background-position: left -160px; + border-radius: 0; +} +.btn-small:hover { + background-position: left -181px; +} +.btn-medium { + padding: 1px 13px 3px 13px; + height: 28px; + min-width: 62px; + font-size: 20px; + background-position: left -96px; + border-radius: 0; +} +.btn-medium:hover { + background-position: left -128px; +} +.btn-large { + padding: 9px 13px 0px 13px; + height: 39px; + min-width: 70px; + font-size: 23px; + line-height: 27px; + background-position: left 0px; + border-radius: 0; +} +.btn-large:hover { + background-position: left -48px; +} +.btn-disabled-primary, .btn-disabled-primary:hover, .btn-disabled-neutral, .btn-disabled-neutral:hover, .btn-disabled-negative, .btn-disabled-negative:hover { + cursor: default; + background-position: left -202px; +} + +.btn-primary, .btn-primary:link, .btn-primary:active, .btn-primary:visited { + border-color: #007001; + background-color: #007001; + background-image: url(/images/buttons/StyleGuide/bg-btn-green.png); + color: white; +} +.btn-disabled-primary, .btn-disabled-primary:link, .btn-disabled-primary:active, .btn-disabled-primary:visited { + background-color: #99c699; + background-image: url(/images/buttons/StyleGuide/bg-btn-green.png); + border-color: #99c699; + color: white; +} + +.btn-neutral, .btn-neutral:link, .btn-neutral:active, .btn-neutral:visited { + border-color: #0852b7; + background-color: #0852b7; + background-image: url(/images/buttons/StyleGuide/bg-btn-blue.png); + color: white; +} +.btn-disabled-neutral, .btn-disabled-neutral:link, .btn-disabled-neutral:active, .btn-disabled-neutral:visited { + background-color: #9cbae2; + background-image: url(/images/buttons/StyleGuide/bg-btn-blue.png); + border-color: #9cbae2; + color: white; +} + +.btn-negative, .btn-negative:link, .btn-negative:active, .btn-negative:visited { + border-color: #565656; + background-color: #565656; + background-image: url(/images/buttons/StyleGuide/bg-btn-gray.png); + color: white; +} +.btn-disabled-negative, .btn-disabled-negative:link, .btn-disabled-negative:active, .btn-disabled-negative:visited { + background-color: #bbbcbb; + background-image: url(/images/buttons/StyleGuide/bg-btn-gray.png); + border-color: #bbbcbb; + color: white; +} #footer_signup { text-align: center; diff --git a/public/css/classicapp.css b/public/css/classicapp.css index f00350a..9eb5f9e 100644 --- a/public/css/classicapp.css +++ b/public/css/classicapp.css @@ -34,7 +34,8 @@ html { } #logo_full { - display: none; + display: none; + margin-right: 0; } #logo_small { @@ -114,13 +115,14 @@ html { align-items: center; height: 40px; } -.navbarbutton { +#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; } .Redesign .smallnavbarbutton { position: relative; @@ -137,6 +139,21 @@ html { top: 44px; } +#footer_signup a, #footer_signup p a, #footer a, #footer p a { + transition: 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; +} + +#navbarsignedincontainer { + display: block; +} +#navbarsignedincontainer a:nth-child(1)::after { + content: ' | '; +} + @media (min-width: 1688px) { #logo_full { display: block; diff --git a/public/css/classicappdark.css b/public/css/classicappdark.css index 57149b0..a37717f 100644 --- a/public/css/classicappdark.css +++ b/public/css/classicappdark.css @@ -32,7 +32,8 @@ html { } #logo_full { - display: none; + display: none; + margin-right: 0; } #logo_small { @@ -112,13 +113,14 @@ html { align-items: center; height: 40px; } -.navbarbutton { +#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; } .Redesign .smallnavbarbutton { position: relative; @@ -135,6 +137,21 @@ html { top: 44px; } +#footer_signup a, #footer_signup p a, #footer a, #footer p a { + transition: 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; +} + +#navbarsignedincontainer { + display: block; +} +#navbarsignedincontainer a:nth-child(1)::after { + content: ' | '; +} + @media (min-width: 1688px) { #logo_full { display: block; diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index aab0bcd..1561ef6 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -5,7 +5,6 @@ @section('Body')
-

Administration Area

@@ -55,7 +54,6 @@
- @endsection @section('content')

{{ env('APP_NAME') }}

diff --git a/resources/views/admin/tree.blade.php b/resources/views/admin/tree.blade.php index 76ec798..1921117 100644 --- a/resources/views/admin/tree.blade.php +++ b/resources/views/admin/tree.blade.php @@ -13,6 +13,30 @@ @endsection +@section('Body') +
+

+ Invite Tree +

+
+
+
+ +@if (request()->query('q')) +X +@endif + + + +
+
+@if ($user) +
+
+@endif +
+
+@endsection @section('content')

Invite Tree

diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php index 6108fea..5eda0bd 100644 --- a/resources/views/admin/users.blade.php +++ b/resources/views/admin/users.blade.php @@ -9,6 +9,197 @@ @endsection +@section('Body') +
+

+ User List +

+
+ Reminder, don't leak any users' date of birth or email address. +
+
+
+
+ +@if (request()->query('q')) +X +@endif + + + +
+
+
+@foreach ($users as $user) +
+
+
+
+ + @if (Cache::has('is_online_' . $user->id)) + + + @else + + + @endif + +
+
+
+ User Details +
+
+
+ Username: +
+ + {{ $user->name }} + +
+
+
+ ID: +
+ + {{ $user->id }} + +
+
+
+ Email: +
+ @if ($user->admin) + [Redacted] + @else + {{ $user->email }} + @endif +
+
+
+ DOB: +
+ + @if ($user->admin) + [Redacted] + @else + {{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }} + @endif + +
+
+
+ Feed Status : +
+ + @if (!request()->has('q')) + @if (!empty($user->feedposts->last()->status)) + "{{ $user->feedposts->last()->status }}" + @else + "I'm new to ARCHBLOX!" + @endif + @else + @if (!empty(App\Models\FeedPost::where('user_id', $user->id)->first()->status)) + "{{ App\Models\FeedPost::where('user_id', $user->id)->orderBy('id', 'desc')->first()->status }}" + @else + "I'm new to ARCHBLOX!" + @endif + @endif + +
+
+
+ Bio : +
+ + {!! nl2br(e($user->blurb)) !!} + +
+
+
+ Total Friends : +
+ + {{ $user->getFriendsCount() }} + +
+
+
+ Mutual Friends : +
+ + {{ Auth::user()->getMutualFriendsCount($user) }} + +
+ + +
+
+ Join Date : +
+ + @guest + {{ $user->created_at->format('d/m/Y') }} + @else + {{ $user->created_at->format(Auth::user()->settings->date_preference) }} + @endguest + +
+
+
+ Invited By +
+ + {{ App\Models\User::where('id', $user->invited_by)->first()->name }} + +
+
+
+ Type: +
+ + @if ($user->admin) + Admin + @else + Member + @endif + +
+
+
+ Moderation Status: +
+ + Normal + +
+
+
+@endforeach +@if ($users->isEmpty()) + + Unable to find user, please check if you entered the correct information. + +@endif +
+
+
+{{ $users->appends($_GET)->links() }} +@endsection @section('content')

User List

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 2d4ffe4..7922db9 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -19,12 +19,11 @@
@csrf

- + onClick="this.form.submit();this.disabled=true;this.innerText='Posting…';">Share

@if ($errors->any()) {{ $errors->first() }} @@ -57,7 +56,8 @@
@endforeach @if ($posts->isEmpty()) -

Your feed is empty.

+

No news about your friends... want to know what your friends are up to?

+ make some friends now. @endif
{{ $posts->links() }} @@ -92,10 +92,10 @@ @endif
-

Recently Played

+

Recently Played Games


-

You haven't played any games yet!

+

You haven't played any games recently.

Play Now

diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index 57bc74c..0ed7e14 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -31,6 +31,13 @@ Admin Panel +
+ Logged in as {{ Auth::user()->name }} +
+
+ Main Site + ← +