Skip to content

Commit

Permalink
last round of style import corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
nielslyngsoe committed Sep 5, 2023
1 parent 9a640dc commit 995c2b1
Show file tree
Hide file tree
Showing 271 changed files with 511 additions and 565 deletions.
2 changes: 1 addition & 1 deletion src/packages/core/collection/collection.element.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UmbTextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { css, html, nothing, customElement, state, property } from '@umbraco-cms/backoffice/external/lit';
import { map } from '@umbraco-cms/backoffice/external/rxjs';
import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { css, CSSResultGroup, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit';
import {
UmbNotificationHandler,
Expand Down Expand Up @@ -46,7 +46,7 @@ export class UmbBackofficeNotificationContainerElement extends UmbLitElement {
}

static styles: CSSResultGroup = [
UUITextStyles,
UmbTextStyles,
css`
#notifications {
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import {
css,
html,
Expand All @@ -8,7 +9,6 @@ import {
state,
query,
} from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';

//TODO: Add the following attributes to JSDocs: header-transparent, main-no-padding, header-no-padding, header-fit-height

Expand Down Expand Up @@ -129,7 +129,7 @@ export class UmbBodyLayoutElement extends LitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: flex;
Expand Down Expand Up @@ -175,7 +175,7 @@ export class UmbBodyLayoutElement extends LitElement {
}
:host([header-transparent]:not([main-no-padding])) #main:not(*[style='display: none'] + *) {
/* The following styling is only applied if the clear-header IS present,
/* The following styling is only applied if the clear-header IS present,
the main-no-padding attribute is NOT present, and the header is NOT hidden */
padding-top: var(--uui-size-space-1);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
UUITextStyles,
InterfaceColor,
InterfaceLook,
PopoverPlacement,
Expand Down Expand Up @@ -74,7 +73,6 @@ export class UmbButtonWithDropdownElement extends LitElement {
}

static styles = [
UUITextStyles,
css`
uui-symbol-expand {
margin-left: var(--uui-size-space-3);
Expand Down
4 changes: 2 additions & 2 deletions src/packages/core/components/code-block/code-block.element.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import {
css,
html,
Expand Down Expand Up @@ -65,7 +65,7 @@ export class UmbCodeBlockElement extends LitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: block;
Expand Down
4 changes: 2 additions & 2 deletions src/packages/core/components/dropdown/dropdown.element.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

Expand Down Expand Up @@ -26,7 +26,7 @@ export class UmbDropdownElement extends UmbLitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
#container {
display: inline-block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { css, html, LitElement, customElement, property } from '@umbraco-cms/backoffice/external/lit';

@customElement('umb-empty-state')
Expand All @@ -22,7 +22,7 @@ export class UmbEmptyStateElement extends LitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { map } from '@umbraco-cms/backoffice/external/rxjs';
import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
Expand Down Expand Up @@ -72,7 +72,7 @@ export class UmbEntityActionsBundleElement extends UmbLitElement {
`;
}

static styles = [UUITextStyles, css``];
static styles = [UmbTextStyles, css``];
}

declare global {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, LitElement, customElement } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";

/**
* @element umb-footer-layout
Expand All @@ -20,7 +20,7 @@ export class UmbFooterLayoutElement extends LitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { css, CSSResultGroup, html, LitElement, customElement, ifDefined } from '@umbraco-cms/backoffice/external/lit';
import {
ManifestHeaderAppButtonKind,
Expand Down Expand Up @@ -36,7 +36,7 @@ export class UmbHeaderAppButtonElement extends LitElement {
}

static styles: CSSResultGroup = [
UUITextStyles,
UmbTextStyles,
css`
uui-button {
font-size: 18px;
Expand Down
4 changes: 2 additions & 2 deletions src/packages/core/components/history/history-item.element.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-history-item')
Expand Down Expand Up @@ -30,7 +30,7 @@ export class UmbHistoryItemElement extends UmbLitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
--avatar-size: calc(2em + 4px);
Expand Down
4 changes: 2 additions & 2 deletions src/packages/core/components/history/history-list.element.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-history-list')
Expand All @@ -11,7 +11,7 @@ export class UmbHistoryListElement extends UmbLitElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, nothing, repeat, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-input-checkbox-list')
Expand Down Expand Up @@ -60,7 +60,6 @@ export class UmbInputCheckboxListElement extends FormControlMixin(UmbLitElement)
}

static styles = [
UUITextStyles,
css`
uui-checkbox {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import type { UmbSwatchDetails } from '@umbraco-cms/backoffice/models';

Expand Down Expand Up @@ -43,8 +43,6 @@ export class UmbInputColorElement extends FormControlMixin(UmbLitElement) {
.showLabel=${this.showLabels}></uui-color-swatch>`;
})}`;
}

static styles = [UUITextStyles];
}

export default UmbInputColorElement;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { UmbConfigRepository } from '../../repositories/config/config.repository.js';
import { css, html, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-input-date')
Expand Down Expand Up @@ -142,8 +142,6 @@ export class UmbInputDateElement extends FormControlMixin(UmbLitElement) {
.value="${this.displayValue?.replace('Z', '')}">
</uui-input>`;
}

static styles = [UUITextStyles, css``];
}

export default UmbInputDateElement;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUIColorPickerChangeEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIColorPickerChangeEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-input-eye-dropper')
Expand Down Expand Up @@ -29,8 +29,6 @@ export class UmbInputEyeDropperElement extends FormControlMixin(UmbLitElement) {
.opacity="${this.opacity}"
.swatches="${this.swatches}"></uui-color-picker>`;
}

static styles = [UUITextStyles, css``];
}

export default UmbInputEyeDropperElement;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
Expand Down Expand Up @@ -214,7 +214,6 @@ export class UmbInputMultiUrlElement extends FormControlMixin(UmbLitElement) {
}

static styles = [
UUITextStyles,
css`
uui-button {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

function getNumberOrUndefined(value: string) {
Expand Down Expand Up @@ -80,8 +80,6 @@ export class UmbInputNumberRangeElement extends FormControlMixin(UmbLitElement)
<uui-input type="number" .value=${this._maxValue} @input=${this._onMaxInput} label=${this.maxLabel}></uui-input>`;
}

static styles = [UUITextStyles, css``];
}

export default UmbInputNumberRangeElement;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, nothing, repeat, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-input-radio-button-list')
Expand Down Expand Up @@ -49,7 +49,6 @@ export class UmbInputRadioButtonListElement extends FormControlMixin(UmbLitEleme
}

static styles = [
UUITextStyles,
css`
:host {
display: block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UmbInputListBaseElement } from '../input-list-base/input-list-base.js';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UMB_SECTION_PICKER_MODAL } from '@umbraco-cms/backoffice/modal';
import { ManifestSection, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
Expand Down Expand Up @@ -54,7 +54,7 @@ export class UmbInputPickerSectionElement extends UmbInputListBaseElement {
}

static styles = [
UUITextStyles,
UmbTextStyles,
css`
:host {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUISliderEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUISliderEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-input-slider')
Expand Down Expand Up @@ -54,8 +54,6 @@ export class UmbInputSliderElement extends FormControlMixin(UmbLitElement) {
.valueHigh="${this.initVal2}"
@change="${this.#onChange}"></uui-range-slider>`;
}

static styles = [UUITextStyles, css``];
}

export default UmbInputSliderElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { defaultExtendedValidElements, defaultFallbackConfig, defaultStyleFormat
import { pastePreProcessHandler, uploadImageHandler } from './input-tiny-mce.handlers.js';
import { availableLanguages } from './input-tiny-mce.languages.js';
import { uriAttributeSanitizer } from './input-tiny-mce.sanitizer.js';
import { FormControlMixin, UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import { renderEditor, type tinymce } from '@umbraco-cms/backoffice/external/tinymce';
import { UMB_AUTH, UmbLoggedInUser } from '@umbraco-cms/backoffice/auth';
import {
Expand Down Expand Up @@ -287,7 +287,6 @@ export class UmbInputTinyMceElement extends FormControlMixin(UmbLitElement) {
}

static styles = [
UUITextStyles,
css`
#editor {
position: relative;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin, UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin, UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

@customElement('umb-input-toggle')
Expand Down Expand Up @@ -58,7 +58,6 @@ export class UmbInputToggleElement extends FormControlMixin(UmbLitElement) {
}

static styles = [
UUITextStyles,
css`
uui-toggle {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
query,
state,
} from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles, FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
import type { UUIFileDropzoneElement, UUIFileDropzoneEvent } from '@umbraco-cms/backoffice/external/uui';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

Expand Down Expand Up @@ -134,7 +134,6 @@ export class UmbInputUploadFieldElement extends FormControlMixin(UmbLitElement)
}

static styles = [
UUITextStyles,
css`
uui-icon {
vertical-align: sub;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
import {
PropertyEditorConfigDefaultData,
PropertyEditorConfigProperty,
Expand Down Expand Up @@ -124,7 +124,7 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement {
`;
}

static styles = [UUITextStyles];
static styles = [UmbTextStyles];
}

export default UmbPropertyEditorConfigElement;
Expand Down
Loading

0 comments on commit 995c2b1

Please sign in to comment.