diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index c3b8f50..0da45fd 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -14,10 +14,16 @@ $primary: #e53fb1; // Components @import "components/link-card"; +.ejaculation-actions { + & > button:not(:last-child) { + margin-right: 24px; + } +} + .like-button { text-decoration: none !important; } .like-count:not(:empty) { - padding-left: 0.25rem; + padding-left: 0.5rem; } \ No newline at end of file diff --git a/resources/views/components/ejaculation.blade.php b/resources/views/components/ejaculation.blade.php index e32d58a..0203135 100644 --- a/resources/views/components/ejaculation.blade.php +++ b/resources/views/components/ejaculation.blade.php @@ -1,13 +1,9 @@ -
+
{{ $ejaculation->user->display_name }} {{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}
-
- - -
@if ($ejaculation->tags->isNotEmpty()) @@ -29,7 +25,16 @@ @endif @if (!empty($ejaculation->note)) -

+

{!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}

-@endif \ No newline at end of file +@endif + +
+ + +
\ No newline at end of file diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php index e8f3944..a74bf70 100644 --- a/resources/views/ejaculation/show.blade.php +++ b/resources/views/ejaculation/show.blade.php @@ -30,16 +30,8 @@
-
+
{{ $ejaculatedSpan ?? '精通' }} {{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ~ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}
-
- - - @if ($user->isMe()) - - - @endif -
@if ($ejaculation->is_private || $ejaculation->tags->isNotEmpty()) @@ -64,10 +56,19 @@ @endif @if (!empty($ejaculation->note)) -

+

{!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}

@endif + +
+ + + @if ($user->isMe()) + + + @endif +
@endif diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 2e9493b..22d5cd9 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -36,16 +36,8 @@ @forelse ($ejaculations as $ejaculation)
  • -
    +
    {{ $ejaculation->ejaculated_span ?? '精通' }} {{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ~ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}
    -
    - - - @if ($user->isMe()) - - - @endif -
    @if ($ejaculation->is_private || $ejaculation->tags->isNotEmpty()) @@ -70,10 +62,19 @@ @endif @if (!empty($ejaculation->note)) -

    +

    {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}

    @endif + +
    + + + @if ($user->isMe()) + + + @endif +
  • @empty