From 55d1379dfc37b095db4589e55a345cb36f3cab7e Mon Sep 17 00:00:00 2001 From: Marcel Lefter Date: Wed, 27 Jan 2021 13:03:33 +0200 Subject: [PATCH 1/4] Fixed input select min-height and background color --- .../molecules/InputSelect/InputSelect.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/molecules/InputSelect/InputSelect.scss b/src/components/molecules/InputSelect/InputSelect.scss index 7cc9a0ec..eb403c9c 100644 --- 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; + } } } From 85ef1134029e50a46d945d4240706ce892f3e240 Mon Sep 17 00:00:00 2001 From: Marcel Lefter Date: Wed, 27 Jan 2021 13:04:07 +0200 Subject: [PATCH 2/4] Fixed buttons styles in sort by component --- src/components/organisms/SortBy/SortBy.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/organisms/SortBy/SortBy.scss b/src/components/organisms/SortBy/SortBy.scss index 0699a757..e08159c2 100644 --- 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; } From 680e08c7a9150e8435e7de5cc5024f5c3789a93d Mon Sep 17 00:00:00 2001 From: Marcel Lefter Date: Wed, 27 Jan 2021 13:05:01 +0200 Subject: [PATCH 3/4] Fixed link for upload field --- src/components/molecules/Upload/Upload.scss | 4 ++++ src/components/molecules/Upload/Upload.tsx | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/molecules/Upload/Upload.scss b/src/components/molecules/Upload/Upload.scss index 1aeef33a..d35ab8aa 100644 --- 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 index 3c1f87c7..de10d93c 100644 --- a/src/components/molecules/Upload/Upload.tsx +++ b/src/components/molecules/Upload/Upload.tsx @@ -90,7 +90,7 @@ export const Upload = React.forwardRef((props, ref) => {
- + {internalFile?.name} @@ -105,7 +105,7 @@ export const Upload = React.forwardRef((props, ref) => {
)} - {internalError &&
{internalError.message}
} + {internalFile && internalError &&
{internalError.message}
} ); }); From d319ee5e2ede8c4e6cb6a1df3c6c61b2fcce121f Mon Sep 17 00:00:00 2001 From: Marcel Lefter Date: Wed, 27 Jan 2021 13:05:36 +0200 Subject: [PATCH 4/4] Release 0.0.1-beta.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb5c8c47..f9001aa8 100644 --- 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": [