diff --git a/static/css/quay.css b/static/css/quay.css index d15ca1cb4..4df625503 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -38,7 +38,12 @@ } #quay-logo { + height: 36px; width: 100px; + background-repeat: no-repeat; + background-size: contain; + background-position: center; + display: inline-block; } #padding-container { @@ -2864,10 +2869,8 @@ p.editable:hover i { .navbar-brand { padding: 6px; -} - -.navbar-brand img { - height: 36px; + line-height: 1px; + font-size: 1px; } .user-dropdown > img { diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html index 3b21e8d04..903de59bd 100644 --- a/static/directives/header-bar.html +++ b/static/directives/header-bar.html @@ -4,7 +4,7 @@ ≡ - + diff --git a/static/js/app.js b/static/js/app.js index 5bb37a338..11a1cc711 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -4072,7 +4072,7 @@ quayApp.directive('headerBar', function () { restrict: 'C', scope: { }, - controller: function($scope, $element, $location, UserService, PlanService, ApiService, NotificationService) { + controller: function($scope, $element, $location, UserService, PlanService, ApiService, NotificationService, Config) { $scope.notificationService = NotificationService; // Monitor any user changes and place the current user into the scope. @@ -4091,6 +4091,14 @@ quayApp.directive('headerBar', function () { } return ""; }; + + $scope.getEnterpriseLogo = function() { + if (!Config.ENTERPRISE_LOGO_URL) { + return '/static/img/quay-logo.png'; + } + + return Config.ENTERPRISE_LOGO_URL; + }; } }; return directiveDefinitionObject;