From 16d2d8c4f0807e54ba3106e1927f560c711b3b84 Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Tue, 7 Jan 2020 15:38:00 -0800
Subject: [PATCH] Cleanup CSS ordering, fix coloring for navdropdowns

---
 app/assets/stylesheets/application.css  | 13 +++++++------
 app/assets/stylesheets/osem-navbar.scss | 11 +++++++++--
 app/assets/stylesheets/strap-on.scss    |  4 ++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 567fa050..0b80bc19 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -2,6 +2,13 @@
  *= require strap-on
  *= require formtastic-bootstrap
  *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+ *= require selectize
+ *= require selectize.bootstrap3
+ *= require bootstrap-select
+ *= require bootstrap-markdown
+ *= require bootstrap-datetimepicker
+ *= require leaflet
+
  *= require osem
  *= require osem-rating
  *= require osem-schedule
@@ -10,15 +17,9 @@
  *= require osem-splash
  *= require font-awesome
  *= require osem-fonts
- *= require bootstrap-markdown
- *= require bootstrap-datetimepicker
- *= require leaflet
  *= require bootstrap3-switch
  *= require osem-payments
  *= require osem-navbar
- *= require selectize
- *= require selectize.bootstrap3
  *= require mastodon
- *= require bootstrap-select
  *= require conferences
 */
diff --git a/app/assets/stylesheets/osem-navbar.scss b/app/assets/stylesheets/osem-navbar.scss
index 1bdeb223..2f6458be 100644
--- a/app/assets/stylesheets/osem-navbar.scss
+++ b/app/assets/stylesheets/osem-navbar.scss
@@ -1,4 +1,6 @@
 @import "breakpoints.scss";
+$navbar-default-link-color: #FFF;
+
 .nav-osem {
     border: none;
     @include breakpoint(xs) {
@@ -31,8 +33,13 @@
     .dropdown-menu {
         min-width: 225px;
     }
-    .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
-        color: #FFF;
+
+    &.navbar-default {
+        .navbar-nav > .open > a {
+            &:hover, &:focus {
+                color: $navbar-default-link-color;
+            }
+        }
     }
 
     .navbar-brand img {
diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss
index da70029d..0a9c3908 100644
--- a/app/assets/stylesheets/strap-on.scss
+++ b/app/assets/stylesheets/strap-on.scss
@@ -1,8 +1,8 @@
 $navbar-default-bg: #0C3559;
 $navbar-default-link-active-bg: rgb(8,8,8);
 $navbar-default-border: 1px solid #d4d4d4;
-$navbar-default-color: #ffffff;
-$navbar-default-link-color: #ffffff;
+$navbar-default-color: #FFF;
+$navbar-default-link-color: #FFF;
 $navbar-default-link-hover-color: #F2E205;
 
 @import 'bootstrap-datetimepicker';