Skip to content

Commit

Permalink
💄
Browse files Browse the repository at this point in the history
  • Loading branch information
realodix committed Dec 25, 2024
1 parent 8161cd4 commit 7e5f601
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 31 deletions.
14 changes: 10 additions & 4 deletions resources/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,19 @@ hr {
}

&-secondary {
@apply bg-gray-100 border-gray-100;
@apply bg-gray-100 border-gray-200;
@apply hover:bg-gray-200 active:bg-gray-100;
}
}

.common-card-style {
@apply bg-white border-y sm:rounded-lg sm:border border-uh-border-color;
.--card-style {
@apply bg-white;
@apply border-y border-uh-border-color shadow-sm;
@apply sm:border sm:shadow-sm sm:rounded-lg;
}

.card-default {
@apply --card-style;
@apply px-2 md:px-8 py-5;
/* @apply sm:shadow-[0_1px_2px_#e5e5e8]; */

Expand Down Expand Up @@ -127,7 +133,7 @@ hr {
}

.auth-card {
@apply bg-white border-y sm:rounded-lg sm:border border-uh-border-color;
@apply --card-style;
@apply w-full sm:max-w-md mt-6 px-12 py-8 overflow-hidden;
}

Expand Down
12 changes: 11 additions & 1 deletion resources/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
border-radius: unset;
}

tr {
@apply hover:bg-gray-50;
}

td {
border: 1px solid #e2e8f0;

Expand All @@ -54,14 +58,20 @@
}
}
}

nav[aria-label="Pagination Navigation"] {
span, a {
@apply !border-uh-border-color;
}
}
}


.page_about {
dl {
display: grid;
grid-gap: 4px 16px;
grid-template-columns: max-content;
/* grid-template-columns: max-content; */
}

dt {
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/verify-email.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
@endif

<div class="common-card-style mb-8">
<div class="card-default mb-8">
<p class="font-bold">
{{ __('Thanks for signing up!') }}
</p>
Expand Down
12 changes: 4 additions & 8 deletions resources/views/backend/about.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
@section('content')
<main class="page_about max-w-4xl">
<div class="flex flex-wrap gap-4 mb-4 justify-end">
<div class="bg-white p-4 sm:rounded-lg w-full md:w-2/6
border-y border-uh-border-color sm:border-none sm:shadow-md"
>
<div class="--card-style p-4 w-full md:w-2/6">
<div class="flex flex-row space-x-4 items-center">
<div>
<p class="text-[#4f5b93] text-sm font-medium leading-4">PHP</p>
Expand All @@ -18,9 +16,7 @@
</div>
</div>
</div>
<div class="bg-white p-4 sm:rounded-lg w-full md:w-2/6
border-y border-uh-border-color sm:border-none sm:shadow-md"
>
<div class="--card-style p-4 w-full md:w-2/6">
<div class="flex flex-row space-x-4 items-center">
<div>
<p class="text-[#ff2d20] text-sm font-medium leading-4">Laravel</p>
Expand All @@ -34,7 +30,7 @@

<br>

<div class="common-card-style">
<div class="card-default">
<div class="card_header__sub_header">Links</div>
<dl>
@php
Expand Down Expand Up @@ -95,7 +91,7 @@
$reservedActiveKeyList = $keyGenerator->reservedActiveKeyword()->toArray();
$reservedKeyword = $keyGenerator->reservedKeyword();
@endphp
<div class="common-card-style">
<div class="card-default">
<div class="card_header">{{ __('Configuration') }}</div>

<div class="card_header__sub_header">Shortened Links</div>
Expand Down
12 changes: 4 additions & 8 deletions resources/views/backend/dashboard.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
@section('title', __('Dashboard'))
@section('content')
<main>
<div class="grid gird-cols-1 md:grid-cols-4 gap-7 mb-8">
<div class="bg-white p-4 sm:rounded-lg
border-y border-uh-border-color sm:border-none sm:shadow-md"
>
<div class="grid gird-cols-1 md:grid-cols-4 gap-4 mb-8">
<div class="--card-style p-4">
<div class="flex flex-row space-x-4 items-center">
@svg('icon-link', 'mr-1.5 text-emerald-600 text-3xl')
<div>
Expand All @@ -17,9 +15,7 @@
</div>
</div>
</div>
<div class="bg-white p-4 sm:rounded-lg
border-y border-uh-border-color sm:border-none sm:shadow-md"
>
<div class="--card-style p-4">
<div class="flex flex-row space-x-4 items-center">
@svg('icon-chart-line-alt', 'mr-1.5 text-amber-600 text-3xl')
<div>
Expand All @@ -32,7 +28,7 @@
</div>
</div>

<div class="common-card-style">
<div class="card-default">
<div class="card_header__v2">
<div class="w-1/2">
<span class="text-2xl text-black">{{ __('My URLs') }}</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="w-full md:w-8/12 lg:w-6/12 mt-5 md:mt-0 md:ml-4">
<form method="post" action="{{ route('link.update', $url) }}">
@csrf
<div class="common-card-style">
<div class="card-default">
<div class="grid grid-cols-6 gap-6">
<div class="col-span-6 lg:col-span-4">
<label for="short-url" class="form-label">{{ __('Short URL') }}</label>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/url-list-of-guest.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@section('content')
<main>
<div class="common-card-style">
<div class="card-default">
<div class="card_header__v2">
<div class="w-1/2">
<span class="text-2xl text-black">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/url-list-of-user.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@section('content')
<main>
<div class="common-card-style">
<div class="card-default">
<div class="card_header__v2">
<div class="w-1/2">
<span class="text-2xl text-black">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/url-list.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@section('content')
<main>
<div class="common-card-style">
<div class="card-default">
<div class="card_header__v2">
<div class="w-1/2">
<span class="text-2xl text-black">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/user/account.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="w-full md:w-8/12 lg:w-6/12 mt-5 md:mt-0 md:ml-4">
<form method="post" action="{{ route('user.update', $user) }}">
@csrf
<div class="common-card-style">
<div class="card-default">
<div class="grid grid-cols-6 gap-6">
<div class="col-span-6 lg:col-span-4">
<label class="form-label">{{ __('Username') }}</label>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/user/changepassword.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="w-full md:w-8/12 lg:w-6/12 mt-5 md:mt-0 md:ml-4">
<form method="post" action="{{ route('user.password.store', $user) }}">
@csrf
<div class="common-card-style">
<div class="card-default">
<div class="grid grid-cols-6 gap-6" x-data="{show: true}">
<div class="col-span-6 lg:col-span-4">
<label for="current_password" class="form-label">{{ __('Your Password') }}</label>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/backend/user/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@section('content')
<main>
<div class="common-card-style">
<div class="card-default">
<div class="card_header__v2">{{ __('All Users') }}</div>

@livewire('table.user-table')
Expand Down
2 changes: 1 addition & 1 deletion resources/views/frontend/short.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ul>
</div>

<div class="common-card-style flex flex-wrap mt-6 sm:mt-0 px-4 py-5 sm:p-6">
<div class="card-default flex flex-wrap mt-6 sm:mt-0 px-4 py-5 sm:p-6">
<div class="w-full md:w-1/4 flex justify-center">
<img class="qrcode h-fit" src="{{ $qrCode->getDataUri() }}" alt="QR Code">
</div>
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default {
"primary-700": "#4338ca",
"primary-800": "#3730a3",
"uh-blue": "#3d5b99",
"uh-border-color": "#d0d7de",
"uh-border-color": "#e7e5e4",
},
},
},
Expand Down

0 comments on commit 7e5f601

Please sign in to comment.