more button stuff

HabitRPG · Sep 18, 2024 · a588d84 · a588d84
1 parent 002c065
commit a588d84
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/website/client/src/assets/scss/button.scss b/website/client/src/assets/scss/button.scss
@@ -91,6 +91,10 @@
       color: var(--icon-color);
     }
   }
+
+  &.disabled {
+    line-height: 1;
+  }
 }
 
 .btn-secondary,

diff --git a/website/client/src/assets/scss/dropdown.scss b/website/client/src/assets/scss/dropdown.scss
@@ -1,5 +1,5 @@
 .dropdown > .btn {
-  padding: 0.219rem 0.75rem;
+  // padding: 4.5px 12px;
   font-family: 'Roboto', sans-serif;
   font-size: 14px;
   font-weight: normal;

diff --git a/website/client/src/components/payments/buttons/list.vue b/website/client/src/components/payments/buttons/list.vue
@@ -57,6 +57,7 @@
 
         &.paypal-checkout {
           background: #009cde;
+          height: 32px;
 
           img {
             width: 157px;

diff --git a/website/client/src/components/tasks/modal-controls/multiList.vue b/website/client/src/components/tasks/modal-controls/multiList.vue
@@ -66,7 +66,7 @@
   @import '~@/assets/scss/colors.scss';
 
   .margin-adjust {
-    margin-top: -1px;
+    margin-top: 2px;
   }
 
   .multi-list {
@@ -77,7 +77,7 @@
       flex-wrap: wrap;
 
       .multi-item {
-        margin-bottom: 0.375rem;
+        margin-bottom: 4px;
       }
     }
   }

diff --git a/website/client/src/components/tasks/modal-controls/selectMulti.vue b/website/client/src/components/tasks/modal-controls/selectMulti.vue
@@ -88,8 +88,8 @@ $itemHeight: 2rem;
 
 .inline-dropdown {
   &.select-multi .dropdown-toggle {
-    height: auto;
-    padding-bottom: 0px;
+    line-height: 1.215;
+    padding: 3px 0px;
   }
 }
 

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-right: 25px; /* To allow enough room for the down arrow to be displayed */
+    padding: 4.101px 25px 4.1px 8px; // 25px allowed enough room for the down arrow to be displayed
   }
 
   .selectListItem {

diff --git a/website/client/src/pages/private-messages.vue b/website/client/src/pages/private-messages.vue
@@ -379,6 +379,7 @@
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
+    line-clamp: 2;
     overflow: hidden;
     text-overflow: ellipsis;
     word-break: break-word;
@@ -459,7 +460,7 @@
     }
 
     button {
-      height: 40px;
+      height: 32px;
       border-radius: 2px;
       margin-left: 1.5rem;