Skip to content

Commit

Permalink
Merge branch 'main' into v15/feature/disable-readonly-languages-when-…
Browse files Browse the repository at this point in the history
…unpublishing
  • Loading branch information
madsrasmussen authored Oct 21, 2024
2 parents 4735139 + a410c5c commit e7ee0d2
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um

const dimensions = this.configuration?.getValueByAlias<{ width?: number; height?: number }>('dimensions');
if (dimensions?.width) this.setAttribute('style', `max-width: ${dimensions.width}px;`);
if (dimensions?.height) element.setAttribute('style', `max-height: ${dimensions.height}px;`);
if (dimensions?.height) element.setAttribute('style', `height: ${dimensions.height}px;`);

this._toolbar = this.configuration?.getValueByAlias<UmbTiptapToolbarValue>('toolbar') ?? [[[]]];

Expand Down Expand Up @@ -173,6 +173,8 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
}
#editor {
/* Required as overflow is set to auto, so that the scrollbars don't appear. */
display: flex;
overflow: auto;
border-radius: var(--uui-border-radius);
border: 1px solid var(--uui-color-border);
Expand All @@ -183,8 +185,7 @@ export class UmbInputTiptapElement extends UmbFormControlMixin<string, typeof Um
box-sizing: border-box;
height: 100%;
width: 100%;
min-height: 400px;
display: grid; /* Don't ask me why this is needed, but it is. */
pre {
background-color: var(--uui-color-surface-alt);
padding: var(--uui-size-space-2) var(--uui-size-space-4);
Expand Down

0 comments on commit e7ee0d2

Please sign in to comment.