diff --git a/public/css/2018.css b/public/css/2018.css index 09c039c..cdb3e36 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -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; diff --git a/public/css/app.css b/public/css/app.css index ed1cc51..5b2a658 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -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; diff --git a/resources/views/messages/create.blade.php b/resources/views/messages/create.blade.php index 9f919e0..cd9d758 100644 --- a/resources/views/messages/create.blade.php +++ b/resources/views/messages/create.blade.php @@ -17,7 +17,7 @@ @if (request()->has('replyTo'))

To:

Subject:

- + @@ -28,7 +28,7 @@ @if (request()->has('to')) value="{{ request()->to }}" @else value="{{ old('name') }}" @endif>

Subject:

- + diff --git a/resources/views/messages/deleted.blade.php b/resources/views/messages/deleted.blade.php index 29da512..7669c59 100644 --- a/resources/views/messages/deleted.blade.php +++ b/resources/views/messages/deleted.blade.php @@ -5,8 +5,7 @@ @section('alert') @if (session()->has('success')) -
+
{{ session()->get('success') }}
@endif @@ -38,11 +37,11 @@ onclick="window.location='/my/messages/{{ $message->id }}';">
- Profile ImageProfile Image
- {{ $message->user->name }}

{{ $message->subject }}

@if (!Auth::user()->settings->time_preference_24hr) diff --git a/resources/views/messages/index.blade.php b/resources/views/messages/index.blade.php index a0d2364..641b9ba 100644 --- a/resources/views/messages/index.blade.php +++ b/resources/views/messages/index.blade.php @@ -5,9 +5,7 @@ @section('alert') @if (session()->has('success')) -
- {{ session()->get('success') }}
+
{{ session()->get('success') }}
@endif @if ($errors->any())
{{ $errors->first() }}
@@ -37,11 +35,11 @@ onclick="window.location='/my/messages/{{ $message->id }}';">
- Profile ImageProfile Image
- {{ $message->user->name }}

{{ $message->subject }}

@if (!Auth::user()->settings->time_preference_24hr) diff --git a/resources/views/messages/sent.blade.php b/resources/views/messages/sent.blade.php index b3f9972..c20411a 100644 --- a/resources/views/messages/sent.blade.php +++ b/resources/views/messages/sent.blade.php @@ -5,7 +5,7 @@ @section('alert') @if (session()->has('success')) -
{{ session()->get('success') }} +
{{ session()->get('success') }}
@endif @endsection @@ -28,11 +28,11 @@ onclick="window.location='/my/messages/{{ $message->id }}';">
- Profile ImageProfile Image
- {{ App\Models\User::where('id', $message->sendto_id)->first()->name }}

{{ $message->subject }}

@if (!Auth::user()->settings->time_preference_24hr) diff --git a/resources/views/misc/settings.blade.php b/resources/views/misc/settings.blade.php index 6dce64e..9c3e057 100644 --- a/resources/views/misc/settings.blade.php +++ b/resources/views/misc/settings.blade.php @@ -97,10 +97,7 @@
{{ $errors->first() }}
@endif @if (session()->has('change')) -
- {{ session()->get('change') }} -
+
{{ session()->get('change') }}
@endif @endsection