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 words not wrapping when exceeding the max width #3767

Merged
merged 2 commits into from
May 22, 2020
Merged

Fixed words not wrapping when exceeding the max width #3767

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc3fe6
fixed issue for exceeding the max width
vinay033 May 21, 2020
759a243
added review comment changes
vinay033 May 22, 2020
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
8 changes: 4 additions & 4 deletions ...ents/automate-ui/src/app/page-components/services-sidebar/services-sidebar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
<ul>
<li class="service-item" *ngFor="let service of services$ | async; let i = index">
<div class="header">
<div class ="fqdn-line"><chef-icon>storage</chef-icon> {{ service.fqdn || "--"}}</div>
<div class ="supervisor-line"><b>Supervisor:</b> {{ service.supervisor_id || "--"}}</div>
<div class ="site-line"><b>Site:</b> {{ service.site || "--"}}</div>
<div class ="fqdn-line"><chef-icon>storage</chef-icon> <p class="fqdn-data">{{ service.fqdn || "--"}}</p></div>
<div class ="supervisor-line"><b>Supervisor:</b> <p class="supervisor-data">{{ service.supervisor_id || "--"}}</p></div>
Copy link
Contributor

Choose a reason for hiding this comment

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

i know this is not from you, but can you use strong tags here instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I have changed to strong.

<div class ="site-line"><b>Site:</b> <p class="site-data">{{ service.site || "--"}}</p></div>
</div>
<div class="body">
<div class ="release-line"><chef-icon>grain</chef-icon>{{ service.release || "--"}}</div>
<div class ="release-line"><chef-icon>grain</chef-icon><p class="release-data">{{ service.release || "--"}}</p></div>
<div class ="channel-line">
<chef-badge *ngIf="service.update_strategy !== 'NONE'">
{{ service.channel }}: {{ service.update_strategy }}
Expand Down
22 changes: 18 additions & 4 deletions ...ents/automate-ui/src/app/page-components/services-sidebar/services-sidebar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,12 @@ chef-alert {

.fqdn-line {
display: flex;
align-items: center;
margin-bottom: 8px;
font-size: 14px;
}

.supervisor-line {
display: flex;
align-items: center;
margin-bottom: 4px;
font-size: 12px;

Expand All @@ -92,7 +90,6 @@ chef-alert {

.site-line {
display: flex;
align-items: center;
font-size: 12px;

b {
Expand All @@ -102,7 +99,6 @@ chef-alert {

.release-line {
display: flex;
align-items: center;
margin-bottom: 8px;
font-size: 14px;
}
Expand Down Expand Up @@ -312,3 +308,21 @@ chef-alert {
padding-right: 35px;
}

.fqdn-data {
margin-bottom: 0px;
word-break: break-all;
}

.site-data,
.supervisor-data {
margin-bottom: 0px;
font-size: 12px;
padding-top: 2px;
word-break: break-all;
}

.release-data {
margin-bottom: 0px;
font-size: 14px;
word-break: break-all;
}
4 changes: 4 additions & 0 deletions components/automate-ui/src/app/pages/service-groups/service-groups.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,3 +408,7 @@ chef-radial-chart {
width: 14px;
}
}

chef-td {
word-break: break-all;
}