Merge pull request #38 from ebs-integrator/development

Development
ebs-integrator · Jan 27, 2021 · 56be69a · 56be69a
2 parents e5180cd + d319ee5
commit 56be69a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ebs-integrator/react-ebs-ui",
-  "version": "0.0.1-beta.11",
+  "version": "0.0.1-beta.12",
   "description": "Basic React UI elements.",
   "author": "EBS Integrator",
   "maintainers": [

diff --git a/src/components/molecules/InputSelect/InputSelect.scss b/src/components/molecules/InputSelect/InputSelect.scss
@@ -4,6 +4,7 @@
   border: 1px solid $border-color;
   border-radius: rem($border-radius);
   font-size: rem(14px);
+  background-color: $white;
 
   &-transition {
     width: rem(90px);
@@ -66,12 +67,27 @@
   &--small {
     font-size: rem(12px);
     padding: rem($select-padding-y-sm $select-padding-x-sm);
+
+    // FIXME: Temporary hack
+    .ebs-select__input-value:empty {
+      min-height: $base-size-sm - $select-padding-y-sm * 2;
+    }
   }
   &--medium {
     padding: rem($select-padding-y $select-padding-x);
+
+    // FIXME: Temporary hack
+    .ebs-select__input-value:empty {
+      min-height: $base-size - $select-padding-y * 2;
+    }
   }
   &--large {
     padding: rem($select-padding-y-lg $select-padding-x-lg);
+
+    // FIXME: Temporary hack
+    .ebs-select__input-value:empty {
+      min-height: $base-size-lg - $select-padding-y-lg * 2;
+    }
   }
 }
 

diff --git a/src/components/molecules/Upload/Upload.scss b/src/components/molecules/Upload/Upload.scss
@@ -16,11 +16,15 @@
       &:hover {
         cursor: pointer;
       }
+      .ebs-icon {
+        color: $text-color;
+      }
     }
     &__name {
       font-weight: 600;
       margin-bottom: 7px;
       font-size: rem(13px);
+      color: $text-color;
     }
     &__size {
       min-width: 80px;

diff --git a/src/components/molecules/Upload/Upload.tsx b/src/components/molecules/Upload/Upload.tsx
@@ -90,7 +90,7 @@ export const Upload = React.forwardRef<any, UploadProps>((props, ref) => {
           </div>
 
           <div className="upload__file">
-            <a href={internalFile?.url} className="upload__file__name">
+            <a href={internalFile?.url} target="_blank" rel="noopener noreferrer" className="upload__file__name">
               {internalFile?.name}
             </a>
 
@@ -105,7 +105,7 @@ export const Upload = React.forwardRef<any, UploadProps>((props, ref) => {
         </div>
       )}
 
-      {internalError && <div className="upload__error">{internalError.message}</div>}
+      {internalFile && internalError && <div className="upload__error">{internalError.message}</div>}
     </>
   );
 });
diff --git a/src/components/organisms/SortBy/SortBy.scss b/src/components/organisms/SortBy/SortBy.scss
@@ -48,7 +48,6 @@
 
 .ebs-sort-by__wrapper {
   position: relative;
-  height: rem($sort-by-height);
   display: flex;
 
   > .ebs-button__wrapper {
@@ -67,8 +66,6 @@
   }
 
   .ebs-button__wrapper {
-    height: rem($sort-by-height);
-
     .ebs-icon {
       transition: 300ms transform;
     }