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

Fix mat-hint overlapping with following components #3532

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Fix mat-hint overlapping with following components #3532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ts/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="settings-field-wrapper">
<div class="form-item" [style.marginLeft.px]="setting.indentation * INDENTATION_PIXEL_AMOUNT">
<form class="settings-form-group" [formGroup]="form">
<mat-form-field *ngIf="!isExcludedType(setting.type!)">
<mat-form-field *ngIf="!isExcludedType(setting.type!)" subscriptSizing="dynamic">
<!-- Decides which input-type to take (i.e) date, select, input) -->
<ng-container [ngSwitch]="setting.type">
<ng-container *ngSwitchCase="'choice'">
Expand Down
7 changes: 0 additions & 7 deletions ...ts/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@
flex: 2;
}

.mat-mdc-form-field {
/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
.mat-form-field-subscript-wrapper {
position: static;
}
}

/* Full width form fields */
.mat-mdc-form-field {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion ...ticipant-detail/components/participant-detail-view/participant-detail-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ <h4>{{ 'About me' | translate }}</h4>

<div *ngIf="isAllowed('update')">
<!-- Comment -->
<mat-form-field class="form100 force-min-width">
<mat-form-field class="form100 force-min-width" subscriptSizing="dynamic">
<mat-label>{{ 'Comment' | translate }}</mat-label>
<input matInput formControlName="comment" />
<mat-hint>{{ 'Only for internal notes.' | translate }}</mat-hint>
Expand Down
2 changes: 1 addition & 1 deletion ...tail-manage/components/participant-create-wizard/participant-create-wizard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ <h4>{{ 'About me' | translate }}</h4>

<div *ngIf="isAllowedFn('update')">
<!-- Comment -->
<mat-form-field class="form100 force-min-width">
<mat-form-field class="form100 force-min-width" subscriptSizing="dynamic">
<mat-label>{{ 'Comment' | translate }}</mat-label>
<input matInput formControlName="comment" />
<mat-hint>{{ 'Only for internal notes.' | translate }}</mat-hint>
Expand Down
2 changes: 1 addition & 1 deletion ...wn-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 mat-dialog-title>
</mat-form-field>

<!-- Time field -->
<mat-form-field>
<mat-form-field subscriptSizing="dynamic">
<mat-label>{{ 'Time' | translate }}</mat-label>
<input matInput formControlName="duration" required />
<mat-hint translate>If the value is set to 0 the time counts up as stopwatch.</mat-hint>
Expand Down
2 changes: 1 addition & 1 deletion ...tail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2 *ngIf="!isCreateView">{{ editMeetingLabel | translate }}</h2>
</mat-form-field>

<p class="has-hint">
<mat-form-field *ngIf="isCreateView">
<mat-form-field *ngIf="isCreateView" subscriptSizing="dynamic">
<mat-label>{{ 'Duplicate from' | translate }}</mat-label>
<os-list-search-selector
[inputListValues]="availableMeetingsObservable"
Expand Down
8 changes: 4 additions & 4 deletions ...les/settings-detail/components/organization-settings/organization-settings.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h2>{{ 'Email settings' | translate }}</h2>
<h2>{{ 'Superadmin settings' | translate }}</h2>
<!-- System url -->
<section>
<mat-form-field>
<mat-form-field subscriptSizing="dynamic">
<mat-label>{{ 'OpenSlides URL' | translate }}</mat-label>
<input matInput formControlName="url" />
<mat-hint>
Expand All @@ -102,7 +102,7 @@ <h2>{{ 'Superadmin settings' | translate }}</h2>
</mat-checkbox>
</section>
<section>
<mat-form-field>
<mat-form-field subscriptSizing="dynamic">
<mat-label>{{ 'Limit of active meetings' | translate }}</mat-label>
<input
matInput
Expand All @@ -116,7 +116,7 @@ <h2>{{ 'Superadmin settings' | translate }}</h2>
</mat-form-field>
</section>
<section>
<mat-form-field>
<mat-form-field subscriptSizing="dynamic">
<mat-label>{{ 'Limit of active accounts' | translate }}</mat-label>
<input
matInput
Expand Down Expand Up @@ -152,7 +152,7 @@ <h2>{{ 'Single Sign-On settings' | translate }}</h2>
</section>
<!-- JSON source attribute -->
<section>
<mat-form-field>
<mat-form-field subscriptSizing="dynamic">
<mat-label>{{ 'Attribute mapping (JSON)' | translate }}</mat-label>
<textarea matInput formControlName="saml_attr_mapping" [rows]="ssoConfigRows"></textarea>
<mat-hint>
Expand Down
Loading