Skip to content
This repository has been archived by the owner on Mar 25, 2023. It is now read-only.

fix(sidebar): resize bugs #1448

Merged
merged 2 commits into from
Nov 30, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ <h4 class="details-header">{{ entity.name }}</h4>
</button>
</div>

<nav mat-tab-nav-bar *ngIf="!isPredefinedTemplate">
<nav
#tabs
[csSidebarTabNav]="tabs"
mat-tab-nav-bar
*ngIf="!isPredefinedTemplate"
>
<a
matTabLink
[routerLink]="['./sg']"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
}

:host /deep/ .mat-expansion-panel-content {
color: rgba(0, 0, 0, 0.54)
color: rgba(0, 0, 0, 0.54);
}

:host /deep/ .mat-tab-link {
min-width: 140px !important;
min-width: 0 !important;
flex: 1 1 auto;
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,6 @@
margin: 0 5px;
}

.sidebar /deep/ .grid {
.row {
display: flex;
flex-flow: row wrap;

& > div {
width: 50%;
padding: 2px;
}
}
}

.sidebar /deep/ button {
transition: transform 0.3s;
}
Expand All @@ -50,7 +38,6 @@
}

.sidebar /deep/ mat-card-content {
width: 100%;
line-height: 18px;

& .mat-card-content-container {
Expand All @@ -59,10 +46,6 @@
}
}

.details-header {
width: 340px;
}

.sidebar /deep/ .collapsed-panel .row,
.sidebar /deep/ .expanded-panel .row {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div *ngIf="entity">
<div class="title-container">
<cs-template-os-icon-container
[template]="entity"
></cs-template-os-icon-container>
<h4 class="details-header">{{ entity.name }}</h4>
<div class="title-container">
<cs-template-os-icon-container
[template]="entity"
></cs-template-os-icon-container>
<h4 class="details-header">{{ entity.name }}</h4>
</div>
<cs-template-actions-sidebar-container
*ngIf="isSelf"
[template]="entity"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ mat-icon {

.title-container {
display: flex;
justify-content: start;
width: 90%;
justify-content: space-between;
align-items: center;
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
<div>{{ 'VM_PAGE.STORAGE_DETAILS.VOLUME_DETAILS.STORAGE_TYPE' | translate }}</div>
<div>{{ storageTypeTranslationToken | translate }}</div>
</div>
<div class="row"
*ngIf="diskOffering?.name"
[matTooltip]="diskOffering?.displaytext"
matTooltipPosition="above"
<div
class="row"
*ngIf="diskOffering?.name"
>
<div>{{ 'VM_PAGE.STORAGE_DETAILS.VOLUME_DETAILS.DISK_OFFERING' | translate }}</div>
<div>{{ diskOffering.name }}</div>
<div [matTooltip]="diskOffering?.displaytext">{{ diskOffering.name }}</div>
tamazlykar marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
.ellipsis-overflow {
user-select: text !important;
display: inline-block;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
5 changes: 3 additions & 2 deletions src/style/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,10 @@ mat-card.custom-card {
.row {
display: flex;
flex-flow: row wrap;
justify-content: space-between;

& > div {
width: 50%;
max-width: 50%;
padding: 2px 2px 2px 0 !important;
}

Expand Down Expand Up @@ -342,10 +343,10 @@ mat-card-actions {
display: flex;
justify-content: space-between;
align-items: center;
overflow: hidden;
}

.details-header {
width: 340px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
Expand Down