Home Explore Help
Register Sign In
oleg
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Update layout views

Daniel Supernault 6 years ago
parent
110ec5cfcf
commit
d4cab97f3a
2 changed files with 7 additions and 7 deletions
Split View Show Diff Stats
  1. 6 6
      resources/views/layouts/app.blade.php
  2. 1 1
      resources/views/layouts/partial/nav.blade.php

+ 6 - 6
resources/views/layouts/app.blade.php
View File 

@@ -33,7 +33,7 @@
 
     
     @stack('styles')
 
     
-    <script type="text/javascript">window.App = {}; window.App.config = {!!App\Util\Site\Config::json()!!}</script>
 
+    <script type="text/javascript">window.App = {config: {!!App\Util\Site\Config::json()!!}};</script>
 
     
 </head>
 
 <body class="{{Auth::check()?'loggedIn':''}}">
 
@@ -62,19 +62,19 @@
 
         <div class="card card-body rounded-0 py-2 d-flex align-items-middle box-shadow" style="border-top:1px solid #F1F5F8">
 
             <ul class="nav nav-pills nav-fill">
 
               <li class="nav-item">
 
-                <a class="nav-link {{request()->is('/')?'text-dark':'text-muted'}}" href="/"><i class="fas fa-home fa-lg"></i></a>
 
+                <a class="nav-link {{request()->is('/')?'text-dark':'text-lighter'}}" href="/"><i class="fas fa-home fa-lg"></i></a>
 
               </li>
 
               <li class="nav-item">
 
-                <a class="nav-link {{request()->is('timeline/public')?'text-dark':'text-muted'}}" href="/timeline/public"><i class="far fa-map fa-lg"></i></a>
 
+                <a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a>
 
               </li>
 
               <li class="nav-item">
 
-                <div class="nav-link text-primary cursor-pointer" data-toggle="modal" data-target="#composeModal"><i class="fas fa-camera-retro fa-lg"></i></div>
 
+                <div class="nav-link text-lighter cursor-pointer" data-toggle="modal" data-target="#composeModal"><i class="fas fa-camera fa-lg"></i></div>
 
               </li>
 
               <li class="nav-item">
 
-                <a class="nav-link {{request()->is('discover')?'text-dark':'text-muted'}}" href="{{route('discover')}}"><i class="far fa-compass fa-lg"></i></a>
 
+                <a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a>
 
               </li>
 
               <li class="nav-item">
 
-                <a class="nav-link {{request()->is('account/activity')?'text-dark':'text-muted'}} tooltip-notification" href="/account/activity"><i class="far fa-bell fa-lg"></i></a>
 
+                <a class="nav-link text-lighter" href="/i/me"><i class="far fa-user fa-lg"></i></a>
 
               </li>
 
             </ul>
 
         </div>

+ 1 - 1
resources/views/layouts/partial/nav.blade.php
View File 

@@ -7,7 +7,7 @@
 
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
 
             @auth
 
-            <ul class="navbar-nav mx-auto pr-3">
 
+            <ul class="navbar-nav d-none d-md-block mx-auto pr-3">
 
               <form class="form-inline search-bar" method="get" action="/i/results">
 
                 <div class="input-group">
 
                     <input class="form-control" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required>