diff --git a/static/ng/resources/css/header.css b/static/ng/resources/css/header.css index c669545cf..4d8f86da1 100644 --- a/static/ng/resources/css/header.css +++ b/static/ng/resources/css/header.css @@ -21,11 +21,7 @@ nav .container-custom { } .navbar-brand > img { - height: 60px; - width: 100px; margin-top: -30px; - filter: brightness(0) invert(1); - -webkit-filter: brightness(0) invert(1); } .navbar-form { @@ -40,21 +36,21 @@ nav .container-custom { } .nav-custom li { - float: left; - padding: 10px 0 0 0; - margin-right: 12px; - list-style: none; - display: inline-block; + float: left; + padding: 10px 0 0 0; + margin-right: 12px; + list-style: none; + display: inline-block; } .nav-custom li a { - font-size: 14px; - color: #FFFFFF; - text-decoration: none; + font-size: 14px; + color: #FFFFFF; + text-decoration: none; } .nav-custom .active { - border-bottom: 3px solid #EFEFEF; + border-bottom: 3px solid #EFEFEF; } .dropdown { diff --git a/static/ng/resources/img/Harbor_Logo_rec.png b/static/ng/resources/img/Harbor_Logo_rec.png old mode 100755 new mode 100644 index cccdbedf1..3a603109e Binary files a/static/ng/resources/img/Harbor_Logo_rec.png and b/static/ng/resources/img/Harbor_Logo_rec.png differ diff --git a/static/ng/resources/js/components/details/retrieve-projects.directive.html b/static/ng/resources/js/components/details/retrieve-projects.directive.html index 573d78b4e..8e1e90491 100644 --- a/static/ng/resources/js/components/details/retrieve-projects.directive.html +++ b/static/ng/resources/js/components/details/retrieve-projects.directive.html @@ -1,10 +1,10 @@ -
+
- +
diff --git a/static/ng/resources/js/components/details/retrieve-projects.directive.js b/static/ng/resources/js/components/details/retrieve-projects.directive.js index 3a0c6ba2a..5c9779a3d 100644 --- a/static/ng/resources/js/components/details/retrieve-projects.directive.js +++ b/static/ng/resources/js/components/details/retrieve-projects.directive.js @@ -12,6 +12,7 @@ var vm = this; vm.projectName = ''; + vm.isOpen = false; if($route.current.params.is_public) { vm.isPublic = $route.current.params.is_public === 'true' ? 1 : 0; @@ -114,6 +115,7 @@ 'publicity': '=', 'isProjectMember': '=' }, + link: link, replace: true, controller: RetrieveProjectsController, bindToController: true, @@ -122,6 +124,22 @@ return directive; + function link(scope, element, attrs, ctrl) { + $(document).on('click', clickHandler); + + function clickHandler(e) { + var targetId = $(e.target).attr('id'); + if(targetId === 'switchPane' || + targetId === 'retrievePane' || + targetId === 'retrieveFilter') { + return; + }else{ + ctrl.isOpen = false; + scope.$apply(); + } + } + } + } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/details/switch-pane-projects.directive.html b/static/ng/resources/js/components/details/switch-pane-projects.directive.html index 5158a1088..996b666de 100644 --- a/static/ng/resources/js/components/details/switch-pane-projects.directive.html +++ b/static/ng/resources/js/components/details/switch-pane-projects.directive.html @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/static/ng/resources/js/components/details/switch-pane-projects.directive.js b/static/ng/resources/js/components/details/switch-pane-projects.directive.js index da6725a6f..1a10dd70e 100644 --- a/static/ng/resources/js/components/details/switch-pane-projects.directive.js +++ b/static/ng/resources/js/components/details/switch-pane-projects.directive.js @@ -10,11 +10,7 @@ function SwitchPaneProjectsController($scope) { var vm = this; - - $scope.$on('isOpen', function(e, val){ - vm.isOpen = val; - }); - + $scope.$watch('vm.selectedProject', function(current, origin) { if(current){ vm.projectName = current.Name; @@ -40,21 +36,16 @@ templateUrl: '/static/ng/resources/js/components/details/switch-pane-projects.directive.html', replace: true, scope: { - 'selectedProject': '=', - 'isOpen': '=' + 'isOpen': '=', + 'selectedProject': '=' }, - link: link, controller: SwitchPaneProjectsController, controllerAs: 'vm', bindToController: true } return directive; - - function link(scope, element, attrs, ctrl) { - - } - + } })(); \ No newline at end of file diff --git a/static/ng/resources/js/layout/navigation/navigation-details.directive.js b/static/ng/resources/js/layout/navigation/navigation-details.directive.js index 0372f516f..8c34b40a6 100644 --- a/static/ng/resources/js/layout/navigation/navigation-details.directive.js +++ b/static/ng/resources/js/layout/navigation/navigation-details.directive.js @@ -18,14 +18,6 @@ }); vm.url = $location.url(); - vm.clickTab = clickTab; - - function clickTab() { - console.log("triggered clickTab of Controller."); - vm.isOpen = false; - $scope.$apply(); - } - } function navigationDetails() { @@ -34,7 +26,6 @@ templateUrl: '/static/ng/resources/js/layout/navigation/navigation-details.directive.html', link: link, scope: { - 'isOpen': '=', 'selectedProject': '=' }, replace: true, @@ -66,7 +57,6 @@ function click(event) { element.find('a').removeClass('active'); $(event.target).addClass('active'); - ctrl.clickTab(); } } diff --git a/views/ng/repository.htm b/views/ng/repository.htm index 0531c4e42..2ed17f5f3 100644 --- a/views/ng/repository.htm +++ b/views/ng/repository.htm @@ -10,12 +10,12 @@ // 'public_projects' | tr // // 'public_projects' | tr //
- + - +
- +