Skip to content

Commit

Permalink
ui(typography): minors fix typography (#516)
Browse files Browse the repository at this point in the history
* refactor(panel) font size linked to mat-typography

* refactor(ogc-filter) font size linked to mat-typography

* refactor(time filter) font size linked to mat-typography

* refactor(import-export) font size linked to mat-typography

* refactor(measurer) font size linked to mat-typography

* refactor(print) font size linked to mat-typography

* refactor(routing) font size linked to mat-typography

* refactor(search-setting) font size linked to mat-typography

* refactor(about) font size linked to mat-typography

* refactor(seach-result) font size linked to mat-typography
  • Loading branch information
pelord authored and mbarbeau committed Nov 19, 2019
1 parent 4a808bf commit cc4e918
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 20 deletions.
2 changes: 1 addition & 1 deletion packages/common/src/lib/panel/panel.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div *ngIf="withHeader" class="igo-panel-header" title="">
<div *ngIf="withHeader" class="igo-panel-header mat-typography" title="">
<h3>
<ng-content select="[panelLeftButton]"></ng-content>
<div class="igo-panel-title">
Expand Down
2 changes: 2 additions & 0 deletions packages/common/src/lib/panel/panel.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@
overflow: hidden;
line-height: 40px;
float: left;
font-weight: bold;
font-size: 1.17em;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<mat-list-item>
<mat-list-item class="mat-typography">

<div class="igo-col igo-col-90 igo-col-100-m">
<mat-select class="logical" [disabled]="!currentFilter.active" (selectionChange)="refreshFilters()" [(ngModel)]="currentFilter.parentLogical"
Expand Down Expand Up @@ -45,7 +45,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #expressionequalto (keyup)="changeProperty(currentFilter,'expression',expressionequalto.value)"
(ngModelChange)="changeProperty(currentFilter,'expression',expressionequalto.value)" [ngModel]="currentFilter.expression">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values" [value]="value">
<mat-option *ngFor="let value of values" [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand All @@ -64,7 +64,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #pattern (keyup)="changeProperty(currentFilter,'pattern',pattern.value)"
(ngModelChange)="changeProperty(currentFilter,'pattern',pattern.value)" [ngModel]="currentFilter.pattern">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values" [value]="value">
<mat-option *ngFor="let value of values" [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand All @@ -86,7 +86,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #expressionthan type="number" (keyup)="changeNumericProperty(currentFilter,'expression',expressionthan.value)"
(ngModelChange)="changeNumericProperty(currentFilter,'expression',expressionthan.value)" [ngModel]="currentFilter.expression">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values" [value]="value">
<mat-option *ngFor="let value of values" [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand All @@ -104,7 +104,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #lowerBoundary type="number" (keyup)="changeNumericProperty(currentFilter,'lowerBoundary',lowerBoundary.value)"
(ngModelChange)="changeNumericProperty(currentFilter,'lowerBoundary',lowerBoundary.value)" [ngModel]="currentFilter.lowerBoundary">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values" [value]="value">
<mat-option *ngFor="let value of values" [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand All @@ -116,7 +116,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #upperBoundary type="number" (keyup)="changeNumericProperty(currentFilter,'upperBoundary',upperBoundary.value)"
(ngModelChange)="changeNumericProperty(currentFilter,'upperBoundary',upperBoundary.value)" [ngModel]="currentFilter.upperBoundary">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values" [value]="value">
<mat-option *ngFor="let value of values" [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand All @@ -135,7 +135,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #begin (keyup)="changeProperty(currentFilter,'begin',begin.value)"
(ngModelChange)="changeProperty(currentFilter,'begin',begin.value)" [ngModel]="currentFilter.begin">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values " [value]="value">
<mat-option *ngFor="let value of values " [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand All @@ -148,7 +148,7 @@
<input [placeholder]="'igo.geo.filter.placeholder' | translate" [disabled]="!currentFilter.active" matInput [matAutocomplete]="auto" #end (keyup)="changeProperty(currentFilter,'end',end.value)"
(ngModelChange)="changeProperty(currentFilter,'end',end.value)" [ngModel]="currentFilter.end">
<mat-autocomplete #auto="matAutocomplete">
<mat-option *ngFor="let value of values" [value]="value">
<mat-option *ngFor="let value of values" [value]="value" matTooltipShowDelay="500" [matTooltip]="value">
<span>{{ value }}</span>
</mat-option>
</mat-autocomplete>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@
height: auto;
}

.mat-form-field {
width: 100%;
}

.mat-list-item >>> div.mat-list-item-content {
display: inline-table;
width: 100%;
}

.logical {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
</mat-form-field>
</div>
<ng-container *ngFor="let bundle of currentPushButtonGroup.computedButtons">
<mat-button-toggle-group appearance="legacy" vertical={{bundleIsVertical(bundle)}} multiple="true">
<mat-button-toggle-group
class="mat-typography"
appearance="legacy" vertical={{bundleIsVertical(bundle)}} multiple="true">
<mat-button-toggle [ngStyle]="getButtonColor(ogcPushButton)" [checked]="ogcPushButton.enabled"
(change)="applyFilters(ogcPushButton)" tooltip-position="below" matTooltipShowDelay="500"
[matTooltip]="getToolTip(ogcPushButton)" matTooltipClass="material-tooltip"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ <h4 *ngIf="!header" matLine></h4>
<igo-ogc-filterable-form [datasource]="datasource" [map]="map" [refreshFilters]="refreshFunc">
</igo-ogc-filterable-form>

<section class="mat-typography">
<mat-checkbox labelPosition='before' *ngIf="hasPushButton && filtersAreEditable" (change)="changeOgcFilterType($event)"
[(ngModel)]="datasource.options.ogcFilters.advancedOgcFilters">
{{'igo.geo.filter.advancedOgcFilters' | translate}}
</mat-checkbox>
</section>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@


<br>
<div *ngIf="!isRange && style === 'slider' && type === 'year'" class="igo-col igo-col-100 igo-col-100-m">
<div *ngIf="!isRange && style === 'slider' && type === 'year'" class="igo-col igo-col-100 igo-col-100-m mat-typography">
<span>{{startYear}}</span>
<mat-slider
id="time-slider"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
(change)="importFiles($event.target.files)">
</div>
</form>

<section class="mat-typography">
<h4>{{'igo.geo.importExportForm.importClarifications' | translate}}</h4>
<ul>
<li>{{'igo.geo.importExportForm.importSizeMax' | translate}}</li>
<li>{{'igo.geo.importExportForm.importShpZip' | translate}}</li>
</ul>
</section>
</mat-tab>

<mat-tab [label]="'igo.geo.importExportForm.exportTabTitle' | translate">
Expand Down
4 changes: 2 additions & 2 deletions packages/geo/src/lib/measure/measurer/measurer.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<div class="measure-type-toggle">
<div class="measure-type-toggle mat-typography">
<mat-button-toggle-group
[value]="activeMeasureType"
(change)="onMeasureTypeChange($event.value)">
Expand All @@ -12,7 +12,7 @@
</mat-button-toggle-group>
</div>

<div class="measure-options">
<div class="measure-options mat-typography">
<mat-slide-toggle
[checked]="drawControlIsActive"
[labelPosition]="'before'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>

<div class="igo-input-container">
<div class="print-slide-toggle-container">
<div class="print-slide-toggle-container mat-typography">
<mat-slide-toggle
class="print-option"
formControlName="showProjection"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

<mat-autocomplete #auto="matAutocomplete">
<mat-optgroup *ngFor="let source of stop.value.stopProposals" [label]="source.source.title" [disabled]="source.source.enabled === false">
<mat-option *ngFor="let result of source.results" [value]="result.meta ? result.meta.title : ''" (onSelectionChange)="chooseProposal(result,i)">
<mat-option *ngFor="let result of source.results" [value]="result.meta ? result.meta.title : ''"
(onSelectionChange)="chooseProposal(result,i)"
matTooltipShowDelay="500" [matTooltip]="result.meta ? result.meta.title : ''">
{{ result.meta ? result.meta.title : '' }}
</mat-option>
</mat-optgroup>
Expand Down Expand Up @@ -88,7 +90,7 @@
<mat-divider *ngIf="routesResults && routesResults.length === 0"></mat-divider>

<mat-list>
<h3 mat-header>{{activeRoute.title}}</h3>
<h3 mat-header class="igo-route-title mat-typography">{{activeRoute.title}}</h3>
<h3 mat-subheader>{{formatDistance(activeRoute.distance)}}, {{formatDuration(activeRoute.duration)}}</h3>

<mat-list-item (mouseenter)="showSegment(step)" (click)="showSegment(step,true)" *ngFor="let step of activeRoute.steps; let cnt = index;"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ mat-form-field {
width: 85%;
}

.igo-route-title {
font-weight: bold;
}


form {
padding-top: 10px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
class="igo-search-settings-radio-group"
[value]="setting">
<mat-radio-button *ngFor="let settingValue of setting.values"
class="mat-typography"
[value]="settingValue"
[checked]="settingValue.enabled"
(click)="$event.stopPropagation()"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<igo-custom-html
<igo-custom-html class="mat-typography"
[html]="html |  translate: {version: version}">
</igo-custom-html>
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<div *ngIf="!store || store.empty" style="margin: 10px;">
<h4>{{ 'igo.integration.searchResultsTool.noResults' | translate }}</h4>
<p>{{ 'igo.integration.searchResultsTool.doSearch' | translate }}</p>
<section class="mat-typography">
<h4>{{ 'igo.integration.searchResultsTool.noResults' | translate }}</h4>
<p>{{ 'igo.integration.searchResultsTool.doSearch' | translate }}</p>
</section>
</div>

<igo-flexible
Expand Down

0 comments on commit cc4e918

Please sign in to comment.