and yet another pass

HabitRPG · Sep 19, 2024 · a5d33b0 · a5d33b0
1 parent 16940df
commit a5d33b0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/website/client/src/assets/scss/button.scss b/website/client/src/assets/scss/button.scss
@@ -4,7 +4,7 @@
   font-size: 14px;
   font-weight: bold;
   border: 1px solid transparent;
-  padding: 4px 12px;
+  line-height: 1.5;
   border-radius: 4px;
   box-shadow: 0 1px 3px 0 rgba($black, 0.12), 0 1px 2px 0 rgba($black, 0.24);
   color: $white;
@@ -285,6 +285,6 @@
   display:inline-flex;
   flex-wrap: wrap;
   font-size: 12px;
-  line-height: 1.167;
+  line-height: 1.17;
   padding: 4px 8px;
 }
diff --git a/website/client/src/components/admin-panel/index.vue b/website/client/src/components/admin-panel/index.vue
@@ -22,7 +22,7 @@
               Load User
             </button>
             <button
-              class="btn btn-secondary"
+              class="btn btn-secondary buttons"
               type="button"
               @click="searchUsers(userIdentifier)"
             >
@@ -42,17 +42,14 @@
 
 <style lang="scss" scoped>
   .btn {
-    line-height:1.71;
     padding: 4.5px 12px;
-    top: -1px;
   }
 
   .uidField {
     min-width: 45ch;
   }
 
   .input-group-append {
-    height: 32px;
     width: auto;
   }
 

diff --git a/website/client/src/components/tasks/modal-controls/multiList.vue b/website/client/src/components/tasks/modal-controls/multiList.vue
@@ -20,7 +20,7 @@
       >
         <div
           v-markdown="item.name"
-          class="multi-label my-auto ml-75 mr-2"
+          class="multi-label ml-75 mr-2"
         ></div>
         <div
           class="remove ml-auto mr-75"
@@ -69,6 +69,10 @@
     margin-top: 2px;
   }
 
+  .markdown {
+    padding-top: 2px !important;
+  }
+
   .multi-list {
     width: 100%;
 
@@ -98,15 +102,14 @@
     .multi-label {
       height: 1rem;
       font-size: 12px;
-      line-height: 16px;
+      line-height: 1;
       letter-spacing: normal;
       color: $gray-100;
     }
 
     .remove {
       display: inline-block;
       object-fit: contain;
-      margin-top: -0.125rem;
     }
   }
 

diff --git a/website/client/src/components/ui/filterDropdown.vue b/website/client/src/components/ui/filterDropdown.vue
@@ -12,7 +12,19 @@
       @select="selectItem($event)"
     >
       <template #item="{ item }">
-        <span :class="{'dropdown-icon-item': withIcon}">
+        <span
+          :class="{'dropdown-icon-item': withIcon}"
+          v-if="withIcon"
+          id="class-selector"
+        >
+          <slot
+            name="item"
+            :item="item"
+          ></slot>
+        </span>
+        <span
+          v-else
+        >
           <slot
             name="item"
             :item="item"
@@ -56,5 +68,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
+#class-selector {
+  line-height: 1.37;
+  padding-top: 4.1px !important;
+  padding-bottom: 4.1px !important;
+}
 </style>
diff --git a/website/client/src/components/ui/selectList.vue b/website/client/src/components/ui/selectList.vue
@@ -58,7 +58,7 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    padding: 4.101px 25px 4.1px 8px; // 25px allowed enough room for the down arrow to be displayed
+    padding-right: 25px; // 25px allows room for the down arrow display
   }
 
   .selectListItem {

diff --git a/website/client/src/components/userMenu/profile.vue b/website/client/src/components/userMenu/profile.vue
@@ -834,7 +834,7 @@
 
   .send-message {
     font-size: 1em;
-    line-height: 1.71;
+    line-height: 1.5;
     margin-left: 24px;
     margin-right: 8px;
     margin-top: 0px;