fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #192 from dansup/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-06-03 23:41:55 -06:00 committed by GitHub
commit 646c4489e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/app.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=2c6c809a71f43c33dd4b",
"/js/app.js": "/js/app.js?id=3a0df5c7faec6dfd614c",
"/css/app.css": "/css/app.css?id=ede5557443f098707138",
"/js/timeline.js": "/js/timeline.js?id=1ade82addcc153e4ff66"
}

2
resources/assets/js/components/commentform.js vendored
View file

@ -24,7 +24,7 @@ $(document).ready(function() {
if($('.status-container').length == 1) {
var comments = el.parents().eq(3).find('.comments');
} else {
var comments = el.parents().eq(2).find('.comments');
var comments = el.parents().eq(1).find('.comments');
}
var comment = '<p class="mb-0"><span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="' + profile + '">' + username + '</a></bdi></span><span class="comment-text">'+ commenttext + '</span><span class="float-right"><a href="' + permalink + '" class="text-dark small font-weight-bold">1s</a></span></p>';

4
resources/assets/js/components/likebutton.js vendored
View file

@ -35,7 +35,7 @@ $(document).ready(function() {
.then(function (res) {
var likes = ls.get('likes');
var action = false;
var counter = el.parents().eq(2).find('.like-count');
var counter = el.parents().eq(1).find('.like-count');
var count = res.data.count;
var heart = el.find('.status-heart');
@ -54,7 +54,7 @@ $(document).ready(function() {
}
ls.set('likes', likes);
console.log(action + ' - ' + $(this).data('id') + ' like event');
console.log(action + ' - ' + id + ' like event');
});
});
});

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

@ -1,15 +1,12 @@
<nav class="navbar navbar-expand-md navbar-light navbar-laravel">
<nav class="navbar navbar-expand navbar-light navbar-laravel sticky-top">
<div class="container">
<a class="navbar-brand d-flex align-items-center" href="{{ url('/timeline') }}">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mr-2"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"></path><circle cx="12" cy="13" r="4"></circle></svg>
<strong class="font-weight-bold">{{ config('app.name', 'Laravel') }}</strong>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto">
<ul class="navbar-nav ml-auto d-none d-md-block">
<form class="form-inline search-form">
<input class="form-control mr-sm-2 search-form-input" type="search" placeholder="Search" aria-label="Search">
</form>
@ -64,3 +61,8 @@
</div>
</div>
</nav>
<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="Search" aria-label="Search">
</form>
</nav>