From 3cf9498732385f71c3bb064dd0019dd768af02dc Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 24 May 2019 13:01:02 +0300
Subject: [PATCH 1/5] Use PORT env variable in dev config

---
 apps/block_scout_web/config/dev.exs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/block_scout_web/config/dev.exs b/apps/block_scout_web/config/dev.exs
index ae05490a86..27ce5aff40 100644
--- a/apps/block_scout_web/config/dev.exs
+++ b/apps/block_scout_web/config/dev.exs
@@ -6,10 +6,18 @@ use Mix.Config
 # The watchers configuration can be used to run external
 # watchers to your application. For example, we use it
 # with webpack to recompile .js and .css sources.
+
+port =
+  case System.get_env("PORT") && Integer.parse(System.get_env("PORT")) do
+    {port, _} -> port
+    :error -> nil
+    nil -> nil
+  end
+
 config :block_scout_web, BlockScoutWeb.Endpoint,
-  http: [port: 4000],
+  http: [port: port || 4000],
   https: [
-    port: 4001,
+    port: (port && port + 1) || 4001,
     cipher_suite: :strong,
     certfile: System.get_env("CERTFILE") || "priv/cert/selfsigned.pem",
     keyfile: System.get_env("KEYFILE") || "priv/cert/selfsigned_key.pem"

From 0271775cd15a1b00aab618347fcf0d1a9f69602b Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 24 May 2019 13:02:52 +0300
Subject: [PATCH 2/5] Add CHANGELOG entry

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4edae41dad..051d6db16d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - [#1975](https://github.com/poanetwork/blockscout/pull/1975) - add log index to transaction view
 - [#1988](https://github.com/poanetwork/blockscout/pull/1988) - Fix wrong parity tasks names in Circle CI
 - [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name
+- [#2018](https://github.com/poanetwork/blockscout/pull/2018) - Use PORT env variable in dev config
 
 ## 1.3.14-beta
 

From d304bcf7a6c09dfc1d74befffc90689a20bccf9f Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Mon, 27 May 2019 12:29:40 +0300
Subject: [PATCH 3/5] Update _dropdown.scss

---
 apps/block_scout_web/assets/css/components/_dropdown.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/block_scout_web/assets/css/components/_dropdown.scss b/apps/block_scout_web/assets/css/components/_dropdown.scss
index c8962c021d..c93231edbd 100644
--- a/apps/block_scout_web/assets/css/components/_dropdown.scss
+++ b/apps/block_scout_web/assets/css/components/_dropdown.scss
@@ -52,6 +52,10 @@
       font-weight: 700;
     }
   }
+  
+  &.active {
+    background-color: $secondary;
+  }
 
   &.division {
     border-top: 1px solid $base-border-color;

From 3ddea068afd2c7751678bc81f74e25954120461e Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Mon, 27 May 2019 12:33:27 +0300
Subject: [PATCH 4/5] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55fdbe8b6d..42d621336a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Current
 
 ### Features
+- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue,
 - [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk
 - [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages"
 - [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated

From 86be104debf5f79faf6ab5455b7189e273d97c0b Mon Sep 17 00:00:00 2001
From: maxgrapps <50101080+maxgrapps@users.noreply.github.com>
Date: Mon, 27 May 2019 14:34:42 +0300
Subject: [PATCH 5/5] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42d621336a..b2b45e115a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 ## Current
 
 ### Features
-- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue,
 - [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895), [#2031](https://github.com/poanetwork/blockscout/pull/2031) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk
 - [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages"
 - [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated
@@ -21,7 +20,7 @@
 - [#1807](https://github.com/poanetwork/blockscout/pull/1807) - New theming capabilites.
 
 ### Fixes
-
+- [#2033](https://github.com/poanetwork/blockscout/pull/2033) - Header nav. dropdown active element color issue
 - [#2019](https://github.com/poanetwork/blockscout/pull/2019) - Fixed the missing tx hashes.
 - [#2020](https://github.com/poanetwork/blockscout/pull/2020) - Fixed a bug triggered when a second click to a selected tab caused the other tabs to hide.
 - [#1944](https://github.com/poanetwork/blockscout/pull/1944) - fixed styles for token's dropdown.