From 8246634b87a1abe09be653271e9f7431ea7f1562 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Mon, 8 Jun 2020 15:43:20 +0200 Subject: [PATCH 1/3] Allow reloading show plan --- src/navbar/index.tsx | 7 +++++++ src/navbar/navbar.scss | 36 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/navbar/index.tsx b/src/navbar/index.tsx index 364472d..44cc5ed 100644 --- a/src/navbar/index.tsx +++ b/src/navbar/index.tsx @@ -19,6 +19,7 @@ import "./navbar.scss"; import { closeAlert } from "./state"; import { ConnectionStateEnum } from "../broadcast/streamer"; import { VUMeter } from "../optionsMenu/helpers/VUMeter"; +import { getShowplan } from "../showplanner/state"; function nicifyConnectionState(state: ConnectionStateEnum): string { switch (state) { @@ -183,6 +184,12 @@ export function NavBar() { > Switch Timeslot +
{sessionState.currentTimeslot?.title}
diff --git a/src/navbar/navbar.scss b/src/navbar/navbar.scss index d4e4104..ee5adc3 100644 --- a/src/navbar/navbar.scss +++ b/src/navbar/navbar.scss @@ -117,12 +117,12 @@ $dot-color: #fff; border-top: none; } -.navbar-ury .navbar-nav > li > .dropdown-menu > a { +.navbar-ury .navbar-nav > li > .dropdown-menu .dropdown-item { color: #ffffff; } -.navbar-ury .navbar-nav > li > .dropdown-menu > a:hover, -.navbar-ury .navbar-nav > li > .dropdown-menu > a:focus { +.navbar-ury .navbar-nav > li > .dropdown-menu .dropdown-item:hover, +.navbar-ury .navbar-nav > li > .dropdown-menu .dropdown-item:focus { color: #e1e1e1; background-color: #2d425f; } @@ -131,23 +131,23 @@ $dot-color: #fff; background-color: #2d425f; } -.navbar-ury .navbar-nav .open .dropdown-menu > .active > a, -.navbar-ury .navbar-nav .open .dropdown-menu > .active > a:hover, -.navbar-ury .navbar-nav .open .dropdown-menu > .active > a:focus { +.navbar-ury .navbar-nav .open .dropdown-menu > .active .dropdown-item, +.navbar-ury .navbar-nav .open .dropdown-menu > .active .dropdown-item:hover, +.navbar-ury .navbar-nav .open .dropdown-menu > .active .dropdown-item:focus { color: #e1e1e1; background-color: #2d333c; } -.navbar-ury .navbar-nav > .active > a, -.navbar-ury .navbar-nav > .active > a:hover, -.navbar-ury .navbar-nav > .active > a:focus { +.navbar-ury .navbar-nav > .active .dropdown-item, +.navbar-ury .navbar-nav > .active .dropdown-item:hover, +.navbar-ury .navbar-nav > .active .dropdown-item:focus { color: #e1e1e1; background-color: #2d333c; } -.navbar-ury .navbar-nav > .open > a, -.navbar-ury .navbar-nav > .open > a:hover, -.navbar-ury .navbar-nav > .open > a:focus { +.navbar-ury .navbar-nav > .open .dropdown-item, +.navbar-ury .navbar-nav > .open .dropdown-item:hover, +.navbar-ury .navbar-nav > .open .dropdown-item:focus { color: #e1e1e1; background-color: #2d425f !important; } @@ -184,16 +184,16 @@ $dot-color: #fff; } @media (max-width: 767px) { - .navbar-ury .navbar-nav .open .dropdown-menu > li > a { + .navbar-ury .navbar-nav .open .dropdown-menu > li .dropdown-item { color: #ffffff; } - .navbar-ury .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-ury .navbar-nav .open .dropdown-menu > li > a:focus { + .navbar-ury .navbar-nav .open .dropdown-menu > li .dropdown-item:hover, + .navbar-ury .navbar-nav .open .dropdown-menu > li .dropdown-item:focus { color: #e1e1e1; } - .navbar-ury .navbar-nav .open .dropdown-menu > .active > a, - .navbar-ury .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-ury .navbar-nav .open .dropdown-menu > .active > a:focus { + .navbar-ury .navbar-nav .open .dropdown-menu > .active.dropdown-item, + .navbar-ury .navbar-nav .open .dropdown-menu > .active.dropdown-item:hover, + .navbar-ury .navbar-nav .open .dropdown-menu > .active.dropdown-item:focus { color: #e1e1e1; background-color: #2d425f; } From 62410928f52fbf442fe940458b773461ee1f3fb0 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Mon, 8 Jun 2020 15:45:00 +0200 Subject: [PATCH 2/3] fix mildly busted css --- src/navbar/navbar.scss | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/navbar/navbar.scss b/src/navbar/navbar.scss index ee5adc3..c5a24e4 100644 --- a/src/navbar/navbar.scss +++ b/src/navbar/navbar.scss @@ -117,12 +117,12 @@ $dot-color: #fff; border-top: none; } -.navbar-ury .navbar-nav > li > .dropdown-menu .dropdown-item { +.navbar-ury .navbar-nav > li > .dropdown-menu > .dropdown-item { color: #ffffff; } -.navbar-ury .navbar-nav > li > .dropdown-menu .dropdown-item:hover, -.navbar-ury .navbar-nav > li > .dropdown-menu .dropdown-item:focus { +.navbar-ury .navbar-nav > li > .dropdown-menu > .dropdown-item:hover, +.navbar-ury .navbar-nav > li > .dropdown-menu > .dropdown-item:focus { color: #e1e1e1; background-color: #2d425f; } @@ -131,23 +131,23 @@ $dot-color: #fff; background-color: #2d425f; } -.navbar-ury .navbar-nav .open .dropdown-menu > .active .dropdown-item, -.navbar-ury .navbar-nav .open .dropdown-menu > .active .dropdown-item:hover, -.navbar-ury .navbar-nav .open .dropdown-menu > .active .dropdown-item:focus { +.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item, +.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:hover, +.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:focus { color: #e1e1e1; background-color: #2d333c; } -.navbar-ury .navbar-nav > .active .dropdown-item, -.navbar-ury .navbar-nav > .active .dropdown-item:hover, -.navbar-ury .navbar-nav > .active .dropdown-item:focus { +.navbar-ury .navbar-nav > .active > .dropdown-item, +.navbar-ury .navbar-nav > .active > .dropdown-item:hover, +.navbar-ury .navbar-nav > .active > .dropdown-item:focus { color: #e1e1e1; background-color: #2d333c; } -.navbar-ury .navbar-nav > .open .dropdown-item, -.navbar-ury .navbar-nav > .open .dropdown-item:hover, -.navbar-ury .navbar-nav > .open .dropdown-item:focus { +.navbar-ury .navbar-nav > .open > .dropdown-item, +.navbar-ury .navbar-nav > .open > .dropdown-item:hover, +.navbar-ury .navbar-nav > .open > .dropdown-item:focus { color: #e1e1e1; background-color: #2d425f !important; } @@ -184,16 +184,16 @@ $dot-color: #fff; } @media (max-width: 767px) { - .navbar-ury .navbar-nav .open .dropdown-menu > li .dropdown-item { + .navbar-ury .navbar-nav .open .dropdown-menu > li > .dropdown-item { color: #ffffff; } - .navbar-ury .navbar-nav .open .dropdown-menu > li .dropdown-item:hover, - .navbar-ury .navbar-nav .open .dropdown-menu > li .dropdown-item:focus { + .navbar-ury .navbar-nav .open .dropdown-menu > li > .dropdown-item:hover, + .navbar-ury .navbar-nav .open .dropdown-menu > li > .dropdown-item:focus { color: #e1e1e1; } - .navbar-ury .navbar-nav .open .dropdown-menu > .active.dropdown-item, - .navbar-ury .navbar-nav .open .dropdown-menu > .active.dropdown-item:hover, - .navbar-ury .navbar-nav .open .dropdown-menu > .active.dropdown-item:focus { + .navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item, + .navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:hover, + .navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:focus { color: #e1e1e1; background-color: #2d425f; } From c7629a862ff0a7aa5710965f21508f5d3a13c439 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Mon, 8 Jun 2020 15:48:51 +0200 Subject: [PATCH 3/3] Pretty! --- src/navbar/index.tsx | 5 ++++- src/navbar/navbar.scss | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/navbar/index.tsx b/src/navbar/index.tsx index 44cc5ed..0df75bc 100644 --- a/src/navbar/index.tsx +++ b/src/navbar/index.tsx @@ -186,7 +186,10 @@ export function NavBar() { diff --git a/src/navbar/navbar.scss b/src/navbar/navbar.scss index c5a24e4..fbf47fe 100644 --- a/src/navbar/navbar.scss +++ b/src/navbar/navbar.scss @@ -193,7 +193,12 @@ $dot-color: #fff; } .navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item, .navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:hover, - .navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:focus { + .navbar-ury + .navbar-nav + .open + .dropdown-menu + > .active + > .dropdown-item:focus { color: #e1e1e1; background-color: #2d425f; }