Merge branch 'fix/more-ui' into negue-ui-fixes

HabitRPG · Mar 13, 2019 · 7c6b246 · 7c6b246
2 parents c7309ae + 546e260
commit 7c6b246
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/website/client/assets/scss/form.scss b/website/client/assets/scss/form.scss
@@ -159,7 +159,7 @@ $bg-disabled-control: #34303a;
       width: 18px;
       height: 18px;
       background-image: url(~client/assets/svg/for-css/checkbox-white.svg);
-      background-size: 75% 75%;
+      background-size: 13px 10px;
     }
 
     &:active~.custom-control-label::before {

diff --git a/website/client/components/tasks/task.vue b/website/client/components/tasks/task.vue
@@ -46,7 +46,7 @@
             v-markdown="task.notes",
             :class="{'has-checklist': task.notes && hasChecklist}",
           )
-        .checklist(v-if="canViewchecklist")
+        .checklist(v-if="canViewchecklist", :class="{isOpen: !task.collapseChecklist}")
           .d-inline-flex
             .collapse-checklist.d-flex.align-items-center.expand-toggle(
               v-if="isUser",
@@ -254,20 +254,26 @@
   }
 
   .checklist {
-    margin-bottom: 2px;
+    &.isOpen {
+      margin-bottom: 2px;
+    }
+
     margin-top: -3px;
   }
 
   .collapse-checklist {
     padding: 2px 6px;
-    margin-bottom: 9px;
     border-radius: 1px;
     background-color: $gray-600;
     font-size: 10px;
     line-height: 1.2;
     text-align: center;
     color: $gray-200;
 
+    &.open {
+      margin-bottom: 9px;
+    }
+
     span {
       margin: 0px 4px;
     }