Fixing some assessment styling (#16050)

* Fixing some assessment styling

* Adding styling capabilities to loading component.

* Changing assessment loader height from px to %

* using margin-top instead of height to align loader
This commit is contained in:
Aasim Khan
2021-07-12 12:51:20 -07:00
committed by GitHub
parent 2b8ae507aa
commit 8b383294f7
3 changed files with 41 additions and 52 deletions

View File

@@ -453,9 +453,10 @@ export class SqlDatabaseTree {
const impactedObjectsTitle = this._view.modelBuilder.text().withProps({ const impactedObjectsTitle = this._view.modelBuilder.text().withProps({
value: constants.IMPACTED_OBJECTS, value: constants.IMPACTED_OBJECTS,
CSSStyles: { CSSStyles: {
'font-size': '14px', 'font-size': '13px',
'width': '280px', 'width': '280px',
'margin': '10px 0px 0px 0px' 'margin': '10px 0px 0px 0px',
'font-weight': 'bold'
} }
}).component(); }).component();
@@ -513,35 +514,30 @@ export class SqlDatabaseTree {
CSSStyles: { CSSStyles: {
'font-size': '13px', 'font-size': '13px',
'line-size': '18px', 'line-size': '18px',
'margin': '12px 0px 0px 0px' 'margin': '12px 0px 0px 0px',
'font-weight': 'bold'
} }
}).component(); }).component();
const objectDescriptionStyle = {
'font-size': '12px',
'line-size': '18px',
'margin': '5px 0px 0px 0px',
'text-align': 'justify',
'word-wrap': 'break-word'
};
this._objectDetailsType = this._view.modelBuilder.text().withProps({ this._objectDetailsType = this._view.modelBuilder.text().withProps({
value: constants.TYPES_LABEL, value: constants.TYPES_LABEL,
CSSStyles: { CSSStyles: objectDescriptionStyle
'font-size': '13px',
'line-size': '18px',
'margin': '5px 0px 0px 0px'
}
}).component(); }).component();
this._objectDetailsName = this._view.modelBuilder.text().withProps({ this._objectDetailsName = this._view.modelBuilder.text().withProps({
value: constants.NAMES_LABEL, value: constants.NAMES_LABEL,
CSSStyles: { CSSStyles: objectDescriptionStyle
'font-size': '13px',
'line-size': '18px',
'margin': '5px 0px 0px 0px'
}
}).component(); }).component();
this._objectDetailsSample = this._view.modelBuilder.text().withProps({ this._objectDetailsSample = this._view.modelBuilder.text().withProps({
value: '', value: '',
CSSStyles: { CSSStyles: objectDescriptionStyle
'font-size': '13px',
'line-size': '18px',
'margin': '5px 0px 0px 0px'
}
}).component(); }).component();
const container = this._view.modelBuilder.flexContainer().withItems([impactedObjectsTitle, this._impactedObjectsTable, objectDetailsTitle, this._objectDetailsType, this._objectDetailsName, this._objectDetailsSample]).withLayout({ const container = this._view.modelBuilder.flexContainer().withItems([impactedObjectsTitle, this._impactedObjectsTable, objectDetailsTitle, this._objectDetailsType, this._objectDetailsName, this._objectDetailsSample]).withLayout({
@@ -552,53 +548,42 @@ export class SqlDatabaseTree {
} }
private createDescription(): azdata.FlexContainer { private createDescription(): azdata.FlexContainer {
const labelStyle = {
'font-size': '13px',
'width': '200px',
'font-weight': 'bold',
'margin': '10px 35px 0px 0px'
};
const textStyle = {
'font-size': '12px',
'width': '200px',
'margin': '3px 35px 0px 0px',
'text-align': 'justify',
'word-wrap': 'break-word'
};
const descriptionTitle = this._view.modelBuilder.text().withProps({ const descriptionTitle = this._view.modelBuilder.text().withProps({
value: constants.DESCRIPTION, value: constants.DESCRIPTION,
CSSStyles: { CSSStyles: labelStyle
'font-size': '14px',
'width': '200px',
'margin': '10px 35px 0px 0px'
}
}).component(); }).component();
this._descriptionText = this._view.modelBuilder.text().withProps({ this._descriptionText = this._view.modelBuilder.text().withProps({
CSSStyles: { CSSStyles: textStyle
'font-size': '12px',
'width': '200px',
'margin': '3px 35px 0px 0px'
}
}).component(); }).component();
const recommendationTitle = this._view.modelBuilder.text().withProps({ const recommendationTitle = this._view.modelBuilder.text().withProps({
value: constants.RECOMMENDATION, value: constants.RECOMMENDATION,
CSSStyles: { CSSStyles: labelStyle
'font-size': '14px',
'width': '200px',
'margin': '12px 35px 0px 0px'
}
}).component(); }).component();
this._recommendationText = this._view.modelBuilder.text().withProps({ this._recommendationText = this._view.modelBuilder.text().withProps({
CSSStyles: { CSSStyles: textStyle
'font-size': '12px',
'width': '200px',
'margin': '3px 35px 0px 0px'
}
}).component(); }).component();
const moreInfo = this._view.modelBuilder.text().withProps({ const moreInfo = this._view.modelBuilder.text().withProps({
value: constants.MORE_INFO, value: constants.MORE_INFO,
CSSStyles: { CSSStyles: labelStyle
'font-size': '14px',
'width': '200px',
'margin': '15px 35px 0px 0px'
}
}).component(); }).component();
this._moreInfo = this._view.modelBuilder.hyperlink().withProps({ this._moreInfo = this._view.modelBuilder.hyperlink().withProps({
label: '', label: '',
url: '', url: '',
CSSStyles: { CSSStyles: textStyle,
'font-size': '12px',
'width': '200px',
'margin': '3px 35px 0px 0px'
},
showLinkIcon: true showLinkIcon: true
}).component(); }).component();
@@ -705,7 +690,6 @@ export class SqlDatabaseTree {
'text-overflow': 'ellipsis', 'text-overflow': 'ellipsis',
'width': '200px', 'width': '200px',
'overflow': 'hidden', 'overflow': 'hidden',
'border-bottom': '1px solid'
}; };
this._assessmentResultsTable = this._view.modelBuilder.declarativeTable().withProps( this._assessmentResultsTable = this._view.modelBuilder.declarativeTable().withProps(

View File

@@ -607,7 +607,12 @@ export class SKURecommendationPage extends MigrationWizardPage {
private createAssessmentProgress(): azdata.FlexContainer { private createAssessmentProgress(): azdata.FlexContainer {
this._assessmentLoader = this._view.modelBuilder.loadingComponent().component(); this._assessmentLoader = this._view.modelBuilder.loadingComponent().withProps({
CSSStyles: {
'margin-top': '15px'
}
}).component();
this._assessmentProgress = this._view.modelBuilder.text().withProps({ this._assessmentProgress = this._view.modelBuilder.text().withProps({
value: constants.ASSESSMENT_IN_PROGRESS, value: constants.ASSESSMENT_IN_PROGRESS,
CSSStyles: { CSSStyles: {

View File

@@ -19,7 +19,7 @@ import { ILogService } from 'vs/platform/log/common/log';
@Component({ @Component({
selector: 'modelview-loadingComponent', selector: 'modelview-loadingComponent',
template: ` template: `
<div class="modelview-loadingComponent-container" aria-busy="true" *ngIf="loading"> <div class="modelview-loadingComponent-container" aria-busy="true" *ngIf="loading" [ngStyle]="CSSStyles">
<div class="modelview-loadingComponent-spinner" [title]="getStatusText()" #spinnerElement></div> <div class="modelview-loadingComponent-spinner" [title]="getStatusText()" #spinnerElement></div>
<div *ngIf="showText" class="modelview-loadingComponent-status-text">{{getStatusText()}}</div> <div *ngIf="showText" class="modelview-loadingComponent-status-text">{{getStatusText()}}</div>
</div> </div>