Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 04:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Steven Zou 2017-07-31 14:36:36 +08:00
commit 78b7cbd73c
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui_ng/src/app/project/project.component.ts
View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; import {Component, OnInit, ViewChild, OnDestroy, ChangeDetectorRef, ChangeDetectionStrategy} from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@ -43,7 +43,8 @@ import { StatisticHandler } from '../shared/statictics/statistic-handler.service
@Component({ @Component({
selector: 'project', selector: 'project',
templateUrl: 'project.component.html', templateUrl: 'project.component.html',
styleUrls: ['./project.component.css'] styleUrls: ['./project.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush
}) })
export class ProjectComponent implements OnInit, OnDestroy { export class ProjectComponent implements OnInit, OnDestroy {
@ -68,7 +69,8 @@ export class ProjectComponent implements OnInit, OnDestroy {
private appConfigService: AppConfigService, private appConfigService: AppConfigService,
private sessionService: SessionService, private sessionService: SessionService,
private deletionDialogService: ConfirmationDialogService, private deletionDialogService: ConfirmationDialogService,
private statisticHandler: StatisticHandler) { private statisticHandler: StatisticHandler,
private ref: ChangeDetectorRef) {
this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => { this.subscription = deletionDialogService.confirmationConfirm$.subscribe(message => {
if (message && if (message &&
message.state === ConfirmationState.CONFIRMED && message.state === ConfirmationState.CONFIRMED &&
@ -136,6 +138,8 @@ export class ProjectComponent implements OnInit, OnDestroy {
this.messageHandlerService.handleError(error); this.messageHandlerService.handleError(error);
} }
); );
let hnd = setInterval(()=>this.ref.markForCheck(), 100);
setTimeout(()=>clearInterval(hnd), 2000);
} }
openModal(): void { openModal(): void {

11
src/ui_ng/src/styles.css
View File

@ -29,3 +29,14 @@
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
} }
.tooltip-content{white-space: normal;word-wrap: break-word;}
.alert.alert-warning{
padding:10px 12px;
}
.alert-warning .alert-actions button{
margin: -2px 0 0px 0;
}
.modal-header{
padding: 0;
}