Merge pull request #36 from saferwall/2022-fixing

2022 fixing
saferwall · Jan 28, 2022 · 9d266e1 · 9d266e1
2 parents d067e57 + ebba6f5
commit 9d266e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/common/components/UploadFile.vue b/src/common/components/UploadFile.vue
@@ -34,7 +34,7 @@
           </g>
         </svg>
       </button>
-      <div class="progress" v-if="true || isUploading">
+      <div class="progress" v-if="isUploading">
         <k-progress
           class="k"
           active

diff --git a/src/common/components/elements/ActivityBlock.vue b/src/common/components/elements/ActivityBlock.vue
@@ -226,6 +226,10 @@ export default {
         @apply flex-col-reverse lg:flex-row;
       }
     }
+
+    .header {
+      @apply flex flex-row;
+    }
   }
 
   .header {
@@ -263,9 +267,10 @@ export default {
   }
   .buttons {
     .follow {
-      border-color: #dedede;
+      @apply border-gray-light;
+      &:hover,
       &.active {
-        @apply bg-primary bg-opacity-10 border-none;
+        @apply bg-primary bg-opacity-10;
       }
     }
   }