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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-03 01:47:24 -06:00 committed by GitHub
commit 477f850ece
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/site/help.blade.php
View file

@ -132,7 +132,7 @@
</div> </div>
</a> </a>
</div> --}} </div> --}}
{{-- <div class="col-12 col-md-6 mb-3"> <div class="col-12 col-md-6 mb-3">
<a href="{{route('help.timelines')}}" class="text-decoration-none"> <a href="{{route('help.timelines')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -141,13 +141,13 @@
</p> </p>
<p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.timelines')}}</p> <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.timelines')}}</p>
<div class="text-center pt-3"> <div class="text-center pt-3">
<p class="small text-dark font-weight-bold mb-0">&nbsp;</p> <p class="small text-dark font-weight-bold mb-0">Personal Timeline</p>
<p class="small text-dark font-weight-bold mb-0">&nbsp;</p> <p class="small text-dark font-weight-bold mb-0">Public Timeline</p>
</div> </div>
</div> </div>
</div> </div>
</a> </a>
</div> --}} </div>
{{-- <div class="col-12 col-md-6 mb-3"> {{-- <div class="col-12 col-md-6 mb-3">
<a href="{{route('help.community-guidelines')}}" class="text-decoration-none"> <a href="{{route('help.community-guidelines')}}" class="text-decoration-none">

4
resources/views/site/help/partial/sidebar.blade.php
View file

@ -21,9 +21,9 @@
{{-- <li class="nav-item {{request()->is('*/direct-messages')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/direct-messages')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.dm')}}">{{__('helpcenter.directMessages')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.dm')}}">{{__('helpcenter.directMessages')}}</a>
</li> --}} </li> --}}
{{-- <li class="nav-item {{request()->is('*/timelines')?'active':''}}"> <li class="nav-item {{request()->is('*/timelines')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.timelines')}}">{{__('helpcenter.timelines')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.timelines')}}">{{__('helpcenter.timelines')}}</a>
</li> --}} </li>
{{-- <li class="nav-item {{request()->is('*/embed')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/embed')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.embed')}}">{{__('helpcenter.embed')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.embed')}}">{{__('helpcenter.embed')}}</a>
</li> --}} </li> --}}

15
resources/views/site/help/sharing-media.blade.php
View file

@ -148,4 +148,19 @@
</div> </div>
</div> </div>
</p> --}} </p> --}}
<p>
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse10" role="button" aria-expanded="false" aria-controls="collapse10">
<i class="fas fa-chevron-down mr-2"></i>
How can I disable comments/replies on my post?
</a>
<div class="collapse" id="collapse10">
<div>
To enable or disable comments/replies using a desktop or mobile browser:
<ul>
<li>Open the menu, click the <i class="fas fa-ellipsis-v text-muted mx-2 cursor-pointer"></i> button</li>
<li>Click on <span class="small font-weight-bold cursor-pointer">Enable Comments</span> or <span class="small font-weight-bold cursor-pointer">Disable Comments</span></li>
</ul>
</div>
</div>
</p>
@endsection @endsection

37
resources/views/site/help/timelines.blade.php
View file

@ -6,21 +6,24 @@
<h3 class="font-weight-bold">Timelines</h3> <h3 class="font-weight-bold">Timelines</h3>
</div> </div>
<hr> <hr>
<div class="card"> <p class="lead">Timelines are chronological feeds of posts from accounts you follow or from other instances.</p>
<div class="card-body"> <p class="font-weight-bold h5 py-3">Pixelfed has 2 different timelines:</p>
<div class="row">
<div class="col-12 col-md-3 text-center"> <ul>
<div class="icon-wrapper"> <li class="lead">
<i class="far fa-question-circle fa-3x text-light"></i> <span class="font-weight-bold"><i class="fas fa-home text-muted mr-2"></i> Personal</span>
</div> <span class="px-2">&mdash;</span>
</div> <span class="font-weight-light">Timeline with posts from accounts you follow</span>
<div class="col-12 col-md-9 d-flex align-items-center"> </li>
<div class="text-center"> <li class="lead">
<p class="h3 font-weight-bold mb-0">This page isn't available</p> <span class="font-weight-bold"><i class="far fa-map text-muted mr-2"></i> Public</span>
<p class="font-weight-light mb-0">We haven't finished it yet, it will be updated soon!</p> <span class="px-2">&mdash;</span>
</div> <span class="font-weight-light">Timeline with posts from other users on the same instance</span>
</div> </li>
</div> {{-- <li class="lead text-muted">
</div> <span class="font-weight-bold"><i class="fas fa-globe text-muted mr-2"></i> Network</span>
</div> <span class="px-2">&mdash;</span>
<span class="font-weight-light text-muted">Timeline with posts from local and remote accounts - coming soon!</span>
</li> --}}
</ul>
@endsection @endsection