Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE
This commit is contained in:
Thomas G
commit
ebf881a16f
|
|
@ -642,7 +642,8 @@ button:hover a {
|
|||
color: #b8b8b8;
|
||||
}
|
||||
|
||||
iframe {
|
||||
#NavigationRedesignBannerContainer .HeaderDivider {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#logo_full {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,14 @@ body {
|
|||
min-width: 0px;
|
||||
}
|
||||
|
||||
@font-face
|
||||
{
|
||||
font-family: "copenhagen-icons";
|
||||
src: url(copenhagen-icons-268fb7c014de8a06d7d40310b5000daa..woff) format("woff");
|
||||
font-weight: normal;
|
||||
font-style: normal
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 32px;
|
||||
font-weight: 800;
|
||||
|
|
@ -66,6 +74,8 @@ h6 {
|
|||
box-shadow: 0 2px 8px 0 #000;
|
||||
z-index: 1;
|
||||
position: relative;
|
||||
border-bottom-left-radius: 15px;
|
||||
border-bottom-right-radius: 15px;
|
||||
}
|
||||
.NewPanel .AdminSubHeader ul {
|
||||
padding: 0;
|
||||
|
|
@ -282,12 +292,12 @@ h6 {
|
|||
user-select: none;
|
||||
}
|
||||
.NewPanel .AuthenticatedUserName {
|
||||
color: #009dff;
|
||||
color: #00b7ff;
|
||||
transition: .25s all ease-in-out;
|
||||
display: inline-block;
|
||||
}
|
||||
.NewPanel .AdminHeader .HomeBtn {
|
||||
color: #009dff;
|
||||
color: #00b7ff;
|
||||
cursor: default;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
|
|
@ -337,7 +347,7 @@ h6 {
|
|||
overflow-wrap: anywhere;
|
||||
}
|
||||
.NewPanel .AuthenticatedUserName:hover, .NewPanel .Backbtn:hover, .NewPanel .Backbtn:hover + .BackArrow {
|
||||
color: #2fcfff;
|
||||
color: #7ddaff;
|
||||
transition: .25s all ease-in-out;
|
||||
}
|
||||
.NewPanel .SearchContainer .Thumbnail a {
|
||||
|
|
@ -370,41 +380,121 @@ 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 #BodyWrapper .forwardArrow::before {
|
||||
font-family: "copenhagen-icons";
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
line-height: 1em;
|
||||
vertical-align: middle;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
.NewPanel .InvitationSubName .InvitationText {
|
||||
.NewPanel #BodyWrapper .forwardArrow::before {
|
||||
content: '\2794';
|
||||
}
|
||||
.NewPanel .SearchTree .forwardArrow:hover {
|
||||
color: #00b7ff;
|
||||
}
|
||||
.NewPanel #BodyWrapper .forwardArrow {
|
||||
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;
|
||||
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 #BodyWrapper .forwardArrow::after, .NewPanel #BodyWrapper .userInfo::after {
|
||||
display: none;
|
||||
}
|
||||
.NewPanel .InvitationSubName li {
|
||||
list-style: none;
|
||||
.NewPanel #BodyWrapper .userInfo {
|
||||
margin: 0;
|
||||
}
|
||||
.NewPanel #BodyWrapper .userInfo::before {
|
||||
font-family: "copenhagen-icons";
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
line-height: 1em;
|
||||
vertical-align: middle;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
.NewPanel #BodyWrapper .userInfo::before {
|
||||
content: '\2139';
|
||||
padding: 0 2px;
|
||||
border: 1px solid;
|
||||
border-radius: 100%;
|
||||
}
|
||||
.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;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.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) {
|
||||
|
|
|
|||
|
|
@ -377,6 +377,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;
|
||||
|
|
@ -592,8 +600,6 @@ html {
|
|||
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
font-style: normal;
|
||||
height: 100%;
|
||||
color: #000;
|
||||
background-color: #cccccc;
|
||||
}
|
||||
|
||||
.loggedout {
|
||||
|
|
@ -608,12 +614,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,
|
||||
|
|
@ -687,6 +692,7 @@ body {
|
|||
}
|
||||
.hyperlink {
|
||||
display: block;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#footer {
|
||||
|
|
@ -699,9 +705,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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,23 +47,27 @@
|
|||
background: linear-gradient(#303030 10%, #000000 100%);
|
||||
}
|
||||
|
||||
html {
|
||||
body {
|
||||
background-color: rgb(31, 31, 31);
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +81,7 @@ html {
|
|||
}
|
||||
|
||||
#footer {
|
||||
background: rgb(0, 0, 0);
|
||||
background: rgb(31, 31, 31);
|
||||
}
|
||||
|
||||
#footer_signup {
|
||||
|
|
@ -122,7 +126,6 @@ input {
|
|||
color: rgb(200,200,200);
|
||||
}
|
||||
|
||||
|
||||
.tab_selected {
|
||||
background: linear-gradient(180deg, #00a2ff 0%, #01639c 100%)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
@section('Body')
|
||||
<div id="Body" style="width: 970px;">
|
||||
<h2 class="MainHeader">
|
||||
Administration Area
|
||||
Home
|
||||
</h2>
|
||||
<div class="StatsContainer">
|
||||
<div class="Stats-Wrapper">
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
{{ App\Models\InviteKey::count() }}
|
||||
</span>
|
||||
<span class="Stats">
|
||||
Invite Keys
|
||||
Invite Key(s)
|
||||
</span>
|
||||
</div>
|
||||
<div class="Stats-Wrapper">
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
{{ App\Models\InviteKey::where('active', true)->count() }}
|
||||
</span>
|
||||
<span class="Stats">
|
||||
Unused Invite Keys
|
||||
Unused Invite Key(s)
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -37,17 +37,34 @@
|
|||
</div>
|
||||
</form>
|
||||
@if ($user)
|
||||
<a class="InvitationUserName AuthenticatedUserName" href="{{ route('profile', $user->id) }}">{{ $user->name }}</a>
|
||||
<div class="InvitationSubName">
|
||||
<h4 class="InvitationText">Invited By </h4>
|
||||
<a href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}" class="AuthenticatedUserName">{{ $invited_by }}</a>
|
||||
<h5 class="InvitationSubText">{{ $user->name }} Invited</h5>
|
||||
@foreach ($children as $child)
|
||||
<li>
|
||||
<a href="{{ route('profile', $child->id) }}" target="_blank" class="AuthenticatedUserName">{{ $child->name }}</a>
|
||||
</li>
|
||||
@endforeach
|
||||
</div>
|
||||
<ul class="SearchTree">
|
||||
<li class="Menu">
|
||||
<a title="{{ $invited_by }}'s Invite Tree" href="/iphone/tree?q={{ App\Models\User::where('name', $invited_by)->first()->id }}&searchBy=id">
|
||||
<span>{{ $invited_by }}</span>
|
||||
</a>
|
||||
<a href="/iphone/users?q={{ App\Models\User::where('name', $invited_by)->first()->id }}&searchBy=id" title="View {{ App\Models\User::where('name', $invited_by)->first()->name }}'s Details" class="userInfo"></a>
|
||||
<a href="{{ route('profile', App\Models\User::where('name', $invited_by)->first()->id) }}" title="{{ $invited_by }}'s Profile" class="forwardArrow"></a>
|
||||
<ul id="DropDown" class="TreeList">
|
||||
<li class="subList">
|
||||
<a href="{{ route('profile', $user->id) }}" title="{{ $user->name }}'s Profile" class="RedirectArrow">
|
||||
<span>{{ $user->name }}</span>
|
||||
</a>
|
||||
<a href="/iphone/users?q={{ $user->id }}&searchBy=id" title="View {{ $user->name }}'s Details" class="userInfo"></a>
|
||||
<ul class="TreeList">
|
||||
@foreach ($children as $child)
|
||||
<li>
|
||||
<a href="/iphone/tree?q={{ $child->id }}&searchBy=id" title="{{ $child->name }}'s Invite Tree">
|
||||
<span>{{ $child->name }}</span>
|
||||
</a>
|
||||
<a href="/iphone/users?q={{ $child->id }}&searchBy=id" title="View {{ $child->name }}'s Details" class="userInfo"></a>
|
||||
<a href="{{ route('profile', $child->id) }}" title="{{ $child->name }}'s Profile" class="forwardArrow"></a>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -82,7 +82,11 @@
|
|||
@if ($user->admin)
|
||||
[Redacted]
|
||||
@else
|
||||
{{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}
|
||||
@guest
|
||||
{{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}
|
||||
@else
|
||||
{{ Carbon\Carbon::parse($user->dob)->format(Auth::user()->settings->date_preference) }}
|
||||
@endguest
|
||||
@endif
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -165,6 +169,15 @@
|
|||
<a href="{{ route('profile', App\Models\User::where('id', $user->invited_by)->first()->id) }}" class="AuthenticatedUserName">
|
||||
{{ App\Models\User::where('id', $user->invited_by)->first()->name }}
|
||||
</a>
|
||||
<a href="/iphone/tree?q={{ App\Models\User::where('id', $user->invited_by)->first()->id }}&searchBy=id" title="{{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
|
||||
</div>
|
||||
<div class="Row">
|
||||
<div class="text-secondary">
|
||||
View
|
||||
</div>
|
||||
<a href="/iphone/tree?q={{ $user->id }}&searchBy=id" title="View invite tree from {{ $user->name }}" class="AuthenticatedUserName">
|
||||
Invite Tree
|
||||
</a>
|
||||
</div>
|
||||
<div class="Row">
|
||||
<div class="text-secondary">
|
||||
|
|
|
|||
|
|
@ -15,5 +15,5 @@
|
|||
<br>
|
||||
<p><a alt="Sign Up button" href="{{ route('register') }}" >Sign Up</a> or <a alt="Log In button" href="{{ route('login') }}">Login</a></p>
|
||||
<br>
|
||||
<a class="hyperlink" href="https://discord.gg/nudzQ7hkWY">Join our Discord!</a>
|
||||
<span class="hyperlink"><a href="https://discord.gg/nudzQ7hkWY">Join our Discord!</a></span>
|
||||
@endsection
|
||||
|
|
@ -127,9 +127,11 @@
|
|||
<div id="HeaderLoginButton" class="RightNav">
|
||||
<div id="navbarsignedincontainer">
|
||||
<a href="@guest {{ route('login') }} @else {{ route('profile', Auth::id()) }} @endguest">{{ Auth::user()->name }}</a>
|
||||
<div class="HeaderDivider"></div>
|
||||
<div class="arkotcontainer"><img class="arkoticon_navbar" src="{{ asset('img/arkot.png') }}">
|
||||
<p> {{ Auth::user()->morbux }}</p>
|
||||
</div>
|
||||
<div class="HeaderDivider"></div>
|
||||
<a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue