UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-23 06:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-03-18 22:07:02 -06:00 committed by GitHub
commit d1d5672b13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,8 @@
</p> </p>
<p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.hashtags')}}</p> <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.hashtags')}}</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">What are hashtags?</p>
<p class="small text-dark font-weight-bold mb-0">&nbsp;</p> <p class="small text-dark font-weight-bold mb-0">Hashtag Tips</p>
</div> </div>
</div> </div>
</div> </div>
@ -68,7 +68,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.discover')}}" class="text-decoration-none"> <a href="{{route('help.discover')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -77,13 +77,13 @@
</p> </p>
<p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.discover')}}</p> <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.discover')}}</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">What is Discover?</p>
<p class="small text-dark font-weight-bold mb-0">&nbsp;</p> <p class="small text-dark font-weight-bold mb-0">What are Discover Categories?</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.your-profile')}}" class="text-decoration-none"> <a href="{{route('help.your-profile')}}" class="text-decoration-none">
<div class="card"> <div class="card">
@ -100,7 +100,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.dm')}}" class="text-decoration-none"> <a href="{{route('help.dm')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -115,8 +115,8 @@
</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.stories')}}" class="text-decoration-none"> <a href="{{route('help.stories')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -131,8 +131,8 @@
</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.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">
@ -147,9 +147,9 @@
</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">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -164,8 +164,8 @@
</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.blocking-accounts')}}" class="text-decoration-none"> <a href="{{route('help.blocking-accounts')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -180,8 +180,8 @@
</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.what-is-fediverse')}}" class="text-decoration-none"> <a href="{{route('help.what-is-fediverse')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -196,7 +196,7 @@
</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.safety-tips')}}" class="text-decoration-none"> <a href="{{route('help.safety-tips')}}" class="text-decoration-none">
<div class="card"> <div class="card">
@ -206,14 +206,14 @@
</p> </p>
<p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.safetyTips')}}</p> <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.safetyTips')}}</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">Know the rules</p>
<p class="small text-dark font-weight-bold mb-0">&nbsp;</p> <p class="small text-dark font-weight-bold mb-0">Make your account or posts private</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.controlling-visibility')}}" class="text-decoration-none"> <a href="{{route('help.controlling-visibility')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -228,8 +228,8 @@
</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.report-something')}}" class="text-decoration-none"> <a href="{{route('help.report-something')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -244,8 +244,8 @@
</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.data-policy')}}" class="text-decoration-none"> <a href="{{route('help.data-policy')}}" class="text-decoration-none">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -253,57 +253,8 @@
</div> </div>
</div> </div>
</a> </a>
</div>
</div>
{{-- <div class="card mb-3">
<div class="card-body">
<p class="h5 font-weight-bold">Using Pixelfed</p>
<div class="row font-weight-bold text-muted">
<div class="col-12 col-md-6">
<ul>
<li><a href="{{route('help.getting-started')}}">Getting Started</a></li>
<li><a href="{{route('help.sharing-media')}}">Sharing Photos & Videos</a></li>
<li><a href="{{route('help.your-profile')}}">Your Profile</a></li>
<li><a href="{{route('help.stories')}}">Stories</a></li>
</ul>
</div>
<div class="col-12 col-md-6">
<ul>
<li><a href="{{route('help.hashtags')}}">Hashtags</a></li>
<li><a href="{{route('help.discover')}}">Discover</a></li>
<li><a href="{{route('help.dm')}}">Direct Messaging</a></li>
<li><a href="{{route('help.timelines')}}">Timelines</a></li>
</ul>
</div>
</div>
</div>
</div>
<div class="card mb-3">
<div class="card-body">
<p class="h5 font-weight-bold">Privacy and Safety</p>
<div class="row font-weight-bold text-muted">
<div class="col-12 col-md-6">
<ul>
<li><a href="#">Community Guidelines</a></li>
<li><a href="#">What is the fediverse?</a></li>
<li><a href="#">Controlling your visibility</a></li>
<li><a href="#">Abuse/malicious activity</a></li>
</ul>
</div>
<div class="col-12 col-md-6">
<ul>
<li><a href="#">Blocking accounts</a></li>
<li><a href="#">Safety Tips</a></li>
<li><a href="#">Report Something</a></li>
<li><a href="#">Data Policy</a></li>
</ul>
</div>
</div>
</div>
</div> --}} </div> --}}
</div>
@endsection @endsection
@push('meta') @push('meta')

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

@ -9,59 +9,59 @@
<li class="nav-item {{request()->is('*/your-profile')?'active':''}}"> <li class="nav-item {{request()->is('*/your-profile')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.your-profile')}}">{{__('helpcenter.profile')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.your-profile')}}">{{__('helpcenter.profile')}}</a>
</li> </li>
<li class="nav-item {{request()->is('*/stories')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/stories')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.stories')}}">{{__('helpcenter.stories')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.stories')}}">{{__('helpcenter.stories')}}</a>
</li> </li> --}}
<li class="nav-item {{request()->is('*/hashtags')?'active':''}}"> <li class="nav-item {{request()->is('*/hashtags')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.hashtags')}}">{{__('helpcenter.hashtags')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.hashtags')}}">{{__('helpcenter.hashtags')}}</a>
</li> </li>
<li class="nav-item {{request()->is('*/discover')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/discover')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.discover')}}">{{__('helpcenter.discover')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.discover')}}">{{__('helpcenter.discover')}}</a>
</li> </li> --}}
<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> --}}
<li class="nav-item"> <li class="nav-item">
<hr> <hr>
</li> </li>
<li class="nav-item {{request()->is('*/community-guidelines')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/community-guidelines')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.community-guidelines')}}"> <a class="nav-link font-weight-light text-muted" href="{{route('help.community-guidelines')}}">
{{__('helpcenter.communityGuidelines')}} {{__('helpcenter.communityGuidelines')}}
</a> </a>
</li> </li> --}}
<li class="nav-item {{request()->is('*/what-is-the-fediverse')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/what-is-the-fediverse')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.what-is-fediverse')}}">{{__('helpcenter.whatIsTheFediverse')}}</a> <a class="nav-link font-weight-light text-muted" href="{{route('help.what-is-fediverse')}}">{{__('helpcenter.whatIsTheFediverse')}}</a>
</li> </li> --}}
<li class="nav-item {{request()->is('*/controlling-visibility')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/controlling-visibility')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.controlling-visibility')}}"> <a class="nav-link font-weight-light text-muted" href="{{route('help.controlling-visibility')}}">
{{__('helpcenter.controllingVisibility')}} {{__('helpcenter.controllingVisibility')}}
</a> </a>
</li> </li> --}}
<li class="nav-item {{request()->is('*/blocking-accounts')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/blocking-accounts')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.blocking-accounts')}}"> <a class="nav-link font-weight-light text-muted" href="{{route('help.blocking-accounts')}}">
{{__('helpcenter.blockingAccounts')}} {{__('helpcenter.blockingAccounts')}}
</a> </a>
</li> </li> --}}
<li class="nav-item {{request()->is('*/safety-tips')?'active':''}}"> <li class="nav-item {{request()->is('*/safety-tips')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.safety-tips')}}"> <a class="nav-link font-weight-light text-muted" href="{{route('help.safety-tips')}}">
{{__('helpcenter.safetyTips')}} {{__('helpcenter.safetyTips')}}
</a> </a>
</li> </li>
<li class="nav-item {{request()->is('*/report-something')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/report-something')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.report-something')}}"> <a class="nav-link font-weight-light text-muted" href="{{route('help.report-something')}}">
{{__('helpcenter.reportSomething')}} {{__('helpcenter.reportSomething')}}
</a> </a>
</li> </li> --}}
<li class="nav-item {{request()->is('*/data-policy')?'active':''}}"> {{-- <li class="nav-item {{request()->is('*/data-policy')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('help.data-policy')}}"> <a class="nav-link font-weight-light text-muted" href="{{route('help.data-policy')}}">
{{__('helpcenter.dataPolicy')}} {{__('helpcenter.dataPolicy')}}
</a> </a>
</li> </li> --}}
</ul> </ul>
</div> </div>

10
resources/views/site/help/safety-tips.blade.php
View file

@ -29,28 +29,28 @@
<div class="card border-left-blue mb-3"> <div class="card border-left-blue mb-3">
<div class="card-body"> <div class="card-body">
<p class="h5">Know the rules</p> <p class="h5">Know the rules</p>
<p class="mb-0">To keep yourself safe, it is important to know the terms of service rules. You can find them <a href="#">here</a>.</p> <p class="mb-0">To keep yourself safe, it is important to know the <a href="{{route('site.terms')}}">terms of service</a> rules.</p>
</div> </div>
</div> </div>
<div class="card border-left-blue mb-3"> <div class="card border-left-blue mb-3">
<div class="card-body"> <div class="card-body">
<p class="h5">Know the age guidelines</p> <p class="h5">Know the age guidelines</p>
<p class="mb-0">Please keep in mind that Pixelfed is meant for people over the age of 16 or 13 depending on where you live. For more information click <a href="#">here</a>.</p> <p class="mb-0">Please keep in mind that Pixelfed is meant for people over the age of 16 or 13 depending on where you live.</p>
</div> </div>
</div> </div>
<div class="card border-left-blue mb-3"> <div class="card border-left-blue mb-3">
<div class="card-body"> <div class="card-body">
<p class="h5">Report problematic content</p> <p class="h5">Report problematic content</p>
<p class="mb-0">You can report content that you think is in violation of our policies. For more information click <a href="#">here</a>.</p> <p class="mb-0">You can report content that you think is in violation of our policies.</p>
</div> </div>
</div> </div>
<div class="card border-left-blue mb-3"> <div class="card border-left-blue mb-3">
<div class="card-body"> <div class="card-body">
<p class="h5">Understanding content visibility</p> <p class="h5">Understanding content visibility</p>
<p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more. For more information about visibility, click <a href="#">here</a>.</p> <p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more.</p>
</div> </div>
</div> </div>
@ -58,7 +58,7 @@
<div class="card border-left-blue mb-3"> <div class="card border-left-blue mb-3">
<div class="card-body"> <div class="card-body">
<p class="h5">Make your account or posts private</p> <p class="h5">Make your account or posts private</p>
<p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more. For more information about visibility, click <a href="#">here</a>.</p> <p class="mb-0">You can limit the visibility of your content to specific people, followers, public and more.</p>
</div> </div>
</div> </div>
@endsection @endsection