Skip to content

Commit decf404

Browse files
feat:lar-180 rebase develop , move article reaction place and fix questions profile place
1 parent 70ed8af commit decf404

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/views/livewire/pages/account/profile.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ class="relative z-20 inline-flex h-8 w-full cursor-pointer items-center justify-
146146
<x-user.discussions :user="$user" :discussions="$this->discussions" />
147147
</div>
148148
<div x-cloak :id="$id(tabId + '-content')" x-show="tabContentActive($el)">
149+
<x-user.threads :user="$user" :threads="$this->threads" />
149150
</div>
150-
<x-user.threads :user="$user" :threads="$this->threads" />
151151
</div>
152152
<aside class="hidden lg:block">
153153
<livewire:components.user.activities :user="$user" />

resources/views/livewire/pages/articles/single-post.blade.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,20 @@ class="object-cover size-full"
114114
class="prose prose-green text-gray-500 dark:text-gray-400 dark:prose-invert lg:max-w-none"
115115
:content="$article->body"
116116
/>
117-
118-
<div class="relative inline-flex mt-5 space-x-4">
119-
<livewire:components.reactions
120-
wire:key="{{ $article->id }}"
121-
:model="$article"
122-
:with-place-holder="false"
123-
:with-background="false"
124-
/>
125-
</div>
126117
</div>
127118
<div class="hidden lg:block">
128119
<x-sticky-content class="space-y-10">
129120
@if($article->isPublished())
130121
<div>
122+
123+
<div class="relative inline-flex mt-5 space-x-4">
124+
<livewire:components.reactions
125+
wire:key="{{ $article->id }}"
126+
:model="$article"
127+
:with-place-holder="false"
128+
:with-background="false"
129+
/>
130+
</div>
131131
<p class="text-sm font-medium text-gray-500 dark:text-gray-400">
132132
{{ __('pages/article.share_article') }}
133133
</p>

0 commit comments

Comments
 (0)