UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-10 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1065 from pixelfed/use-button-element

Browse source 
fix button styling
This commit is contained in:
daniel 2019-03-22 11:33:33 -06:00 committed by GitHub
commit f9609c45ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/assets/js/components/PostComponent.vue
View file

@ -125,10 +125,10 @@
</div> </div>
<div class="card-body flex-grow-0 py-1"> <div class="card-body flex-grow-0 py-1">
<div class="reactions my-1"> <div class="reactions my-1">
<button v-bind:class="[reactions.liked ? 'fas fa-heart text-danger pr-3 m-0' : 'far fa-heart pr-3 m-0 like-btn']" title="Like" v-on:click="likeStatus"></button> <button v-bind:class="[reactions.liked ? 'fas fa-heart btn btn-link text-danger px-0 mr-2 m-0' : 'far fa-heart px-0 mr-2 m-0 like-btn btn btn-link text-dark']" title="Like" v-on:click="likeStatus"></button>
<button class="far fa-comment pr-3 m-0" title="Comment" v-on:click="commentFocus"></button> <button class="far fa-comment px-0 mr-2 m-0 btn btn-link text-dark" title="Comment" v-on:click="commentFocus"></button>
<button v-bind:class="[reactions.shared ? 'far fa-share-square pr-3 m-0 text-primary' : 'far fa-share-square pr-3 m-0 share-btn']" title="Share" v-on:click="shareStatus"></button> <button v-bind:class="[reactions.shared ? 'far fa-share-square px-0 mr-2 m-0 btn btn-link text-primary' : 'far fa-share-square px-0 mr-2 m-0 share-btn btn btn-link text-dark']" title="Share" v-on:click="shareStatus"></button>
<button v-bind:class="[reactions.bookmarked ? 'fas fa-bookmark text-warning m-0 float-right' : 'far fa-bookmark m-0 float-right']" title="Bookmark" v-on:click="bookmarkStatus"></button> <button v-bind:class="[reactions.bookmarked ? 'fas fa-bookmark btn btn-link text-warning px-0 m-0 float-right' : 'far fa-bookmark btn btn-link text-dark px-0 m-0 float-right']" title="Bookmark" v-on:click="bookmarkStatus"></button>
</div> </div>
<div class="reaction-counts font-weight-bold mb-0"> <div class="reaction-counts font-weight-bold mb-0">
<span style="cursor:pointer;" v-on:click="likesModal"> <span style="cursor:pointer;" v-on:click="likesModal">

6
resources/assets/js/components/Timeline.vue
View file

@ -84,9 +84,9 @@
<div class="card-body"> <div class="card-body">
<div class="reactions my-1"> <div class="reactions my-1">
<button v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></button> <button v-bind:class="[status.favourited ? 'fas fa-heart btn btn-link text-danger px-0 mr-2 m-0 cursor-pointer' : 'far fa-heart px-0 mr-2 m-0 like-btn btn btn-link text-dark cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></button>
<button class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></button> <button class="far fa-comment px-0 mr-2 m-0 btn btn-link text-dark cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></button>
<button v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></button> <button v-bind:class="[status.reblogged ? 'far fa-share-square px-0 mr-2 m-0 btn btn-link text-primary cursor-pointer' : 'far fa-share-square px-0 mr-2 m-0 share-btn btn btn-link text-dark cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></button>
</div> </div>
<div class="likes font-weight-bold"> <div class="likes font-weight-bold">

8
resources/assets/sass/custom.scss vendored
View file

@ -317,8 +317,14 @@ body, button, input, textarea {
} }
.reactions button { .reactions button {
font-size: 1.575rem font-size: 1.575rem;
line-height: 1;
} }
.reactions button:hover {
text-decoration: none
}
} }
.touch .card { .touch .card {