Skip to content

Commit b4e641d

Browse files
AmazonPythonAmazonPython
authored
Merge pull request #12 from AmazonPython/master
Updated navigation bar style.
2 parents cbe76bb + 8f8abc0 commit b4e641d

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed

‎resources/lang/en/messages.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
'threads_replied' => 'replied',
6464
'threads_replied_to' => ' replied to ',
6565
'threads_set_as_best_reply' => 'Set as best',
66-
'threads_best_reply' => 'Best reply',
66+
'threads_best_reply' => 'Best',
6767
'threads_reply_success' => 'Your reply has been left.',
6868
'threads_login_to_reply' => 'Please click here to login to comment',
6969
'threads_replied_mentioned' => ' mentioned you in ',

‎resources/lang/zh-CN/messages.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
'threads_replied' => '回复于',
6464
'threads_replied_to' => ' 回复于 ',
6565
'threads_set_as_best_reply' => '设为最佳',
66-
'threads_best_reply' => '最佳回复',
66+
'threads_best_reply' => '最佳',
6767
'threads_reply_success' => '您的回复已经留下。',
6868
'threads_login_to_reply' => '请点击此处登录后评论',
6969
'threads_replied_mentioned' => ' @了你 ',

‎resources/views/layouts/nav.blade.php‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,35 @@
1616
</a>
1717

1818
<ul class="dropdown-menu">
19-
<li><a href="{{ url('/threads') }}" class="dropdown-item">@lang('messages.nav_all_threads')</a></li>
19+
<li>
20+
<a href="{{ url('/threads') }}" class="dropdown-item">
21+
<i class="fas fa-sticky-note"></i> @lang('messages.nav_all_threads')
22+
</a>
23+
</li>
2024
@auth
21-
<li><a href="{{ url('threads' . '?by=' . auth()->user()->name) }}" class="dropdown-item">@lang('messages.nav_my_threads')</a></li>
25+
<li>
26+
<a href="{{ url('threads' . '?by=' . auth()->user()->name) }}" class="dropdown-item">
27+
<i class="fas fa-user-tag"></i> @lang('messages.nav_my_threads')
28+
</a>
29+
</li>
2230
@endauth
23-
<li><a href="{{ url('threads' . '?popular=1') }}" class="dropdown-item">@lang('messages.nav_popular_threads')</a></li>
24-
<li><a href="{{ url('threads' . '?unanswered=1') }}" class="dropdown-item">@lang('messages.nav_unanswered_threads')</a></li>
31+
<li>
32+
<a href="{{ url('threads' . '?popular=1') }}" class="dropdown-item">
33+
<i class="fas fa-fire"></i> @lang('messages.nav_popular_threads')
34+
</a>
35+
</li>
36+
<li>
37+
<a href="{{ url('threads' . '?unanswered=1') }}" class="dropdown-item">
38+
<i class="far fa-question-circle"></i> @lang('messages.nav_unanswered_threads')
39+
</a>
40+
</li>
2541
</ul>
2642
</li>
27-
<li><a href="{{ url('threads/create') }}" class="nav-link">@lang('messages.nav_new_thread')</a></li>
43+
<li>
44+
<a href="{{ url('threads/create') }}" class="nav-link">
45+
<i class="fas fa-paint-brush"></i> @lang('messages.nav_new_thread')
46+
</a>
47+
</li>
2848
<li class="dropdown">
2949
<a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
3050
aria-expanded="false">@lang('messages.nav_channels') <span class="caret"></span>
@@ -53,11 +73,15 @@
5373
<!-- Authentication Links -->
5474
@guest
5575
<li class="nav-item">
56-
<a class="nav-link" href="{{ route('login') }}">@lang('messages.auth_login')</a>
76+
<a class="nav-link" href="{{ route('login') }}">
77+
<i class="fas fa-lock"></i> @lang('messages.auth_login')
78+
</a>
5779
</li>
5880
@if (Route::has('register'))
5981
<li class="nav-item">
60-
<a class="nav-link" href="{{ route('register') }}">@lang('messages.auth_register')</a>
82+
<a class="nav-link" href="{{ route('register') }}">
83+
<i class="fas fa-unlock"></i> @lang('messages.auth_register')
84+
</a>
6185
</li>
6286
@endif
6387
@else
@@ -95,15 +119,15 @@
95119

96120
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
97121
<a class="dropdown-item" href="{{ route('profile', Auth::user()) }}">
98-
@lang('messages.auth_home')
122+
<i class="fas fa-user"></i> @lang('messages.auth_home')
99123
</a>
100124
@if (Auth::user()->isAdmin)
101125
<a class="dropdown-item" href="{{ route('admin.dashboard.index') }}">@lang('messages.admin_dashboard')</a>
102126
@endif
103127
<a class="dropdown-item" href="{{ route('logout') }}"
104128
onclick="event.preventDefault();
105129
document.getElementById('logout-form').submit();">
106-
@lang('messages.auth_logout')
130+
<i class="fas fa-sign-out-alt"></i> @lang('messages.auth_logout')
107131
</a>
108132

109133
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">

‎resources/views/threads/favorite.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<a>@lang('messages.threads_replied') <b>{{ $reply->created_at->diffForHumans() }}</b></a>
1111
<br /><br />
1212
@if($reply->id == $thread->best_reply_id)
13-
<button class="btn btn-sm btn-outline-info float-right">
14-
@lang('messages.threads_best_reply')
13+
<button class="btn btn-sm btn-outline-info float-right ml-1">
14+
<i class="fas fa-medal"></i> @lang('messages.threads_best_reply')
1515
</button>
1616
@endif
1717
@else

0 commit comments

Comments
 (0)