From c8414d613fb8a6d7f1e71761a9c4ef6bfc801903 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:16:40 +1000 Subject: [PATCH 1/9] fixed messages --- resources/views/messages/create.blade.php | 4 ++-- resources/views/messages/deleted.blade.php | 4 ++-- resources/views/messages/index.blade.php | 4 ++-- resources/views/messages/sent.blade.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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..f09bc96 100644 --- a/resources/views/messages/deleted.blade.php +++ b/resources/views/messages/deleted.blade.php @@ -38,11 +38,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..f71f902 100644 --- a/resources/views/messages/index.blade.php +++ b/resources/views/messages/index.blade.php @@ -37,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/sent.blade.php b/resources/views/messages/sent.blade.php index b3f9972..366fa0d 100644 --- a/resources/views/messages/sent.blade.php +++ b/resources/views/messages/sent.blade.php @@ -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) From 07d26b9f98db49627e840255e01533147fc77f0b Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:25:02 +1000 Subject: [PATCH 2/9] #success class --- public/css/2018.css | 12 ++++++++++++ public/css/app.css | 9 ++++++++- resources/views/messages/deleted.blade.php | 3 +-- resources/views/messages/index.blade.php | 4 +--- resources/views/messages/sent.blade.php | 2 +- resources/views/misc/settings.blade.php | 5 +---- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/public/css/2018.css b/public/css/2018.css index 09c039c..3455a79 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -48,6 +48,18 @@ body { height: 28px; } +#alert, #success { + top: 40px; +} + +#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..22b4fe4 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -10,7 +10,7 @@ } } -#alert { +#alert, #success { height: fit-content; margin: 0px; position: fixed; @@ -21,9 +21,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; } diff --git a/resources/views/messages/deleted.blade.php b/resources/views/messages/deleted.blade.php index f09bc96..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 diff --git a/resources/views/messages/index.blade.php b/resources/views/messages/index.blade.php index f71f902..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() }}
diff --git a/resources/views/messages/sent.blade.php b/resources/views/messages/sent.blade.php index 366fa0d..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 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 From 85958d3f8f02d08e229bf2968b5ec49f74deaba7 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:28:16 +1000 Subject: [PATCH 3/9] anim --- public/css/2018.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/public/css/2018.css b/public/css/2018.css index 3455a79..3e4c9e8 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -1,3 +1,15 @@ +@keyframes in { + from { + top: 0px; + animation-timing-function: linear; + } + + to { + background-position-x: 40px; + animation-timing-function: linear; + } + } + html { background: none; } @@ -50,6 +62,9 @@ body { #alert, #success { top: 40px; + animation: in; + animation-duration: 50ms; + animation-iteration-count: 1; } #alert { From 5833cac7a71adeeaa28ede0e7e238092eab85b4c Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:33:21 +1000 Subject: [PATCH 4/9] Update 2018.css --- public/css/2018.css | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/public/css/2018.css b/public/css/2018.css index 3e4c9e8..4750d8f 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -1,13 +1,23 @@ -@keyframes in { - from { +@keyframes alertanim { + 0% { top: 0px; animation-timing-function: linear; } - to { + 10% { background-position-x: 40px; animation-timing-function: linear; } + + 90% { + background-position-x: 40px; + animation-timing-function: linear; + } + + 100% { + top: 0px; + animation-timing-function: linear; + } } html { @@ -62,8 +72,8 @@ body { #alert, #success { top: 40px; - animation: in; - animation-duration: 50ms; + animation: alertanim; + animation-duration: 5s; animation-iteration-count: 1; } From f1b8ccd404d9b1636b48103fd2e4216f3348afb3 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:36:11 +1000 Subject: [PATCH 5/9] Update 2018.css --- public/css/2018.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/2018.css b/public/css/2018.css index 4750d8f..f28fb39 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -73,7 +73,7 @@ body { #alert, #success { top: 40px; animation: alertanim; - animation-duration: 5s; + animation-duration: 2s; animation-iteration-count: 1; } From 91bd919e3da8357108cba573b566fe74f8591202 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:37:24 +1000 Subject: [PATCH 6/9] Update 2018.css --- public/css/2018.css | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/public/css/2018.css b/public/css/2018.css index f28fb39..cdb3e36 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -4,21 +4,11 @@ animation-timing-function: linear; } - 10% { + 100% { background-position-x: 40px; animation-timing-function: linear; } - - 90% { - background-position-x: 40px; - animation-timing-function: linear; - } - - 100% { - top: 0px; - animation-timing-function: linear; - } - } +} html { background: none; @@ -73,7 +63,7 @@ body { #alert, #success { top: 40px; animation: alertanim; - animation-duration: 2s; + animation-duration: 250ms; animation-iteration-count: 1; } From c3d7cde4cfaa91177de6b5004f96a71960299b25 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:39:26 +1000 Subject: [PATCH 7/9] Update app.css --- public/css/app.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/public/css/app.css b/public/css/app.css index 22b4fe4..2569380 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -10,9 +10,24 @@ } } +@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; top: 72px; padding-top: 2px; From 5fa5ab117c8511f50d48bc60aa22abe7ba32dd1f Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:40:02 +1000 Subject: [PATCH 8/9] Update app.css --- public/css/app.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/app.css b/public/css/app.css index 2569380..04cba50 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -29,6 +29,7 @@ animation-duration: 250ms; animation-iteration-count: 1; position: fixed; + z-index: -1; top: 72px; padding-top: 2px; padding-bottom: 2px; From 9ff80a1a6c26cca7303e0d37394aa7d2577d3029 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:41:19 +1000 Subject: [PATCH 9/9] Update app.css --- public/css/app.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/css/app.css b/public/css/app.css index 04cba50..5b2a658 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -29,7 +29,7 @@ animation-duration: 250ms; animation-iteration-count: 1; position: fixed; - z-index: -1; + z-index: 10; top: 72px; padding-top: 2px; padding-bottom: 2px; @@ -122,6 +122,7 @@ padding-bottom: 2px; color: white; line-height: normal; + z-index: 100; display: inline-flex; vertical-align: middle; width: 100%; @@ -265,6 +266,7 @@ top: 11px; padding-left: 5px; padding-right: 5px; position: fixed; + z-index: 100; top: 43px; padding-top: 2px; padding-bottom: 2px;