yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature-Folder-Repository-Base

Browse Source
This commit is contained in:
Mads Rasmussen
2024-01-16 16:12:17 +01:00
parent 65a52d35e0 deaac83257
commit ce48eb6170
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts
View File

@@ -3,7 +3,7 @@ import { marked } from '@umbraco-cms/backoffice/external/marked';
import { monaco } from '@umbraco-cms/backoffice/external/monaco-editor';
import { UmbCodeEditorController, UmbCodeEditorElement, loadCodeEditor } from '@umbraco-cms/backoffice/code-editor';
import { css, html, customElement, query, property, unsafeHTML, when } from '@umbraco-cms/backoffice/external/lit';
import { FormControlMixin, UUIModalSidebarSize, UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import {
@@ -13,6 +13,7 @@ import {
UmbModalManagerContext,
} from '@umbraco-cms/backoffice/modal';
import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
/**
* @element umb-input-markdown
@@ -560,7 +561,7 @@ export class UmbInputMarkdownElement extends FormControlMixin(UmbLitElement) {
}
static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: flex;

5
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
View File

@@ -1,9 +1,10 @@
import { UmbScriptWorkspaceContext } from './script-workspace.context.js';
import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
import { UUITextStyles, UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@customElement('umb-script-workspace-editor')
export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
@@ -96,7 +97,7 @@ export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
}
static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: block;

5
src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
View File

@@ -1,8 +1,9 @@
import { UmbStylesheetWorkspaceContext } from './stylesheet-workspace.context.js';
import { UUIInputElement, UUIInputEvent, UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import type { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@customElement('umb-stylesheet-workspace-editor')
export class UmbStylesheetWorkspaceEditorElement extends UmbLitElement {
@@ -58,7 +59,7 @@ export class UmbStylesheetWorkspaceEditorElement extends UmbLitElement {
}
static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: block;