WEBUI-1289 BACKPORT: Fix UI issues in nuxeo-document-import when zoom in

nuxeo · Mar 12, 2024 · edf3951 · edf3951
1 parent ea614ad
commit edf3951
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/elements/document/nuxeo-document-import.js b/elements/document/nuxeo-document-import.js
@@ -119,6 +119,7 @@ Polymer({
 
       #blobEditor {
         @apply --layout-flex-3;
+        min-height: 66px;
       }
 
       #blobList {
@@ -155,7 +156,7 @@ Polymer({
         @apply --layout-vertical;
         @apply --layout-flex;
         background: var(--nuxeo-page-background);
-        min-width: 200px;
+        min-width: 100px;
       }
 
       .blobCheck {
@@ -319,6 +320,10 @@ Polymer({
         padding-left: 8px;
       }
 
+      .upload-error:empty {
+        display: none;
+      }
+
       .upload-error:not(:empty) {
         border-left: 4px solid var(--nuxeo-warn-text, #de350b);
       }
@@ -370,6 +375,14 @@ Polymer({
         color: var(--nuxeo-link-hover-color, #0066ff);
         font: inherit;
       }
+
+      .heightFix {
+        height: fit-content;
+      }
+
+      .widthFix {
+        width: 100%;
+      }
     </style>
 
     <nuxeo-connection id="nx"></nuxeo-connection>
@@ -385,7 +398,7 @@ Polymer({
 
     <iron-a11y-keys keys="enter" on-keys-pressed="_submitKeyHandler"></iron-a11y-keys>
 
-    <iron-pages selected="[[stage]]" attr-for-selected="name" class="vertical layout flex">
+    <iron-pages selected="[[stage]]" attr-for-selected="name" class="vertical layout flex widthFix">
       <!--Stage: allow the user to upload files-->
       <div name="upload" class="upload vertical layout flex" tabindex="0">
         <div class="suggester">
@@ -651,7 +664,7 @@ Polymer({
           </paper-dialog-scrollable>
         </div>
         <div class="buttons horizontal justified layout">
-          <paper-button noink dialog-dismiss on-tap="_cancel" hidden$="[[_creating]]" class="secondary">
+          <paper-button noink dialog-dismiss on-tap="_cancel" hidden$="[[_creating]]" class="secondary heightFix">
             [[i18n('command.cancel')]]
           </paper-button>
 
@@ -686,7 +699,7 @@ Polymer({
 
           <paper-button
             noink
-            class="primary"
+            class="primary heightFix"
             name="createWithProperties"
             on-tap="_importWithProperties"
             disabled$="[[!_canImportWithMetadata(_creating,_initializingDoc,canCreate,hasLocalFilesUploaded,hasRemoteFiles,localFiles.*,remoteFiles.*)]]"

diff --git a/elements/nuxeo-document-create-popup/nuxeo-document-create-popup.js b/elements/nuxeo-document-create-popup/nuxeo-document-create-popup.js
@@ -74,6 +74,10 @@ Polymer({
         width: 100%;
       }
 
+      .widthFix {
+        width: 100%;
+      }
+
       iron-pages {
         @apply --layout-flex;
         @apply --layout-horizontal;
@@ -88,7 +92,7 @@ Polymer({
         <nuxeo-slot name="CREATE_POPUP_ITEMS" model="[[importContext]]"></nuxeo-slot>
       </paper-tabs>
       <div id="holder" class="vertical layout flex">
-        <iron-pages selected="[[selectedTab]]" attr-for-selected="name" selected-attribute="visible">
+        <iron-pages selected="[[selectedTab]]" attr-for-selected="name" class="widthFix" selected-attribute="visible">
           <nuxeo-slot name="CREATE_POPUP_PAGES" model="[[importContext]]"></nuxeo-slot>
           <nuxeo-document-create
             id="simpleCreation"
@@ -100,6 +104,7 @@ Polymer({
           <nuxeo-document-import
             id="bulkCreation"
             name="import"
+            class="widthFix"
             parent="[[parent]]"
             target-path="{{parentPath}}"
             suggester-children="{{suggesterChildren}}"