Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace some heroicon with untitledui icons #133

Merged
merged 1 commit into from
Jul 27, 2023
Merged
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
6 changes: 3 additions & 3 deletions resources/views/articles/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,13 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
@hasanyrole('admin|moderator')
<button onclick="Livewire.emit('openModal', 'modals.approved-article', {{ json_encode([$article->id]) }})" type="button" class="-ml-px relative inline-flex items-center px-4 py-2 border border-skin-base bg-skin-card text-sm font-medium text-green-500 hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:border-green-500 focus:ring-offset-body">
<span class="sr-only">{{ __('Approuver') }}</span>
<x-heroicon-s-badge-check class="h-5 w-5" />
<x-untitledui-check-verified-02 class="h-5 w-5" />
</button>
@endhasanyrole
@endif
<button onclick="Livewire.emit('openModal', 'modals.delete-article', {{ json_encode([$article->id]) }})" type="button" class="relative inline-flex items-center px-4 py-2 rounded-r-md border border-skin-base bg-skin-card text-sm font-medium text-skin-inverted-muted hover:bg-skin-card-muted focus:z-10 focus:outline-none focus:ring-1 focus:ring-green-500 focus:border-green-500 focus:ring-offset-body">
<span class="sr-only">{{ __('Supprimer') }}</span>
<x-heroicon-s-trash class="h-5 w-5" />
<x-untitledui-trash-03 class="h-5 w-5" />
</button>
</span>
</div>
Expand Down Expand Up @@ -337,7 +337,7 @@ class="w-screen max-w-xs"
<div class="ml-3 h-7 flex items-center">
<button type="button" class="bg-skin-card rounded-md text-skin-muted hover:text-skin-base focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500" @click="openTOC = false">
<span class="sr-only">{{ __('Fermer') }}</span>
<x-heroicon-o-x class="h-6 w-6" />
<x-untitledui-x class="h-6 w-6" />
</button>
</div>
</div>
Expand Down
26 changes: 20 additions & 6 deletions resources/views/components/articles/card.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
@props(['article'])
@props([
'article',
'isSummary' => false,
'iconLink' => false,
])

<div class="space-y-6">
<div
@class([
'space-y-6',
'lg:grid lg:grid-cols-3 lg:items-start lg:gap-6 lg:space-y-0' => $isSummary,
])
>
<a href="{{ route('articles.show', $article) }}" class="group">
<div class="aspect-w-3 aspect-h-2">
<img class="object-cover shadow-lg rounded-lg group-hover:opacity-75" src="{{ $article->getFirstMediaUrl('media') }}" alt="{{ $article->title }}" />
</div>
</a>
<div class="space-y-4">
<div
@class([
'space-y-4',
'sm:col-span-2' => $isSummary,
])
>
<div>
<time datetime="{{ $article->publishedAt()->format('Y-m-d') }}" class="font-sans text-sm leading-5 text-skin-base capitalize">
{{ $article->publishedAt()->isoFormat('LL') }}
Expand All @@ -15,9 +29,9 @@
<h4 class="text-lg leading-6 font-semibold font-sans text-skin-inverted group-hover:text-skin-primary">
{{ $article->title }}
</h4>
<svg class="ml-2.5 h-5 w-5 text-skin-base" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25" />
</svg>
@if($iconLink)
<x-untitledui-link-external-01 class="ml-2 h-5 w-5 text-skin-base" />
@endif
</a>
<p class="mt-1 font-normal text-skin-base leading-6">
{!! $article->excerpt(150) !!}
Expand Down
32 changes: 0 additions & 32 deletions resources/views/components/articles/summary.blade.php

This file was deleted.

4 changes: 2 additions & 2 deletions resources/views/components/decreased.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@props(['value'])

<p {{ $attributes->merge(['class' => 'flex items-baseline text-sm font-semibold text-red-600']) }}>
<x-heroicon-s-arrow-sm-down class="self-center shrink-0 h-5 w-5 text-red-500" />
<span class="sr-only">Decreased by</span> {{ $value }}
<x-untitledui-trend-down class="self-center shrink-0 h-5 w-5 text-red-500" />
<span class="sr-only">{{ __('Diminué de') }}</span> {{ $value }}
</p>
12 changes: 5 additions & 7 deletions resources/views/components/dropdown-profile.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ class="origin-top-right absolute right-0 mt-2 w-60 rounded-md shadow-lg py-1 bg-

@if(Auth::user()->hasRole(['admin', 'moderator']))
<div class="py-1.5 px-3.5" role="none">
<a href="#c" class="group flex items-center py-1.5 text-sm text-skin-base hover:text-skin-primary font-normal" role="menuitem" tabindex="-1" id="user-menu-item-0">
<svg class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M9 17.25v1.007a3 3 0 01-.879 2.122L7.5 21h9l-.621-.621A3 3 0 0115 18.257V17.25m6-12V15a2.25 2.25 0 01-2.25 2.25H5.25A2.25 2.25 0 013 15V5.25m18 0A2.25 2.25 0 0018.75 3H5.25A2.25 2.25 0 003 5.25m18 0V12a2.25 2.25 0 01-2.25 2.25H5.25A2.25 2.25 0 013 12V5.25" />
</svg>
<a href="{{ route('filament.admin.pages.dashboard') }}" class="group flex items-center py-1.5 text-sm text-skin-base hover:text-skin-primary font-normal" role="menuitem" tabindex="-1" id="user-menu-item-0">
<x-untitledui-monitor class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
{{ __('Administration') }}
</a>
</div>
Expand Down Expand Up @@ -89,15 +87,15 @@ class="origin-top-right absolute right-0 mt-2 w-60 rounded-md shadow-lg py-1 bg-

<div class="py-1.5 px-3.5" role="none">
<a href="{{ route('dashboard') }}" class="group flex items-center py-1.5 text-sm text-skin-base hover:text-skin-primary font-normal" role="menuitem" tabindex="-1" id="user-menu-item-0">
<x-icon.grid class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
<x-untitledui-grid class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
{{ __('Tableau de bord') }}
</a>
<a href="{{ route('profile') }}" class="group flex items-center py-1.5 text-sm text-skin-base hover:text-skin-primary font-normal" role="menuitem" tabindex="-1" id="user-menu-item-1">
<x-icon.profile class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
<x-untitledui-user-circle class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
{{ __('Mon profil') }}
</a>
<a href="{{ route('user.settings') }}" class="group flex items-center py-1.5 text-sm text-skin-base hover:text-skin-primary font-normal" role="menuitem" tabindex="-1" id="user-menu-item-2">
<x-icon.settings class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
<x-untitledui-sliders class="flex-none h-5 w-5 mr-3 text-skin-muted group-hover:text-skin-primary" />
{{ __('Paramètres') }}
</a>
<form method="POST" action="{{ route('logout') }}" role="form">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/error-message.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div {{ $attributes->merge(['class' => 'rounded-md bg-red-50 p-4']) }}>
<div class="flex">
<div class="shrink-0">
<x-heroicon-s-x-circle class="h-5 w-5 text-red-400" />
<x-untitledui-x class="h-5 w-5 text-red-400" />
</div>
<div class="ml-3">
<h3 class="text-sm font-medium text-red-800">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/forms/editor/controls.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
</svg>
</button>
<button x-data title="Code sample" type="button" class="text-skin-base hover:text-skin-inverted-muted cursor-pointer focus:outline-none" @click="$dispatch('editor-control-clicked', 'code')">
<x-heroicon-o-code class="w-5 h-5" />
<x-untitledui-code class="w-5 h-5" />
</button>
<button x-data title="Link" type="button" class="text-skin-base hover:text-skin-inverted-muted cursor-pointer focus:outline-none" @click="$dispatch('editor-control-clicked', 'link')">
<x-heroicon-o-link class="w-5 h-5" />
</button>
<button x-data title="Image" type="button" class="text-skin-base hover:text-skin-inverted-muted cursor-pointer focus:outline-none" @click="$dispatch('editor-control-clicked', 'image')">
<x-heroicon-o-photograph class="w-5 h-5" />
<x-untitledui-image class="w-5 h-5" />
</button>
</div>
2 changes: 1 addition & 1 deletion resources/views/components/forum/thread.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-skin-
@endcan
@can(App\Policies\ThreadPolicy::DELETE, $thread)
<button type="button" onclick="Livewire.emit('openModal', 'modals.delete-thread', {{ json_encode([$thread->id]) }})" class="group text-skin-inverted-muted flex px-4 py-2 text-sm hover:text-skin-inverted" role="menuitem" tabindex="-1">
<x-heroicon-s-trash class="mr-3 h-5 w-5 text-skin-muted group-hover:text-skin-base" />
<x-untitledui-trash-03 class="mr-3 h-5 w-5 text-skin-muted group-hover:text-skin-base" />
<span>{{ __('Supprimer') }}</span>
</button>
@endcan
Expand Down
Loading
Loading