Skip to content

Modal and textarea styling #654

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

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Modal and textarea styling #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89cb5c
feat: update styling for textarea and add new modal size
jake-bassett Mar 2, 2021
395aa6f
Merge branch 'main' of github.com:hypertrace/hypertrace-ui into modal…
jake-bassett Mar 2, 2021
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
5 changes: 5 additions & 0 deletions projects/components/src/modal/modal-container.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
width: 640px;
}

&.modal-size-large-tall {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need to include Response size. We have done it for sheet and it would be useful to add it here. It is straightforward.

height: 800px;
width: 640px;
}

&.modal-size-medium-wide {
height: 600px;
width: 840px;
Expand Down
1 change: 1 addition & 0 deletions projects/components/src/modal/modal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const enum ModalSize {
Small = 'small',
Medium = 'medium',
Large = 'large',
LargeTall = 'large-tall',
MediumWide = 'medium-wide'
}

Expand Down
66 changes: 66 additions & 0 deletions projects/components/src/textarea/textarea.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
@import 'mixins';

:host {
::ng-deep {
&.mat-form-field {
display: block;
height: 100%;
width: 100%;
}

&.mat-focused {
.mat-form-field-label {
color: $gray-5;
}
}

.mat-form-field-underline {
display: none;
}

.mat-form-field-infix {
height: inherit;
width: inherit;
border: unset;
padding: 0 0 0 8px;
}

.mat-form-field-flex {
height: inherit;
width: inherit;
}

.mat-form-field-wrapper {
height: inherit;
width: inherit;
padding-bottom: 0;

.mat-form-field-label {
padding: 0 0 0 8px;
line-height: initial;
color: $gray-5;
}
}

.mat-input-element {
height: inherit;
width: inherit;
margin: 0;

&:after {
width: unset;
margin: 4px;
}
}

.textarea.mat-input-element {
padding: 0;
margin-top: 8px;
}
}
}

.textarea {
height: 100%;
width: 100%;
}
3 changes: 2 additions & 1 deletion projects/components/src/textarea/textarea.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import { LoggerService } from '@hypertrace/common';
styleUrls: ['./textarea.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
template: `
<mat-form-field class="full-page">
<mat-form-field class="fill-container" floatLabel="never">
<textarea
class="textarea"
matInput
[disabled]="this.disabled"
[placeholder]="this.placeholder"
Expand Down