浏览代码

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

fix button styling
daniel 6 年之前
父节点
当前提交
f9609c45ff

+ 4 - 4
resources/assets/js/components/PostComponent.vue

@@ -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 class="far fa-comment pr-3 m-0" 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.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.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 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 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 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">

+ 3 - 3
resources/assets/js/components/Timeline.vue

@@ -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 class="far fa-comment pr-3 m-0 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.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 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 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">

+ 7 - 1
resources/assets/sass/custom.scss

@@ -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 {