Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@
"CraftCms\\Cms\\Providers\\CraftServiceProvider"
],
"aliases": {
"Activities": "CraftCms\\Cms\\Support\\Facades\\Activities",
"Addresses": "CraftCms\\Cms\\Support\\Facades\\Addresses",
"Announcements": "CraftCms\\Cms\\Support\\Facades\\Announcements",
"AssetIndexer": "CraftCms\\Cms\\Support\\Facades\\AssetIndexer",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import {css} from 'lit';
import {baseFieldStyles, baseInputWrapperStyles, baseComboboxStyles} from '../../styles/form.styles';
import {
baseFieldStyles,
baseInputWrapperStyles,
baseComboboxStyles,
} from '../../styles/form.styles';

export default css`
${baseFieldStyles}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import {css} from 'lit';
import {baseFieldStyles, baseInputWrapperStyles, baseFormControlStyles} from '../../styles/form.styles';
import {
baseFieldStyles,
baseInputWrapperStyles,
baseFormControlStyles,
} from '../../styles/form.styles';

export default css`
${baseFieldStyles}
Expand Down Expand Up @@ -61,7 +65,8 @@ export default css`
}

.input-color__swatch:focus-within {
outline: var(--c-focus-outline-width) var(--c-focus-outline-style) var(--c-color-focus-outline);
outline: var(--c-focus-outline-width) var(--c-focus-outline-style)
var(--c-color-focus-outline);
outline-offset: var(--c-focus-outline-offset);
}

Expand Down Expand Up @@ -109,12 +114,12 @@ export default css`
font: inherit;
font-family: var(--c-font-mono);
padding-block: 0;

border: 0;
appearance: none;
background-color: transparent;
}

::slotted(.form-control) {
${baseFormControlStyles}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@ export default class CraftInputPassword extends LionInput {
transform: translateY(calc(-50%));
border: none;
}

::slotted(.form-control) {
${baseFormControlStyles}
--_input-end-end-radius: var(--c-input-radius, var(--c-radius-sm)) !important;
--_input-start-end-radius: var(--c-input-radius, var(--c-radius-sm)) !important;
--_input-end-end-radius: var(
--c-input-radius,
var(--c-radius-sm)
) !important;
--_input-start-end-radius: var(
--c-input-radius,
var(--c-radius-sm)
) !important;
}
`,
];
Expand Down
2 changes: 1 addition & 1 deletion packages/craftcms-ui/src/components/input/input.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default css`
::slotted(.form-control) {
${baseFormControlStyles}
}

craft-input input[type='checkbox'],
craft-input input[type='radio'] {
background-color: var(--c-input-fill, var(--c-form-control-fill));
Expand Down
6 changes: 5 additions & 1 deletion packages/craftcms-ui/src/components/select/select.styles.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import {css} from 'lit';
import {baseFieldStyles, baseInputWrapperStyles, baseComboboxStyles} from '@src/styles/form.styles';
import {
baseFieldStyles,
baseInputWrapperStyles,
baseComboboxStyles,
} from '@src/styles/form.styles';

export default css`
${baseFieldStyles}
Expand Down
17 changes: 10 additions & 7 deletions packages/craftcms-ui/src/styles/form.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {css} from 'lit';
*/
export const baseFormControlStyles = css`
--_input-border-width: var(
--c-input-border-width,
var(--c-form-control-border-width)
--c-input-border-width,
var(--c-form-control-border-width)
);
--_input-start-start-radius: var(--c-input-radius, var(--c-radius-sm));
--_input-start-end-radius: var(--c-input-radius, var(--c-radius-sm));
Expand All @@ -23,11 +23,13 @@ export const baseFormControlStyles = css`
border-width: var(--_input-border-width);
border-style: var(--c-input-border-style, var(--c-form-control-border-style));
border-color: var(--c-input-border-color, var(--c-form-control-border-color));
border-radius: var(--_input-start-start-radius) var(--_input-start-end-radius) var(--_input-end-end-radius) var(--_input-end-start-radius);
border-radius: var(--_input-start-start-radius) var(--_input-start-end-radius)
var(--_input-end-end-radius) var(--_input-end-start-radius);
background-color: var(--c-input-fill, var(--c-form-control-fill));
box-shadow: var(--c-input-shadow);
min-height: calc(
var(--c-input-height, var(--c-size-control-md)) - 2 * var(--_input-border-width)
var(--c-input-height, var(--c-size-control-md)) - 2 *
var(--_input-border-width)
);
`;

Expand Down Expand Up @@ -141,16 +143,17 @@ export const inputStyles = css`
padding-inline: var(--c-input-spacing-inline);
display: grid;
place-items: center;
border: var(--c-input-border-width) var(--c-input-border-style) var(--c-input-border-color);
border: var(--c-input-border-width) var(--c-input-border-style)
var(--c-input-border-color);
border-radius: var(--c-input-radius, var(--c-radius-sm));
}

.input-group__prefix {
border-inline-end: 0;
border-end-end-radius: 0;
border-start-end-radius: 0;
}

.input-group__suffix {
border-inline-start: 0;
border-start-start-radius: 0;
Expand Down
4 changes: 2 additions & 2 deletions resources/translations/cs/app.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions resources/translations/da/app.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading