Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE
This commit is contained in:
Conkley
commit
2fd26b0ec3
|
|
@ -1,3 +1,15 @@
|
|||
@keyframes alertanim {
|
||||
0% {
|
||||
top: 0px;
|
||||
animation-timing-function: linear;
|
||||
}
|
||||
|
||||
100% {
|
||||
background-position-x: 40px;
|
||||
animation-timing-function: linear;
|
||||
}
|
||||
}
|
||||
|
||||
html {
|
||||
background: none;
|
||||
}
|
||||
|
|
@ -48,6 +60,21 @@ body {
|
|||
height: 28px;
|
||||
}
|
||||
|
||||
#alert, #success {
|
||||
top: 40px;
|
||||
animation: alertanim;
|
||||
animation-duration: 250ms;
|
||||
animation-iteration-count: 1;
|
||||
}
|
||||
|
||||
#alert {
|
||||
background: #D86868;
|
||||
}
|
||||
|
||||
#success {
|
||||
background: #02b757;
|
||||
}
|
||||
|
||||
.smallnavbarbutton:nth-child(1):hover, .smallnavbarbutton:nth-child(3):hover, .profilefriend #FeedContainerBox1Username:hover, .smallnavbarbutton:nth-child(4):hover, .smallnavbarbutton:nth-child(5):hover, .smallnavbarbutton:nth-child(6):hover {
|
||||
color: #00a2ff;
|
||||
text-decoration: none;
|
||||
|
|
|
|||
|
|
@ -10,10 +10,26 @@
|
|||
}
|
||||
}
|
||||
|
||||
#alert {
|
||||
@keyframes alertanim {
|
||||
0% {
|
||||
top: 0px;
|
||||
animation-timing-function: linear;
|
||||
}
|
||||
|
||||
100% {
|
||||
background-position-x: 72px;
|
||||
animation-timing-function: linear;
|
||||
}
|
||||
}
|
||||
|
||||
#alert, #success {
|
||||
height: fit-content;
|
||||
margin: 0px;
|
||||
animation: alertanim;
|
||||
animation-duration: 250ms;
|
||||
animation-iteration-count: 1;
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
top: 72px;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
|
|
@ -21,9 +37,16 @@
|
|||
padding-left: 5px;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#alert {
|
||||
background: linear-gradient(#f07575 10%, #de2323 100%);
|
||||
}
|
||||
|
||||
#success {
|
||||
background:linear-gradient(#a3e2bd 10%,#02b757 100%)
|
||||
}
|
||||
|
||||
.warningtext {
|
||||
color: red;
|
||||
}
|
||||
|
|
@ -99,6 +122,7 @@
|
|||
padding-bottom: 2px;
|
||||
color: white;
|
||||
line-height: normal;
|
||||
z-index: 100;
|
||||
display: inline-flex;
|
||||
vertical-align: middle;
|
||||
width: 100%;
|
||||
|
|
@ -242,6 +266,7 @@ top: 11px;
|
|||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
position: fixed;
|
||||
z-index: 100;
|
||||
top: 43px;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
@if (request()->has('replyTo'))
|
||||
<p>To: <input type="text" name="name" placeholder="Username" value="{{ $replyName }}"></p>
|
||||
<p>Subject: <input type="text" name="subject" placeholder="Subject" value="{{ $replySubject }}"></p>
|
||||
<button type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
|
||||
<button class="greybutton" type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
|
||||
<textarea style="width: calc(100% - 5px); height: 170px; min-height: 170px; resize: vertical;"
|
||||
placeholder="Write your message..." id="message" name="message">{{ old('message') ? old('message') : $replyContent }}</textarea>
|
||||
<button class="greenbutton" type="submit">Send</button>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
@if (request()->has('to')) value="{{ request()->to }}" @else value="{{ old('name') }}" @endif>
|
||||
</p>
|
||||
<p>Subject: <input type="text" name="subject" placeholder="Subject" value="{{ old('subject') }}"></p>
|
||||
<button type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
|
||||
<button class="greybutton" type="button" onClick="document.getElementById('message').value = ''" style="margin-top:3px;margin-bottom:3px">Clear Message</button>
|
||||
<textarea style="width: calc(100% - 5px); height: 170px; min-height: 170px; resize: vertical;"
|
||||
placeholder="Write your message..." id="message" name="message">{{ old('message') }}</textarea>
|
||||
<button class="greenbutton" type="submit">Send</button>
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@
|
|||
|
||||
@section('alert')
|
||||
@if (session()->has('success'))
|
||||
<div id="alert"
|
||||
style="background:linear-gradient(0deg,#02b757 0%,#118237 49%,#01a64e 50%,#3fc679 95%,#a3e2bd 100%)">
|
||||
<div id="success">
|
||||
{{ session()->get('success') }}
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -38,11 +37,11 @@
|
|||
onclick="window.location='/my/messages/{{ $message->id }}';">
|
||||
<div class="FriendsContainerBox" id="FriendsContainerBox1">
|
||||
<div id="FriendsContainerBox1ImageContainer">
|
||||
<a href="{{ route('profile', $message->user_id) }}"><img alt="Profile Image"
|
||||
<a onclick="window.location='/my/messages/{{ $message->id }}';"><img alt="Profile Image"
|
||||
src="{{ asset('img/defaultrender.png') }}" width="60px" height="100%"></a>
|
||||
</div>
|
||||
<div id="FriendsContainerBox1TextContainer">
|
||||
<a href="{{ route('profile', $message->user_id) }}"
|
||||
<a onclick="window.location='/my/messages/{{ $message->id }}';"
|
||||
id="FeedContainerBox1Username">{{ $message->user->name }}</a>
|
||||
<p>{{ $message->subject }}</p>
|
||||
@if (!Auth::user()->settings->time_preference_24hr)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
|
||||
@section('alert')
|
||||
@if (session()->has('success'))
|
||||
<div id="alert"
|
||||
style="background:linear-gradient(0deg,#02b757 0%,#118237 49%,#01a64e 50%,#3fc679 95%,#a3e2bd 100%)">
|
||||
{{ session()->get('success') }}</div>
|
||||
<div id="success">{{ session()->get('success') }}</div>
|
||||
@endif
|
||||
@if ($errors->any())
|
||||
<div id="alert">{{ $errors->first() }}</div>
|
||||
|
|
@ -37,11 +35,11 @@
|
|||
onclick="window.location='/my/messages/{{ $message->id }}';">
|
||||
<div class="FriendsContainerBox" id="FriendsContainerBox1">
|
||||
<div id="FriendsContainerBox1ImageContainer">
|
||||
<a href="{{ route('profile', $message->user_id) }}"><img alt="Profile Image"
|
||||
<a onclick="window.location='/my/messages/{{ $message->id }}';"><img alt="Profile Image"
|
||||
src="{{ asset('img/defaultrender.png') }}" width="60px" height="100%"></a>
|
||||
</div>
|
||||
<div id="FriendsContainerBox1TextContainer">
|
||||
<a href="{{ route('profile', $message->user_id) }}"
|
||||
<a onclick="window.location='/my/messages/{{ $message->id }}';"
|
||||
id="FeedContainerBox1Username">{{ $message->user->name }}</a>
|
||||
<p>{{ $message->subject }}</p>
|
||||
@if (!Auth::user()->settings->time_preference_24hr)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
@section('alert')
|
||||
@if (session()->has('success'))
|
||||
<div id="alert" style="background:linear-gradient(0deg,#02b757 0%,#118237 49%,#01a64e 50%,#3fc679 95%,#a3e2bd 100%)">{{ session()->get('success') }}
|
||||
<div id="success">{{ session()->get('success') }}
|
||||
</div>
|
||||
@endif
|
||||
@endsection
|
||||
|
|
@ -28,11 +28,11 @@
|
|||
onclick="window.location='/my/messages/{{ $message->id }}';">
|
||||
<div class="FriendsContainerBox" id="FriendsContainerBox1">
|
||||
<div id="FriendsContainerBox1ImageContainer">
|
||||
<a href="{{ route('profile', $message->sendto_id) }}"><img alt="Profile Image"
|
||||
<a onclick="window.location='/my/messages/{{ $message->id }}';"><img alt="Profile Image"
|
||||
src="{{ asset('img/defaultrender.png') }}" width="60px" height="100%"></a>
|
||||
</div>
|
||||
<div id="FriendsContainerBox1TextContainer">
|
||||
<a href="{{ route('profile', $message->sendto_id) }}"
|
||||
<a onclick="window.location='/my/messages/{{ $message->id }}';"
|
||||
id="FeedContainerBox1Username">{{ App\Models\User::where('id', $message->sendto_id)->first()->name }}</a>
|
||||
<p>{{ $message->subject }}</p>
|
||||
@if (!Auth::user()->settings->time_preference_24hr)
|
||||
|
|
|
|||
|
|
@ -97,10 +97,7 @@
|
|||
<div id="alert">{{ $errors->first() }}</div>
|
||||
@endif
|
||||
@if (session()->has('change'))
|
||||
<div id="alert"
|
||||
style="background:linear-gradient(0deg,#02b757 0%,#118237 49%,#01a64e 50%,#3fc679 95%,#a3e2bd 100%)">
|
||||
{{ session()->get('change') }}
|
||||
</div>
|
||||
<div id="success">{{ session()->get('change') }}</div>
|
||||
@endif
|
||||
@endsection
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue