Merge pull request #1031 from dew326/browse-image

EZP-30649: Browse field for image/media/file field types
ezsystems · Jul 1, 2019 · 1dc7f1d · 1dc7f1d
2 parents 79f1ecd + 8f75fe0
commit 1dc7f1d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_base-preview.scss b/src/bundle/Resources/public/scss/fieldType/edit/_base-preview.scss
@@ -6,11 +6,16 @@
         box-sizing: border-box;
     }
 
-    .form-control-file {
+    .form-control-file,
+    .custom-file-input {
         opacity: 0;
         height: 1px;
     }
 
+    .custom-file {
+        display: none;
+    }
+
     .ez-field-edit__data {
         border-radius: 0.25rem;
         border: 2px dashed $ez-color-base-pale;

diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ezimageasset.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ezimageasset.scss
@@ -1,6 +1,6 @@
 .ez-field-edit--ezimageasset {
     .ez-field-edit-preview {
-        padding: 1.25rem 0 .75rem 1.25rem;
+        padding: calculateRem(20px) 0 calculateRem(12px) calculateRem(20px);
 
         &__media {
             max-width: 100%;
@@ -11,12 +11,12 @@
 
         &__details {
             color: $ez-color-base-light;
-            font-size: 0.75rem;
-            padding-top: 0.5rem;
+            font-size: calculateRem(12px);
+            padding-top: calculateRem(8px);
         }
 
         &__image-alt {
-            margin-top: .5rem;
+            margin-top: calculateRem(8px);
         }
     }
 
@@ -28,31 +28,31 @@
                 content: '!';
                 position: absolute;
                 top: 0;
-                left: -20px;
-                width: 20px;
+                left: calculateRem(-20px);
+                width: calculateRem(20px);
                 background: red;
                 color: white;
                 text-align: center;
-                font-size: 1.5rem;
-                border-top-left-radius: 5px;
-                border-bottom-left-radius: 5px;
+                font-size: calculateRem(24px);
+                border-top-left-radius: calculateRem(5px);
+                border-bottom-left-radius: calculateRem(5px);
             }
         }
     }
 
     .ez-field-edit-spinner {
-        width: 2rem;
-        height: 2rem;
+        width: calculateRem(32px);
+        height: calculateRem(32px);
         position: absolute;
         bottom: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
         display: none;
 
         .ez-icon {
-            width: 2rem;
-            height: 2rem;
-            fill: #333;
+            width: calculateRem(32px);
+            height: calculateRem(32px);
+            fill: $ez-black;
         }
     }
 }