Browse Source

Feature/improve density of various selectors (#1283)

* Improve density

* Update changelog
pull/1284/head
Thomas Kaul 3 years ago
committed by GitHub
parent
commit
dacd7271eb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      CHANGELOG.md
  2. 7
      apps/client/src/app/components/admin-jobs/admin-jobs.html
  3. 8
      apps/client/src/app/components/admin-overview/admin-overview.html
  4. 8
      apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html
  5. 20
      apps/client/src/app/pages/account/account-page.html
  6. 50
      apps/client/src/styles.scss

6
CHANGELOG.md

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Changed
- Improved the style of various selectors (density)
## 1.196.0 - 22.09.2022 ## 1.196.0 - 22.09.2022
### Added ### Added

7
apps/client/src/app/components/admin-jobs/admin-jobs.html

@ -2,7 +2,10 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<form class="align-items-center d-flex" [formGroup]="filterForm"> <form class="align-items-center d-flex" [formGroup]="filterForm">
<mat-form-field appearance="outline" class="flex-grow-1"> <mat-form-field
appearance="outline"
class="compact-with-outline flex-grow-1 mr-2 without-hint"
>
<mat-select formControlName="status"> <mat-select formControlName="status">
<mat-option></mat-option> <mat-option></mat-option>
<mat-option <mat-option
@ -13,7 +16,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button <button
class="ml-1" class="mt-1"
color="warn" color="warn"
mat-flat-button mat-flat-button
(click)="onDeleteJobs()" (click)="onDeleteJobs()"

8
apps/client/src/app/components/admin-overview/admin-overview.html

@ -162,8 +162,11 @@
</button> </button>
</div> </div>
<div class="mt-2"> <div class="mt-2">
<form #couponForm="ngForm"> <form #couponForm="ngForm" class="align-items-center d-flex">
<mat-form-field appearance="outline" class="mr-2"> <mat-form-field
appearance="outline"
class="compact-with-outline mr-2 without-hint"
>
<mat-select <mat-select
name="duration" name="duration"
[value]="couponDuration" [value]="couponDuration"
@ -176,6 +179,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button <button
class="mt-1"
color="primary" color="primary"
mat-flat-button mat-flat-button
(click)="onAddCoupon()" (click)="onAddCoupon()"

8
apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html

@ -10,7 +10,11 @@
</div> </div>
</div> </div>
<div class="col-md-6 col-xs-12 d-flex justify-content-end"> <div class="col-md-6 col-xs-12 d-flex justify-content-end">
<mat-form-field appearance="outline" class="w-100" color="accent"> <mat-form-field
appearance="outline"
class="w-100 without-hint"
color="accent"
>
<mat-label i18n>Compare with...</mat-label> <mat-label i18n>Compare with...</mat-label>
<mat-select <mat-select
name="benchmark" name="benchmark"
@ -26,7 +30,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div *ngIf="user.settings.viewMode !== 'ZEN'" class="mb-3 text-center"> <div *ngIf="user.settings.viewMode !== 'ZEN'" class="my-2 text-center">
<gf-toggle <gf-toggle
[defaultValue]="user?.settings?.dateRange" [defaultValue]="user?.settings?.dateRange"
[isLoading]="isLoading" [isLoading]="isLoading"

20
apps/client/src/app/pages/account/account-page.html

@ -94,7 +94,10 @@
<ng-container i18n>Base Currency</ng-container> <ng-container i18n>Base Currency</ng-container>
</div> </div>
<div class="pl-1 w-50"> <div class="pl-1 w-50">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field
appearance="outline"
class="compact-with-outline w-100 without-hint"
>
<mat-select <mat-select
name="baseCurrency" name="baseCurrency"
[disabled]="!hasPermissionToUpdateUserSettings" [disabled]="!hasPermissionToUpdateUserSettings"
@ -116,7 +119,10 @@
<div class="hint-text text-muted" i18n>Beta</div> <div class="hint-text text-muted" i18n>Beta</div>
</div> </div>
<div class="pl-1 w-50"> <div class="pl-1 w-50">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field
appearance="outline"
class="compact-with-outline w-100 without-hint"
>
<mat-select <mat-select
name="language" name="language"
[disabled]="!hasPermissionToUpdateUserSettings" [disabled]="!hasPermissionToUpdateUserSettings"
@ -139,7 +145,10 @@
</div> </div>
</div> </div>
<div class="pl-1 w-50"> <div class="pl-1 w-50">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field
appearance="outline"
class="compact-with-outline w-100 without-hint"
>
<mat-select <mat-select
name="locale" name="locale"
[disabled]="!hasPermissionToUpdateUserSettings" [disabled]="!hasPermissionToUpdateUserSettings"
@ -162,7 +171,10 @@
</div> </div>
<div class="pl-1 w-50"> <div class="pl-1 w-50">
<div class="align-items-center d-flex overflow-hidden"> <div class="align-items-center d-flex overflow-hidden">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field
appearance="outline"
class="compact-with-outline w-100 without-hint"
>
<mat-select <mat-select
name="viewMode" name="viewMode"
[disabled]="!hasPermissionToUpdateViewMode" [disabled]="!hasPermissionToUpdateViewMode"

50
apps/client/src/styles.scss

@ -146,13 +146,6 @@ ngx-skeleton-loader {
@include gf-table; @include gf-table;
} }
.mat-fab,
.mat-flat-button {
&.mat-primary {
color: rgba(var(--light-primary-text)) !important;
}
}
.mat-card { .mat-card {
&:not([class*='mat-elevation-z']) { &:not([class*='mat-elevation-z']) {
border: 1px solid rgba(var(--dark-dividers)); border: 1px solid rgba(var(--dark-dividers));
@ -164,6 +157,49 @@ ngx-skeleton-loader {
margin: 0 !important; margin: 0 !important;
} }
.mat-fab,
.mat-flat-button {
&.mat-primary {
color: rgba(var(--light-primary-text)) !important;
}
}
.mat-form-field {
&.compact-with-outline {
.mat-form-field-wrapper {
margin: 0.5rem 0 0.25rem;
padding-bottom: 1rem;
.mat-form-field-infix {
border-top-width: 0;
padding: 1rem 0 0.75rem;
.mat-form-field-label {
margin-top: 0.1rem;
}
.mat-select-arrow-wrapper {
transform: none;
}
}
.mat-form-field-prefix {
top: 0;
}
.mat-form-field-suffix {
top: 0;
}
}
}
&.without-hint {
.mat-form-field-wrapper {
padding-bottom: 0;
}
}
}
.no-min-width { .no-min-width {
min-width: unset !important; min-width: unset !important;
} }

Loading…
Cancel
Save