UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-30 02:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #952 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-03-04 12:44:29 -07:00 committed by GitHub
commit 4ef59cb05f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

2
resources/assets/js/components/Timeline.vue
View file

@ -153,7 +153,7 @@
</div> </div>
</div> </div>
<div class="col-md-4 col-lg-4 pt-2 my-3 order-1 order-md-2"> <div class="col-md-4 col-lg-4 pt-2 my-3 order-1 order-md-2 d-none d-md-block">
<div class="mb-4"> <div class="mb-4">
<div class="card profile-card"> <div class="card profile-card">
<div class="card-body loader text-center"> <div class="card-body loader text-center">

5
resources/views/layouts/app.blade.php
View file

@ -37,6 +37,11 @@
<script type="text/javascript" src="{{ mix('js/components.js') }}"></script> <script type="text/javascript" src="{{ mix('js/components.js') }}"></script>
@stack('scripts') @stack('scripts')
@if(Auth::check()) @if(Auth::check())
<div class="d-block d-sm-none fixed-bottom">
<div class="float-right m-3">
<button class="bg-primary p-3 rounded-circle text-white box-shadow border-0 align-middle" data-toggle="modal" data-target="#composeModal"><i class="fas fa-plus fa-2x"></i></button>
</div>
</div>
<div class="modal" tabindex="-1" role="dialog" id="composeModal"> <div class="modal" tabindex="-1" role="dialog" id="composeModal">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">

32
resources/views/layouts/partial/nav.blade.php
View file

@ -14,14 +14,14 @@
</ul> </ul>
@endauth @endauth
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav mx-auto">
@guest @guest
<li><a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">{{ __('Login') }}</a></li> <li><a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">{{ __('Login') }}</a></li>
<li><a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">{{ __('Register') }}</a></li> <li><a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">{{ __('Register') }}</a></li>
@else @else
<li class="pr-md-2"> <li class="">
<a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline"> <a class="nav-link font-weight-bold {{request()->is('/') ?'text-primary':''}}" href="/" title="Home Timeline">
<span class="d-block d-md-none"> <span class="d-block d-md-none" data-toggle="tooltip" title="Home Timeline">
<i class="fas fa-home fa-lg"></i> <i class="fas fa-home fa-lg"></i>
</span> </span>
<span class="d-none d-md-block"> <span class="d-none d-md-block">
@ -29,10 +29,10 @@
</span> </span>
</a> </a>
</li> </li>
<li class="pr-md-2"> <li class="px-sm-3">
<a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public" title="Local Timeline"> <a class="nav-link font-weight-bold {{request()->is('timeline/public') ?'text-primary':''}}" href="/timeline/public">
<span class="d-block d-md-none"> <span class="d-block d-md-none" data-toggle="tooltip" title="Local Timeline">
<i class="far fa-map fa-lg"></i> <i class="fas fa-align-justify fa-lg"></i>
</span> </span>
<span class="d-none d-md-block"> <span class="d-none d-md-block">
{{__('navmenu.local')}} {{__('navmenu.local')}}
@ -40,10 +40,11 @@
</a> </a>
</li> </li>
<li class="d-block d-md-none"> <li class="d-block d-md-none">
<a class="nav-link" href="/account/activity"> <a class="nav-link" href="/account/activity" data-toggle="tooltip" title="Notifications">
<i class="fas fa-inbox fa-lg"></i> <i class="far fa-bell fa-lg"></i>
</a> </a>
</li> </li>
{{-- <li class="pr-2"> {{-- <li class="pr-2">
<a class="nav-link font-weight-bold" href="/" title="Home"> <a class="nav-link font-weight-bold" href="/" title="Home">
{{ __('Network') }} {{ __('Network') }}
@ -56,6 +57,7 @@
</span> </span>
</a> </a>
</li> </li>
<div class="d-none d-md-block">
<li class="nav-item pr-md-2"> <li class="nav-item pr-md-2">
<div title="Create new post" data-toggle="tooltip" data-placement="bottom"> <div title="Create new post" data-toggle="tooltip" data-placement="bottom">
<a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal"> <a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
@ -63,9 +65,12 @@
</a> </a>
</div> </div>
</li> </li>
</div>
</ul>
<ul class="navbar-nav">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom"> <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
<i class="far fa-user fa-lg"></i> <img class="rounded-circle box-shadow mr-1" src="{{Auth::user()->profile->avatarUrl()}}" width="26px" height="26px">
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
@ -125,10 +130,3 @@
</div> </div>
</div> </div>
</nav> </nav>
@auth
<nav class="breadcrumb d-md-none d-flex">
<form class="form-inline search-form mx-auto">
<input class="form-control mr-sm-2 search-form-input" type="search" placeholder="{{__('navmenu.search')}}" aria-label="Search">
</form>
</nav>
@endauth