diff --git a/static/css/directives/ui/header-bar.css b/static/css/directives/ui/header-bar.css index db917844e..b1d4ca49c 100644 --- a/static/css/directives/ui/header-bar.css +++ b/static/css/directives/ui/header-bar.css @@ -57,25 +57,6 @@ nav.navbar-default .navbar-nav>li>a.active { background: white; } -.header-bar-element.dark .header-bar-content { - background-color: rgba(11, 57, 90, 0.9); - box-shadow: none !important; - color: white; -} - -.header-bar-element.dark .navbar-nav>li>a { - color: white; -} - -.header-bar-element.dark .navbar-nav>li>a:hover, -.header-bar-element.dark .navbar-default .navbar-nav>li>a:focus, -.header-bar-element.dark .navbar-nav>li>a.active, -.header-bar-element.dark .navbar-nav>li>a:focus { - background-color: rgba(0,0,0,.25); - text-shadow:1px 1px 12px rgba(0,0,0,0.60); /* Increase opacity and spread */ - color: white !important; -} - .header-bar-element .search-box { position: absolute; left: 0px; @@ -237,14 +218,6 @@ nav.navbar-default .navbar-nav>li>a.active { margin-right: 20px; } -.header-bar-element.dark .user-tools .user-tool { - color: white; -} - -.header-bar-element.dark .user-tools .caret { - color: white; -} - .user-tools.with-menu { margin-right: 6px; } @@ -266,11 +239,6 @@ nav.navbar-default .navbar-nav>li>a.active { color: #333; } -.header-bar-element.dark .user-tools i.user-tool:hover { - cursor: pointer; - color: #78CDF1; -} - .user-tools .new-menu { background: transparent !important; } diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html index 6fc062ce8..78c946883 100644 --- a/static/directives/header-bar.html +++ b/static/directives/header-bar.html @@ -1,5 +1,5 @@ -
+
diff --git a/static/directives/user-setup.html b/static/directives/user-setup.html index 5dd6276ae..5df52ab86 100644 --- a/static/directives/user-setup.html +++ b/static/directives/user-setup.html @@ -1,7 +1,7 @@
- +
diff --git a/static/js/directives/ui/header-bar.js b/static/js/directives/ui/header-bar.js index f4d1ee5c0..f41e6f313 100644 --- a/static/js/directives/ui/header-bar.js +++ b/static/js/directives/ui/header-bar.js @@ -148,7 +148,7 @@ angular.module('quay').directive('headerBar', function () { }; $scope.getEnterpriseLogo = function() { - return Config.getEnterpriseLogo(false); + return Config.getEnterpriseLogo(); }; $scope.toggleSearch = function() { diff --git a/static/js/services/features-config.js b/static/js/services/features-config.js index 11a97db8c..c3cb99817 100644 --- a/static/js/services/features-config.js +++ b/static/js/services/features-config.js @@ -71,14 +71,10 @@ angular.module('quay').factory('Config', ['Features', function(Features) { return value; }; - config.getEnterpriseLogo = function(forWhiteBackground) { + config.getEnterpriseLogo = function() { if (!config.ENTERPRISE_LOGO_URL) { if (Features.BILLING) { - if (forWhiteBackground) { - return '/static/img/quay-horizontal-color.svg'; - } else { - return '/static/img/quay-horizontal-whiteblue-nobackground.svg'; - } + return '/static/img/quay-horizontal-color.svg'; } else { return '/static/img/QuayEnterprise_horizontal_color.svg'; } diff --git a/templates/base.html b/templates/base.html index 8db50f14d..d4b43a382 100644 --- a/templates/base.html +++ b/templates/base.html @@ -131,113 +131,6 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug