diff --git a/CHANGELOG.md b/CHANGELOG.md index 5328e3e79..cf7148ab9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,16 @@ https://github.com/sharetribe/flex-template-web/ ## Upcoming version 2020-XX-XX +## [v8.3.1] 2020-08-19 + +- [fix] Fix popup-button in SelectSingleFilterPopup.css and adjust Footer with correct baselines. + [#1353](https://github.com/sharetribe/ftw-daily/pull/1353) + +[v8.3.1]: https://github.com/sharetribe/ftw-hourly/compare/v8.3.0...v8.3.1 + ## [v8.3.0] 2020-08-19 -### Updates from upstream (FTW-daily v6.2.0) +### Updates from upstream (FTW-daily v6.3.0) - [change] We decided to change the default font to Poppins. [#1349](https://github.com/sharetribe/ftw-daily/pull/1349) diff --git a/package.json b/package.json index 27ff13d4f..23051004f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "8.3.0", + "version": "8.3.1", "private": true, "license": "Apache-2.0", "dependencies": { diff --git a/src/components/SelectSingleFilter/SelectSingleFilterPopup.css b/src/components/SelectSingleFilter/SelectSingleFilterPopup.css index f56972471..468177c3f 100644 --- a/src/components/SelectSingleFilter/SelectSingleFilterPopup.css +++ b/src/components/SelectSingleFilter/SelectSingleFilterPopup.css @@ -8,8 +8,8 @@ } } -.menuLabel, -.menuLabelSelected { +.menuLabel { + @apply --marketplaceButtonStylesSecondary; @apply --marketplaceSearchFilterLabelFontStyles; padding: var(--marketplaceButtonSmallDesktopPadding); @@ -17,10 +17,6 @@ height: auto; min-height: 0; border-radius: 4px; -} - -.menuLabel { - @apply --marketplaceButtonStylesSecondary; &:focus { outline: none; @@ -33,8 +29,14 @@ .menuLabelSelected { @apply --marketplaceButtonStyles; + @apply --marketplaceSearchFilterLabelFontStyles; font-weight: var(--fontWeightSemiBold); + padding: var(--marketplaceButtonSmallDesktopPadding); + width: auto; + height: auto; + min-height: 0; + border-radius: 4px; border: 1px solid var(--marketplaceColor); &:hover,