diff --git a/resources/assets/sass/_underline-tabs.scss b/resources/assets/sass/_underline-tabs.scss new file mode 100644 index 0000000..795dba5 --- /dev/null +++ b/resources/assets/sass/_underline-tabs.scss @@ -0,0 +1,24 @@ +.tis-nav-underline-tabs { + margin-bottom: -1px; + + .nav-link { + padding: 0.5rem 1.25rem; + color: $secondary; + border-bottom: 2px solid transparent; + transition: border-bottom-color .12s ease-in; + + @include media-breakpoint-up(lg) { + padding: 1rem 1.25rem; + } + + &.active { + color: $primary; + border-bottom-color: $primary; + } + + &:not(.active):hover { + border-bottom-color: transparentize($secondary, 0.3); + transition: border-bottom-color .4s ease-out; + } + } +} diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index a613a07..0304b60 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -15,6 +15,10 @@ $primary: #e53fb1; @import "components/link-card"; @import "components/tag-input"; @import "components/metadata-preview"; +@import "components/profile-mini"; // Tag @import "tag/index"; + +// Underline tabs +@import "underline-tabs"; diff --git a/resources/assets/sass/components/_profile-mini.scss b/resources/assets/sass/components/_profile-mini.scss new file mode 100644 index 0000000..f2caecd --- /dev/null +++ b/resources/assets/sass/components/_profile-mini.scss @@ -0,0 +1,11 @@ +.tis-profile-mini { + &-display-name { + font-size: 1.2rem; + font-weight: 500; + } + + &-name { + margin-top: 0.125rem; + font-size: 0.8rem; + } +} diff --git a/resources/views/components/header-dropdown-menu.blade.php b/resources/views/components/header-dropdown-menu.blade.php new file mode 100644 index 0000000..3dac555 --- /dev/null +++ b/resources/views/components/header-dropdown-menu.blade.php @@ -0,0 +1,17 @@ + + {{ Auth::user()->display_name }} +

+ @{{ Auth::user()->name }} +

+
+ +プロフィール +グラフ +オカズ +いいね + +設定 +@can ('admin') + 管理 +@endcan +ログアウト diff --git a/resources/views/components/profile-mini.blade.php b/resources/views/components/profile-mini.blade.php index 7f4dd97..81ab84d 100644 --- a/resources/views/components/profile-mini.blade.php +++ b/resources/views/components/profile-mini.blade.php @@ -1,14 +1,14 @@
-
+
-
+
+
@{{ $user->name }} @if ($user->is_protected) @endif - +
diff --git a/resources/views/components/profile.blade.php b/resources/views/components/profile.blade.php index 253e187..6bfa60c 100644 --- a/resources/views/components/profile.blade.php +++ b/resources/views/components/profile.blade.php @@ -1,32 +1,23 @@ -
-
- -

- {{ $user->display_name }} -

-
- @{{ $user->name }} - @if ($user->is_protected) - +@if (!empty($user->bio) || !empty($user->url)) +
+
+ {{-- Bio --}} + @if (!empty($user->bio)) +

+ {!! Formatter::linkify(nl2br(e($user->bio))) !!} +

@endif -
- {{-- Bio --}} - @if (!empty($user->bio)) -

- {!! Formatter::linkify(nl2br(e($user->bio))) !!} -

- @endif - - {{-- URL --}} - @if (!empty($user->url)) -

- - {{ preg_replace('~\Ahttps?://~', '', $user->url) }} -

- @endif + {{-- URL --}} + @if (!empty($user->url)) +

+ + {{ preg_replace('~\Ahttps?://~', '', $user->url) }} +

+ @endif +
- +@endif @if (!$user->is_protected || $user->isMe())
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 711468d..067bcc9 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -43,21 +43,7 @@
@@ -73,14 +59,8 @@ - - - @@ -132,15 +98,7 @@ ホーム
- タイムライン -
- -
-
- グラフ -
-
- オカズ + お惣菜
diff --git a/resources/views/user/base.blade.php b/resources/views/user/base.blade.php index 67c49ee..a5d0a7e 100644 --- a/resources/views/user/base.blade.php +++ b/resources/views/user/base.blade.php @@ -1,45 +1,48 @@ @extends('layouts.base') @section('content') +
+
+
+
+ @component('components.profile-mini', ['user' => $user]) + @endcomponent +
+ +
+
+
@if (Route::currentRouteName() === 'user.profile') @component('components.profile', ['user' => $user]) @endcomponent - @else -
-
- @component('components.profile-mini', ['user' => $user]) - @endcomponent -
-
@endif @section('sidebar') @show