Skip to content
Merged

fix UI #2922

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/assets/app-DMiI0jLB.css

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/app-DPSMvogr.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"resources/assets/sass/app.scss": {
"file": "assets/app-D4lI0bhX.css",
"file": "assets/app-B44hSfhu.css",
"src": "resources/assets/sass/app.scss",
"isEntry": true
},
"resources/css/app.css": {
"file": "assets/app-DMiI0jLB.css",
"file": "assets/app-DPSMvogr.css",
"src": "resources/css/app.css",
"isEntry": true
},
"resources/js/app.js": {
"file": "assets/app-DtsPD-UJ.js",
"file": "assets/app-z_gOviap.js",
"name": "app",
"src": "resources/js/app.js",
"isEntry": true,
Expand Down
10 changes: 5 additions & 5 deletions resources/js/components/ModerateEvent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<div class="moderate-event">
<!-- HELLO !!! -->

<div class="px-6 flex items-center w-full gap-3" v-if="refresh">
<div class="px-5 flex items-center w-full gap-1" v-if="refresh">
<p class="text-default text-slate-500 flex items-center font-semibold p-0">Moderation:</p>
<div class="flex justify-between flex-1 items-center">
<button @click="approve" class="font-normal w-fit px-3 py-1 bg-dark-blue text-white rounded-full flex items-center">Approve</button>
<button @click="toggleModal" class="font-normal w-fit px-3 py-1 bg-primary text-white rounded-full flex items-center">Reject</button>
<button @click="toggleDeleteModal" class="font-normal w-fit px-3 py-1 bg-dark-orange text-white rounded-full flex items-center">Delete</button>
<div class="flex justify-end flex-1 items-center gap-1">
<button @click="approve" class="font-normal w-fit px-2.5 py-1 bg-dark-blue text-white rounded-full flex items-center">Approve</button>
<button @click="toggleModal" class="font-normal w-fit px-2.5 py-1 bg-primary text-white rounded-full flex items-center">Reject</button>
<button @click="toggleDeleteModal" class="font-normal w-fit px-2.5 py-1 bg-dark-orange text-white rounded-full flex items-center">Delete</button>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion resources/views/badges/leaderboard.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="w-full overflow-hidden flex flex-col md:flex-row justify-end md:items-center flex-shrink-0">
<div class="codeweek-container-lg flex items-center gap-6">
<h2 class="text-white font-normal text-3xl tablet:font-medium tablet:text-5xl font-['Montserrat']">
Badges Leaderboard for
Badges Leaderboard
</h2>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/badges/user.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
<p class="font-normal text-default md:text-xl p-0 text-slate-500 leading-[22px] md:leading-[30px] mb-3">
<span class="font-semibold">Reported events for {{$year}}:</span> {{$user->reported($year)}}
</p>
<p class="font-normal text-default md:text-xl p-0 text-slate-500 leading-[22px] md:leading-[30px] mb-3">
<p class="font-normal text-default md:text-xl p-0 text-slate-500 leading-[22px] md:leading-[30px] mb-4">
<span class="font-semibold">Influencer Bits for {{$year}}:</span> {{$user->influence($year)}}
</p>
<div class="mb-4">
<div class="mb-4 rounded-2xl border-2 border-[#B399D6] p-6">
<p id="header-1" class="font-semibold p-0 mb-2 text-lg md:text-2xl text-dark-blue">
Organiser Badges
</p>
Expand Down Expand Up @@ -64,7 +64,7 @@
</div>
</div>
</div>
<div class="mb-4">
<div class="mb-4 rounded-2xl border-2 border-[#B399D6] p-6">
<p id="header-1" class="font-semibold p-0 mb-2 text-lg md:text-2xl text-dark-blue">
Influencer Badges
</p>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/event/event_tile_approval.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="relative">
<img src="{{$event->picture_path()}}" class="w-full object-cover h-[200px]" alt="{{$event->title}}" />
</div>
<div class="flex-grow px-6 py-4 flex flex-col justify-between">
<div class="flex-grow px-6 py-4 flex flex-col justify-start">
@can('approve', $event)
@isset($moderation)
@if($event->owner)
Expand All @@ -21,7 +21,7 @@
<div class="text-slate-500 text-default p-0 font-semibold mb-2">
Activity Date: {{Carbon\Carbon::parse($event->start_date)->isoFormat('llll')}}
</div>
<div class="[&_p]:p-0 [&_p]:empty:hidden space-y-1 text-slate-500 font-normal text-default">
<div class="[&_p]:p-0 [&_p]:empty:hidden space-y-1 text-slate-500 font-normal text-default max-h-60 overflow-hidden">
{!! $event->description !!}
</div>
</div>
Expand Down
Loading