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

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

Browse source 
Update profile view
This commit is contained in:
daniel 2019-07-19 23:09:51 -06:00 committed by GitHub
commit 6ebb8004fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/views/profile/partial/private-info.blade.php
View file

@ -9,7 +9,7 @@
<div class="col-12 col-md-8 d-flex align-items-center"> <div class="col-12 col-md-8 d-flex align-items-center">
<div class="profile-details"> <div class="profile-details">
<div class="username-bar pb-2 d-flex align-items-center"> <div class="username-bar pb-2 d-flex align-items-center">
<span class="font-weight-ultralight h1">{{$user->username}}</span> <span class="font-weight-ultralight h3">{{$user->username}}</span>
@if(Auth::check() && $is_following == true) @if(Auth::check() && $is_following == true)
<span class="pl-4"> <span class="pl-4">
<form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="unfollow"> <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="unfollow">
@ -18,6 +18,10 @@
<button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button> <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
</form> </form>
</span> </span>
@elseif(Auth::check() && $requested == true)
<span class="pl-4">
<button class="btn btn-outline-secondary font-weight-bold px-4 py-0 disabled" disabled type="button">Follow Requested</button>
</span>
@elseif(Auth::check() && $is_following == false) @elseif(Auth::check() && $is_following == false)
<span class="pl-4"> <span class="pl-4">
<form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow"> <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">