Skip to content

Commit

Permalink
Added fixed height and tab button focus changes.
Browse files Browse the repository at this point in the history
Signed-off-by: Himanshi Chhabra <himanshi.chhabra@msystechnologies.com>
  • Loading branch information
himanshi-chhabra committed Mar 19, 2021
1 parent 39e6bd6 commit b7eebcb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ chef-modal {
font-weight: 400;
padding-bottom: 0px;
}

chef-button {
::ng-deep button:focus {
outline: none;
border: 1px solid $chef-primary-bright;
border-radius: 4px;
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ export class CreateEnvironmentModalComponent implements OnInit, OnDestroy {
server_id: this.serverId,
org_id: this.orgId
};
console.log(this.currentPage);
this.loadCookbookConstraint();

this.store.select(saveStatus)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
</app-create-environment-modal>
<ng-container *ngIf="!environmentsListLoading && !authFailure">
<div class="search-items">
<app-infra-search-bar (searchButtonClick)="searchEnvironment($event)" placeHolder="environments"></app-infra-search-bar>
<span *ngIf="chefInfraViewsFeatureFlagOn">
<chef-toolbar>
<chef-button id="env-create" primary (click)="openCreateModal()">Create Environment</chef-button>
</chef-toolbar>
</span>
<app-infra-search-bar (searchButtonClick)="searchEnvironment($event)" placeHolder="environments"></app-infra-search-bar>
<chef-toolbar>
<chef-button id="env-create" primary (click)="openCreateModal()">Create Environment</chef-button>
</chef-toolbar>
</div>
<chef-loading-spinner class="full-screen-spinner" *ngIf="searching" size="50" fixed></chef-loading-spinner>
<div class="empty-section" *ngIf="!searching && !environments.length && current_page === 1">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { FeatureFlagsService } from 'app/services/feature-flags/feature-flags.service';
import { Component, Input, OnInit, OnDestroy, EventEmitter, Output } from '@angular/core';
import { Store } from '@ngrx/store';
import { combineLatest, Subject } from 'rxjs';
Expand Down Expand Up @@ -27,7 +26,6 @@ export class EnvironmentsComponent implements OnInit, OnDestroy {
public environmentsListLoading = true;
public searching = false;

public chefInfraViewsFeatureFlagOn: boolean;
public current_page = 1;
public environments: Environment[] = [];
public per_page = 9;
Expand All @@ -40,13 +38,9 @@ export class EnvironmentsComponent implements OnInit, OnDestroy {
private isDestroyed = new Subject<boolean>();

constructor(
private featureFlagsService: FeatureFlagsService,
private store: Store<NgrxStateAtom>,
private layoutFacade: LayoutFacadeService
) {
// feature flag enables and disables the create button
this.chefInfraViewsFeatureFlagOn =
this.featureFlagsService.getFeatureStatus('chefInfraTabsViews');
}

ngOnInit() {
Expand Down

0 comments on commit b7eebcb

Please sign in to comment.