Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improvement(orb-ui): #1095 Add Group page style and design #2601

Merged
merged 1 commit into from
Aug 31, 2023
Merged

improvement(orb-ui): #1095 Add Group page style and design #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ui/src/app/@theme/styles/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,3 +265,6 @@
width: 110px;
background-color: #df316f !important;
}
p {
font-family: 'Montserrat' !important;
}
53 changes: 27 additions & 26 deletions ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,8 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
</nb-form-field>
<label class="font-weight-bold">Tags</label>
<ngx-tag-control [(tags)]="selectedTags"></ngx-tag-control>
<hr/>
<div class="d-flex justify-content-end">
<button
(click)="resizeComponents()"
[disabled]="!detailsFG?.valid"
class="next-button"
data-orb-qa-id="button#next"
nbButton
nbStepperNext
shape="round"
type="button"
status="primary">
{{ strings.stepper.next }}
</button>
<button
(click)="goBack()"
data-orb-qa-id="button#cancel"
Expand All @@ -127,6 +116,18 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
type="button">
{{ strings.stepper.cancel }}
</button>
<button
(click)="resizeComponents()"
[disabled]="!detailsFG?.valid"
class="next-button"
data-orb-qa-id="button#next"
nbButton
nbStepperNext
shape="round"
type="button"
status="primary">
{{ strings.stepper.next }}
</button>
</div>
</form>
</nb-step>
Expand Down Expand Up @@ -191,17 +192,13 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
</div>
<div class="d-flex justify-content-end">
<button
(click)="onSubmit()"
class="next-button"
data-orb-qa-id="button#save"
(click)="goBack()"
data-orb-qa-id="button#cancel"
ghost
nbButton
nbStepperNext
nbTooltip="Paste your configuration in the code editor above"
shape="round"
status="primary"
type="button"
[disabled]="!canCreate() || isRequesting">
{{ strings.stepper.save }}
type="button">
{{ strings.stepper.cancel }}
</button>
<button
data-orb-qa-id="button#back"
Expand All @@ -212,13 +209,17 @@ <h4>{{ isEdit ? 'Edit Agent Policy' : 'Create Agent Policy'}}</h4>
{{ strings.stepper.back }}
</button>
<button
(click)="goBack()"
data-orb-qa-id="button#cancel"
ghost
(click)="onSubmit()"
class="next-button"
data-orb-qa-id="button#save"
nbButton
nbStepperNext
nbTooltip="Paste your configuration in the code editor above"
shape="round"
status="primary"
type="button">
{{ strings.stepper.cancel }}
type="button"
[disabled]="!canCreate() || isRequesting">
{{ strings.stepper.save }}
</button>
</div>
</nb-step>
Expand Down
3 changes: 3 additions & 0 deletions ui/src/app/pages/datasets/policies.agent/add/agent.policy.add.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ nb-card-footer {
mat-chip nb-icon {
font-size: 1rem;
}
label {
color: #969FB9;
}

ngx-tag-control, ngx-tag-display {
margin-top: 20px;
Expand Down
86 changes: 43 additions & 43 deletions ui/src/app/pages/fleet/agents/add/agent.add.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,6 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
</nb-form-field>
<hr/>
<div class="d-flex justify-content-end">
<button [disabled]="!firstFormGroup.valid"
class="next-button"
data-orb-qa-id="button#next"
nbButton
nbStepperNext
shape="round"
status="primary"
type="submit">
{{ strings.stepper.next }}
</button>
<button (click)="goBack()"
data-orb-qa-id="button#cancel"
ghost
Expand All @@ -70,6 +60,16 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
type="button">
{{ strings.stepper.cancel }}
</button>
<button [disabled]="!firstFormGroup.valid"
class="next-button"
data-orb-qa-id="button#next"
nbButton
nbStepperNext
shape="round"
status="primary"
type="submit">
{{ strings.stepper.next }}
</button>
</div>
</form>
</nb-step>
Expand All @@ -89,23 +89,6 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
<hr>
</div>
<div class="d-flex justify-content-end">
<button class="next-button"
data-orb-qa-id="button#next"
nbButton
nbStepperNext
shape="round"
status="primary"
type="submit">
{{ strings.stepper.next }}
</button>
<button data-orb-qa-id="button#back"
ghost
nbButton
nbStepperPrevious
shape="round"
status="primary">
{{ strings.stepper.back }}
</button>
<button (click)="goBack()"
data-orb-qa-id="button#cancel"
ghost
Expand All @@ -115,6 +98,23 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
type="button">
{{ strings.stepper.cancel }}
</button>
<button data-orb-qa-id="button#back"
ghost
nbButton
nbStepperPrevious
shape="round"
status="primary">
{{ strings.stepper.back }}
</button>
<button class="next-button"
data-orb-qa-id="button#next"
nbButton
nbStepperNext
shape="round"
status="primary"
type="submit">
{{ strings.stepper.next }}
</button>
</div>
</nb-step>
<nb-step [label]="thirdStepLabel"
Expand All @@ -141,16 +141,14 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
</div>
<hr/>
<div class="d-flex justify-content-end">
<button (click)="onFormSubmit()"
autofocus
class="next-button"
data-orb-qa-id="button#save"
<button (click)="goBack()"
data-orb-qa-id="button#cancel"
ghost
nbButton
shape="round"
status="primary"
type="submit"
[disabled]="isRequesting">
{{ strings.stepper.save }}
type="button">
{{ strings.stepper.cancel }}
</button>
<button data-orb-qa-id="button#back"
ghost
Expand All @@ -160,15 +158,17 @@ <h4>{{isEdit ? 'Edit Agent' : 'New Agent'}}</h4>
status="primary">
{{ strings.stepper.back }}
</button>
<button (click)="goBack()"
data-orb-qa-id="button#cancel"
ghost
nbButton
shape="round"
status="primary"
type="button">
{{ strings.stepper.cancel }}
</button>
<button (click)="onFormSubmit()"
autofocus
class="next-button"
data-orb-qa-id="button#save"
nbButton
shape="round"
status="primary"
type="submit"
[disabled]="isRequesting">
{{ strings.stepper.save }}
</button>
</div>
</nb-step>
</nb-stepper>
Expand Down
4 changes: 4 additions & 0 deletions ui/src/app/pages/fleet/agents/add/agent.add.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ nb-card-footer {
}
}

label {
color: #969FB9;
}

.required {
color: #df316f;
padding-left: 2px;
Expand Down
Loading