fix: ui scaling retains borders

NUWCDIVNPT · Nov 13, 2023 · 55d9eaa · 55d9eaa
1 parent f366124
commit 55d9eaa
Show file tree

Hide file tree

Showing 10 changed files with 376 additions and 329 deletions.
diff --git a/client/src/css/dark-mode.css b/client/src/css/dark-mode.css
@@ -253,8 +253,7 @@ fieldset.x-panel-collapsed {
 }
 
 .x-btn button.sm-error-icon {
-    background-color: #602020;
-    background-image: url("../img/remove.svg")
+    background-color: #602020
 }
 
 .x-btn-bc, .x-btn-bl, .x-btn-br, .x-btn-mc, .x-btn-ml, .x-btn-mr, .x-btn-tc, .x-btn-tl, .x-btn-tr {
@@ -2421,11 +2420,6 @@ td.sort-asc, td.sort-desc, td.x-grid3-hd-menu-open, td.x-grid3-hd-over {
     background-color: initial!important
 }
 
-.icon-del {
-    background-image: url("../img/remove.svg");
-    background-color: initial
-}
-
 .icon-save {
     background-image: url("../img/save.gif")!important;
     background-color: initial!important

diff --git a/client/src/css/stigman.css b/client/src/css/stigman.css
@@ -1050,7 +1050,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner {
   border-radius: 25px;
   border: none;
   margin: 10px;
-  height: 400px
+  height: 400px;
+  width: 380px
 }
 .sm-home-widget-header {
   background-color: #d3d3d3
@@ -1149,7 +1150,10 @@ td.x-grid3-hd-over .x-grid3-hd-inner {
   background: url(../img/edit.svg) 0 no-repeat!important
 }
 .icon-del {
-  background: url(../img/remove.svg) 0 0/16px 16px
+  background: url(../img/trash.svg) 0 0/16px 16px
+}
+.icon-remove {
+  background: url(../img/remove.svg);
 }
 .icon-save {
   background: url(../img/save.gif) 0 no-repeat!important
@@ -2033,14 +2037,34 @@ td.x-grid3-hd-over .x-grid3-hd-inner {
   font-size: 10px;
   line-height: 16px;
 }
+.x-tool.x-tool-trash {
+  background-image: url(../img/trash.svg);
+  background-repeat: no-repeat;
+  background-size: 14px 14px;
+  color: grey;
+  width: auto;
+  padding-left: 15px;
+  font-size: 10px;
+  line-height: 16px;
+}
+.x-tool.x-tool-clone {
+  background-image: url(../img/clone.svg);
+  background-repeat: no-repeat;
+  background-size: 14px 14px;
+  color: grey;
+  width: auto;
+  padding-left: 15px;
+  font-size: 10px;
+  line-height: 16px;
+}
 .x-tool.x-tool-spacer {
   width: 10px;
   background-image: unset;
 }
 .x-tool.x-tool-logout {
   background-image: url(../img/logout.svg);
   background-repeat: no-repeat;
-  background-size: 12px 15px;
+  background-size: 14px 14px;
 }
 .x-tool.x-tool-toggle.x-tool-collapse-west {
   background-image: url(../img/collapse-left.svg);
@@ -2113,7 +2137,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner {
   background-color: #e5e5e5
 }
 .x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
-  background-size: 14px 14px
+  background-size: 14px 14px;
+  background-position: 0px 1px;
 }
 .sm-hover-icon {
   opacity: 0.75;
@@ -2201,3 +2226,6 @@ td.x-grid3-hd-over .x-grid3-hd-inner {
 .sm-grabbing *, .sm-grabbing .sm-grid3-draggable .x-grid3-row-selected *, .sm-grabbing .sm-grid3-draggable .x-grid3-row-selected {
   cursor: url("../img/drag-drop-light.svg"), grabbing;
 }
+.x-item-disabled {
+	filter: saturate(0)
+}
diff --git a/client/src/img/remove.svg b/client/src/img/remove.svg
diff --git a/client/src/img/trash.svg b/client/src/img/trash.svg
diff --git a/client/src/js/SM/CollectionClone.js b/client/src/js/SM/CollectionClone.js
@@ -74,7 +74,7 @@ SM.CollectionClone.CloneFormPanel = Ext.extend(Ext.form.FormPanel, {
       name: 'name',
       allowBlank: false,
       value: this.sourceName ? `Clone of ${this.sourceName}` : '',
-      anchor: '100%',
+      anchor: '-5',
       listeners: {
         keyup: handleInput
       }
@@ -83,7 +83,7 @@ SM.CollectionClone.CloneFormPanel = Ext.extend(Ext.form.FormPanel, {
       fieldLabel: 'Description',
       labelStyle: 'font-weight: 600;',
       name: 'description',
-      anchor: '100%',
+      anchor: '-5',
       value: `Cloned from ${this.sourceName} on ${new Date().toLocaleDateString('en-CA')} by ${curUser.displayName}`
     })
     const grantsCb = new SM.Global.HelperCheckbox({