From 412e25c568796aeea8cc45eb2131a74683f1b1d7 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Wed, 19 Aug 2020 23:31:26 +0300
Subject: [PATCH 1/4] Adjust Footer elements to correct baseline

---
 src/components/Footer/Footer.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Footer/Footer.css b/src/components/Footer/Footer.css
index 1c3e9a1f7..4a02e4470 100644
--- a/src/components/Footer/Footer.css
+++ b/src/components/Footer/Footer.css
@@ -132,7 +132,7 @@
 }
 
 .organizationCopyright {
-  margin-top: 32px;
+  margin-top: 24px;
 }
 
 .copyrightLink {
@@ -252,6 +252,10 @@
 .tosAndPrivacy {
   margin-top: 0;
   margin-bottom: 0;
+
+  @media (--viewportMedium) {
+    margin-bottom: 10px;
+  }
 }
 
 .legalLink,

From cb62e9de9a48b82f6d9dd76d8458ca2e310c8747 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Wed, 19 Aug 2020 23:32:26 +0300
Subject: [PATCH 2/4] Fix popup-button in SelectSingleFilterPopup.css

---
 .../SelectSingleFilter/SelectSingleFilterPopup.css | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/SelectSingleFilter/SelectSingleFilterPopup.css b/src/components/SelectSingleFilter/SelectSingleFilterPopup.css
index b531595cd..0639afb21 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,

From cce824f782651f5cb115942fb83da6f60f95ae39 Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Wed, 19 Aug 2020 23:36:03 +0300
Subject: [PATCH 3/4] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5af1ca7c9..ea0ec4c90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ way to update this template, but currently, we follow a pattern:
 
 ## Upcoming version 2020-XX-XX
 
+- [fix] Fix popup-button in SelectSingleFilterPopup.css and adjust Footer with correct baselines.
+  [#1353](https://github.com/sharetribe/ftw-daily/pull/1353)
+
 ## [v6.3.0] 2020-08-19
 
 - [change] We decided to change the default font to Poppins.

From 581175f5299b206ed663bf60bb4af5630589e29b Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Wed, 19 Aug 2020 23:44:29 +0300
Subject: [PATCH 4/4] New release: v6.3.1

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea0ec4c90..4fe96da63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,13 @@ way to update this template, but currently, we follow a pattern:
 
 ## Upcoming version 2020-XX-XX
 
+## [v6.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)
 
+[v6.3.1]: https://github.com/sharetribe/ftw-daily/compare/v6.3.0...v6.3.1
+
 ## [v6.3.0] 2020-08-19
 
 - [change] We decided to change the default font to Poppins.
diff --git a/package.json b/package.json
index 663716a65..5aaf24858 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "private": true,
   "license": "Apache-2.0",
   "dependencies": {