Merge branch 'master' into ab-make-pages-async

CHANGELOG.md

@@ -20,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.
@@ -49,6 +49,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
 

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;

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"