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

Jump to bottom

Fixed label css inconsistency on wizards and service/task/notification details page #90

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Fixed label css inconsistency on wizards and service/task/notification details page #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
831674c
fixed inconsistency with label css on wizard and detail pages
MonikaSharma06 May 21, 2021
ea9243f
Merge branch 'develop' into inconsistency-fix
MonikaSharma06 May 21, 2021
374e8f0
Merge branch 'develop' into inconsistency-fix
MonikaSharma06 May 21, 2021
c975588
feedback changes
MonikaSharma06 May 24, 2021
69ea4f9
fixed name label
MonikaSharma06 May 25, 2021
8e9e4f2
replaced 'No Record found' text with other suitable text
MonikaSharma06 May 25, 2021
4112780
minor changes
MonikaSharma06 May 25, 2021
185da61
Merge branch 'develop' into inconsistency-fix
MonikaSharma06 May 26, 2021
f4eacb3
changed ping interval label in settings page
MonikaSharma06 May 26, 2021
5477062
added is-light class for enabled tag
MonikaSharma06 May 27, 2021
71b214e
resolved conflicts
MonikaSharma06 Sep 24, 2021
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
6 changes: 3 additions & 3 deletions e2e/specs/app.e2e-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ describe('Fledge gui', () => {
skipLogin.navToBackupRestore();

expect(skipLogin.getBackupRestoreTitle()).toContain('Backups');
expect(skipLogin.noBackupRecord()).toContain('No Record');

expect(skipLogin.noBackupRecord()).toContain('No Backup found');
expect(skipLogin.getRequestBackup()).toContain('Create New');

skipLogin.clickRequestBackup();
Expand All @@ -107,7 +107,7 @@ describe('Fledge gui', () => {
}
expect(skipLogin.getCreatedBackupRow()).toContain('COMPLETED');
skipLogin.deleteBackup();
expect(skipLogin.noBackupRecord()).toContain('No Record');
expect(skipLogin.noBackupRecord()).toContain('No Backup found');
});

it('Should Display Support Bundles', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/core/asset-readings/assets/assets.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
<ng-container *ngIf="!showSpinner">
<div class="has-text-centered" *ngIf="assets != undefined && assets.length === 0">
<small class="no-rec">No Record</small>
<small class="no-rec">No Assets found</small>
</div>
<ng-container *ngIf="assets!= undefined && assets.length > 0">
<table class="table is-striped is-narrow scroll is-responsive is-hoverable">
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/core/backup-restore/backup-restore.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</div>
<ng-container *ngIf="!showSpinner">
<div class="has-text-centered" *ngIf="backupData != undefined && backupData.length === 0">
<small class="no-rec">No Record</small>
<small class="no-rec">No Backup found</small>
</div>
<ng-container *ngIf="backupData != undefined && backupData.length > 0">
<table class="table is-hoverable is-narrow scroll is-responsive" cellpadding="0" cellspacing="0">
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/core/configuration-manager/config-children/config-children.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="config-div" *ngIf="!configItem.readonly">
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label tooltip is-tooltip-right is-tooltip-multiline" [attr.data-tooltip]="configItem.description">
<label class="label tooltip is-tooltip-right is-tooltip-multiline config-label" [attr.data-tooltip]="configItem.description">
{{setDisplayName(configItem)}}
</label>
</div>
Expand Down
5 changes: 0 additions & 5 deletions ...app/components/core/configuration-manager/view-config-item/view-config-item.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,3 @@
cursor: pointer !important;
}

/* causing inconsistency on wizards and service/task details page (Advanced config + enabled) */
/* commenting until we fix all such label as font-s .9rem pad top 3px and font-w 500 */
/* .config-label {
font-weight: 500;
} */
8 changes: 4 additions & 4 deletions src/app/components/core/filter/add-filter-wizard/add-filter-wizard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<div class="column">
<label class="label">Plugin</label>
<label class="label config-label">Plugin</label>
</div>
</div>
<div class="field-body">
Expand All @@ -44,7 +44,7 @@
<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<div class="column">
<label class="label">Name</label>
<label class="label config-label">Name</label>
</div>
</div>
<div class="field-body">
Expand All @@ -65,7 +65,7 @@
<ng-container *ngIf="plugins.length > 0">
<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Plugin</label>
<label class="label config-label">Plugin</label>
</div>
<div class="field-body">
<div class="column is-vertical-center">
Expand Down Expand Up @@ -120,7 +120,7 @@

<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Name</label>
<label class="label config-label">Name</label>
</div>
<div class="field-body">
<div class="field">
Expand Down
14 changes: 7 additions & 7 deletions src/app/components/core/north/add-task-wizard/add-task-wizard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</ng-container>
<div *ngIf="plugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">North Plugin</label>
<label class="label config-label">North Plugin</label>
</div>
<div class="field-body">
<div class="select is-multiple">
Expand All @@ -61,7 +61,7 @@
</div>
<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label"></label>
<label class="label config-label"></label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -77,7 +77,7 @@
</div>
<div *ngIf="plugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Name</label>
<label class="label config-label">Name</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -92,8 +92,8 @@
</div>
</div>
<div *ngIf="plugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Add as a Service</label>
<div class="field-label is-normal config-label">
<label class="label config-label">Add as a Service</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -105,7 +105,7 @@
</div>
<div *ngIf="plugins.length > 0 && isService === false" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Repeat Interval
<label class="label config-label">Repeat Interval
<span class="tooltip is-tooltip-right" data-tooltip="Repeat every n (0-365) days/HH:mm:ss hours">
<i class="far fa-xs fa-question-circle"></i>
</span>
Expand Down Expand Up @@ -147,7 +147,7 @@
<div class="box step-content" id="c-3">
<div class="field is-horizontal">
<div class="field-label">
<label class="label">Enabled</label>
<label class="label config-label">Enabled</label>
</div>
<div class="field-body">
<div class="field">
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/core/north/north-task-modal/north-task-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="column">
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Enabled</label>
<label class="label config-label">Enabled</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -43,7 +43,7 @@
<ng-container *ngIf="task?.processName !== 'north_C'">
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Exclusive</label>
<label class="label config-label">Exclusive</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -54,7 +54,7 @@
</div>
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Interval</label>
<label class="label config-label">Interval</label>
</div>
<div class="field-body">
<div class="field">
Expand Down Expand Up @@ -149,7 +149,7 @@
<!-- Note: task here is old variable name retained; if processName is north_C task represents a Northbound service -->
<div *ngIf="task?.processName === 'north_C' && task?.enabled" class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Service Info</label>
<label class="label config-label">Service Info</label>
</div>
<div class="field-body">
<div class="field">
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/core/north/north.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<ng-container *ngIf="!showSpinner">
<div class="has-text-centered" *ngIf="tasks != undefined && tasks.length === 0">
<small class="no-rec">No Record</small>
<small class="no-rec">No Northbound services/tasks configured</small>
</div>
<ng-container *ngIf="tasks!= undefined && tasks.length > 0">
<table class="table is-fullwidth scroll is-responsive is-hoverable">
Expand All @@ -42,7 +42,7 @@
<span *ngIf="t?.processName === 'north_C'" class="tag is-light is-rounded">Service</span>
</td>
<td>
<span *ngIf="t.enabled == true" class="tag is-success">enabled</span>
<span *ngIf="t.enabled == true" class="tag is-success is-light">enabled</span>
<span *ngIf="t.enabled == false" class="tag">disabled</span>
</td>
<td>
Expand Down
14 changes: 7 additions & 7 deletions ...ponents/core/notifications/add-notification-wizard/add-notification-wizard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="box step-content is-active" id="c-1">
<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Name</label>
<label class="label config-label">Name</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -54,7 +54,7 @@
</div>
<div class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Description</label>
<label class="label config-label">Description</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -75,7 +75,7 @@
</div>
<div *ngIf="notificationRulePlugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Rule Plugin</label>
<label class="label config-label">Rule Plugin</label>
</div>
<div class="field-body">
<div class="column is-vertical-center">
Expand Down Expand Up @@ -134,7 +134,7 @@
</div>
<div *ngIf="notificationDeliveryPlugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Delivery Plugin</label>
<label class="label config-label">Delivery Plugin</label>
</div>
<div class="field-body">
<div class="column is-vertical-center">
Expand Down Expand Up @@ -187,7 +187,7 @@
<div class="box step-content" id="c-6">
<div class="field is-horizontal">
<div class="field-label">
<label class="label has-text-left tooltip is-tooltip-right is-tooltip-multiline"
<label class="label config-label has-text-left tooltip is-tooltip-right is-tooltip-multiline"
data-tooltip="Type of notification">Type</label>
</div>
<div class="field-body">
Expand All @@ -214,7 +214,7 @@
</div>
<div class="field is-horizontal">
<div class="field-label">
<label class="label has-text-left tooltip is-tooltip-right is-tooltip-multiline"
<label class="label config-label has-text-left tooltip is-tooltip-right is-tooltip-multiline"
data-tooltip="Retrigger time in seconds for sending a new notification.">Retrigger Time</label>
</div>
<div class="field-body">
Expand All @@ -231,7 +231,7 @@
</div>
<div class="field is-horizontal">
<div class="field-label">
<label class="label has-text-left tooltip is-tooltip-right is-tooltip-multiline"
<label class="label config-label has-text-left tooltip is-tooltip-right is-tooltip-multiline"
data-tooltip="Enabled">Enabled</label>
</div>
<div class="field-body">
Expand Down
4 changes: 2 additions & 2 deletions ...s/core/notifications/notification-service-modal/notification-service-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="column">
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Name</label>
<label class="label config-label">Name</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -36,7 +36,7 @@
<div class="column">
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Enabled</label>
<label class="label config-label">Enabled</label>
MonikaSharma06 marked this conversation as resolved.
Show resolved Hide resolved
</div>
<div class="field-body">
<div class="field">
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/core/notifications/notifications.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<ng-container *ngIf="!showSpinner">
<div class="has-text-centered"
*ngIf="notificationInstances != undefined && notificationInstances.length === 0">
<small class="no-rec">No Record</small>
<small class="no-rec">No Notification instances found</small>
</div>
<ng-container *ngIf="notificationInstances!= undefined && notificationInstances.length > 0">
<table id="south-service-list" class="table is-fullwidth scroll is-responsive is-hoverable" cellpadding="0"
Expand Down Expand Up @@ -101,7 +101,7 @@
<td class="align-content">
<div class="tags has-addons">
<span *ngIf="instance.enable === 'false'" class="tag">disabled</span>
<span *ngIf="instance.enable === 'true'" class="tag is-success"
<span *ngIf="instance.enable === 'true'" class="tag is-success is-light"
[ngClass]="{'disable-tag': this.isNotificationServiceAvailable && !this.isNotificationServiceEnabled}">enabled</span>
</div>
</td>
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/core/south/add-service-wizard/add-service-wizard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</ng-container>
<div *ngIf="plugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">South Plugin</label>
<label class="label config-label">South Plugin</label>
</div>
<div class="field-body">
<div class="select is-multiple">
Expand All @@ -61,7 +61,7 @@
</div>
<div class="field is-horizontal form-group is-right">
<div class="field-label is-normal">
<label class="label"></label>
<label class="label config-label"></label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -78,7 +78,7 @@
</div>
<div *ngIf="plugins.length > 0" class="field is-horizontal form-group">
<div class="field-label is-normal">
<label class="label">Name</label>
<label class="label config-label">Name</label>
</div>
<div class="field-body">
<div class="field">
Expand All @@ -100,7 +100,7 @@
<div class="box step-content" id="c-3">
<div class="field is-horizontal">
<div class="field-label">
<label class="label">Enabled</label>
<label class="label config-label">Enabled</label>
</div>
<div class="field-body">
<div class="field">
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/core/south/south-service-modal/south-service-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="column">
<div class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Enabled</label>
<label class="label config-label">Enabled</label>
</div>
<div class="field-body">
<div class="field">
Expand Down Expand Up @@ -107,7 +107,7 @@
<ng-container *ngIf="service != undefined">
<div *ngIf="service.schedule_enabled" class="field is-horizontal">
<div class="field-label has-text-left">
<label class="label">Service Info</label>
<label class="label config-label">Service Info</label>
</div>
<div class="field-body">
<div class="field">
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/core/south/south.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<ng-container *ngIf="!showSpinner">
<div class="has-text-centered" *ngIf="southboundServices != undefined && southboundServices.length === 0">
<small class="no-rec">No Record</small>
<small class="no-rec">No Southbound services configured</small>
</div>
<ng-container *ngIf="southboundServices!= undefined && southboundServices.length > 0">
<table id="south-service-list" class="table is-fullwidth scroll is-responsive is-hoverable" cellpadding="0"
Expand Down Expand Up @@ -51,7 +51,7 @@
<span class="tag">disabled</span> <!-- This also take care of shutdown status-->
</ng-container>
<ng-container *ngIf="svc.schedule_enabled">
<span *ngIf="svc.status == 'running'" class="tag is-success">enabled</span>
<span *ngIf="svc.status == 'running'" class="tag is-success is-light">enabled</span>
<span *ngIf="svc.status == 'failed'" class="tag is-danger">{{svc.status}}</span>
<span *ngIf="svc.status == 'unresponsive'" class="tag is-warning">{{svc.status}}</span>
</ng-container>
Expand Down
6 changes: 6 additions & 0 deletions src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,3 +308,9 @@ a.dropdown-item:hover {
.icon:hover {
opacity: 0.8;
}

.config-label {
font-weight: 500 !important;
font-size: 0.9rem !important;
padding-top: 2px !important;
Comment on lines +314 to +315
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On wizard and cog icon modal while adding (not edit) we better don't apply font size and padding top.

}