mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #2372 from pixelfed/staging 

Update Timeline.vue, move compose button
This commit is contained in:
daniel 2020-08-05 22:45:03 -06:00 committed by GitHub
parent 8d3356a830 5c0dee018e
commit e387bbd857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -82,7 +82,8 @@
- Updated PostComponent.vue, improve MetroUI and fixes ([#2363](https://github.com/pixelfed/pixelfed/issues/2363)). ([0c8ebf26](https://github.com/pixelfed/pixelfed/commit/0c8ebf26))
- Updated Timeline.vue, fixes ([#2363](https://github.com/pixelfed/pixelfed/issues/2363)). ([f53f10fd](https://github.com/pixelfed/pixelfed/commit/f53f10fd))
- Updated Profile.vue, add atom feed link to context menu. Fixes ([#2313](https://github.com/pixelfed/pixelfed/issues/2313)). ([89f29072](https://github.com/pixelfed/pixelfed/commit/89f29072))
- Update Hashtag.vue, add nsfw toggle. Fixes ([#2225](https://github.com/pixelfed/pixelfed/issues/2225)). ([e5aa506c](https://github.com/pixelfed/pixelfed/commit/e5aa506c))
- Updated Hashtag.vue, add nsfw toggle. Fixes ([#2225](https://github.com/pixelfed/pixelfed/issues/2225)). ([e5aa506c](https://github.com/pixelfed/pixelfed/commit/e5aa506c))
- Updated Timeline.vue, move compose button. ([9cad8f77](https://github.com/pixelfed/pixelfed/commit/9cad8f77))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
### Added

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -27,5 +27,5 @@
"/js/status.js": "/js/status.js?id=715991f4c4f55045a2ee",
"/js/story-compose.js": "/js/story-compose.js?id=8768fd0f62554e98ef10",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=3b6e62701f12b717cc5c",
"/js/timeline.js": "/js/timeline.js?id=080bd57efd9ce9153b54"
"/js/timeline.js": "/js/timeline.js?id=a78c15592e402e6cad84"
}

35
resources/assets/js/components/Timeline.vue
View File

@ -14,6 +14,11 @@
  |  
<a href="#" :class="[layout!=='feed'?'font-weight-bold text-dark text-decoration-none':'font-weight-light text-muted text-decoration-none']" @click.prevent="switchFeedLayout('grid')"><i class="fas fa-th"></i> &nbsp; Grid</a>
</p>
<p class="mb-0 d-none d-md-block">
<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
<i class="fas fa-camera pr-3 fa-lg pt-1"></i> New Post
</a>
</p>
</div>
<hr>
</div>
@ -252,8 +257,15 @@
<div v-if="!modes.distractionFree" class="col-md-4 col-lg-4 my-3 order-1 order-md-2 d-none d-md-block">
<div>
<!-- <div class="mb-4">
<a class="btn btn-block btn-primary btn-sm font-weight-bold mb-3 border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
<i class="far fa-plus-square pr-3 fa-lg pt-1"></i> New Post
</a>
</div> -->
<div class="mb-4">
<div class="card shadow-none border">
<div v-show="!loading" class="card shadow-none border">
<div class="card-body pb-2">
<div class="media d-flex align-items-center">
<a :href="!userStory ? profile.url : '/stories/' + profile.acct" class="mr-3">
@ -298,12 +310,6 @@
</div>
</div>
<div class="mb-4">
<a class="btn btn-light btn-block btn-sm font-weight-bold text-dark mb-3 border bg-white" href="/i/compose" data-toggle="modal" data-target="#composeModal">
<i class="far fa-plus-square pr-3 fa-lg pt-1"></i> Compose Post
</a>
</div>
<div v-show="modes.notify == true && !loading" class="mb-4">
<notification-card></notification-card>
</div>
@ -353,15 +359,15 @@
</div>
</div>
</div>
<div v-else class="row pt-2">
<div v-else class="row">
<div class="col-12">
<div v-if="loading" class="text-center">
<!-- <div v-if="loading" class="text-center">
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
<div v-else class="row">
<div class="col-12 pt-3">
</div> -->
<div class="row">
<div class="col-12 pl-3 pl-md-0 pt-3 pl-0">
<div class="d-flex justify-content-between align-items-center">
<p class="lead text-muted mb-0"><i :class="[scope == 'home' ? 'fas fa-home':'fas fa-stream']"></i> &nbsp; {{scope == 'local' ? 'Public' : 'Home'}} Timeline</p>
<p class="mb-0">
@ -369,6 +375,11 @@
&nbsp; | &nbsp;
<a href="#" :class="[layout!=='feed'?'font-weight-bold text-dark text-decoration-none':'font-weight-light text-muted text-decoration-none']" @click.prevent="switchFeedLayout('grid')"><i class="fas fa-th"></i> &nbsp; Grid</a>
</p>
<p class="mb-0 d-none d-md-block">
<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
<i class="fas fa-camera pr-3 fa-lg pt-1"></i> New Post
</a>
</p>
</div>
<hr>
</div>

6
resources/views/layouts/app.blade.php
View File

@ -65,7 +65,11 @@
<a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a>
</li>
<li class="nav-item">
<div class="nav-link text-lighter cursor-pointer" onclick="App.util.compose.post()"><i class="fas fa-camera fa-lg"></i></div>
<div class="nav-link text-primary cursor-pointer" onclick="App.util.compose.post()">
<span class="border border-primary rounded p-2 bg-primary">
<i class="fas fa-camera fa-lg text-white"></i>
</span>
</div>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a>

4
resources/views/layouts/partial/nav.blade.php
View File

@ -52,7 +52,7 @@
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<div class="dropdown-item font-weight-bold cursor-pointer" onclick="App.util.compose.post()">
<span class="fas fa-plus-square pr-2 text-lighter"></span>
<span class="fas fa-camera pr-2 text-primary"></span>
New Post
</div>
<div class="dropdown-divider"></div>
@ -62,7 +62,7 @@
</a>
<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
<span class="fas fa-stream pr-2 text-lighter"></span>
Local
Public
</a>
<a class="dropdown-item font-weight-bold" href="/i/stories/new">
<span class="fas fa-history text-lighter pr-2"></span>