Skip to content

feat(@clayui/css): LPD-51801 Adds .blockquote variant for .form-text #6059

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.

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 10 commits into from
Jun 2, 2025
Merged
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
16 changes: 16 additions & 0 deletions packages/clay-css/src/scss/cadmin/components/_form-validation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@

.form-text {
@include clay-css($cadmin-form-text);

$_blockquote: map-get($cadmin-form-text, blockquote);

@if ($_blockquote) {
&.blockquote {
@include clay-css($_blockquote);

$_before: map-get($_blockquote, before);

@if ($_before) {
&::before {
@include clay-css($_before);
}
}
}
}
}

// Non HTML5 Form Validator
Expand Down
18 changes: 18 additions & 0 deletions packages/clay-css/src/scss/cadmin/variables/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,24 @@ $cadmin-form-text: map-merge(
font-weight: $cadmin-form-text-font-weight,
margin-top: $cadmin-form-text-margin-top,
word-wrap: break-word,
blockquote: (
font-style: italic,
font-weight: $cadmin-font-weight-normal,
margin-bottom: 0,
margin-top: 12px,
padding-left: 12px,
position: relative,
before: (
background-color: $cadmin-secondary-l1,
bottom: 0,
content: '',
display: block,
left: 0,
position: absolute,
top: 0,
width: 2px,
),
),
),
$cadmin-form-text
);
Expand Down
16 changes: 16 additions & 0 deletions packages/clay-css/src/scss/components/_form-validation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@

.form-text {
@include clay-css($form-text);

$_blockquote: map-get($form-text, blockquote);

@if ($_blockquote) {
&.blockquote {
@include clay-css($_blockquote);

$_before: map-get($_blockquote, before);

@if ($_before) {
&::before {
@include clay-css($_before);
}
}
}
}
}

@if ($enable-bs4-deprecated) {
Expand Down
18 changes: 18 additions & 0 deletions packages/clay-css/src/scss/variables/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,24 @@ $form-text: map-merge(
font-weight: $form-text-font-weight,
margin-top: $form-text-margin-top,
word-wrap: break-word,
blockquote: (
font-style: italic,
font-weight: $font-weight-normal,
margin-bottom: 0,
margin-top: 0.75rem,
padding-left: 0.75rem,
position: relative,
before: (
background-color: $secondary-l1,
bottom: 0,
content: '',
display: block,
left: 0,
position: absolute,
top: 0,
width: 0.125rem,
),
),
),
$form-text
);
Expand Down
61 changes: 61 additions & 0 deletions packages/clay-form/docs/form.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,67 @@ export default function App() {
}
```

```jsx preview
import {Provider} from '@clayui/core';
import ClayForm from '@clayui/form';
import LocalizedInput from '@clayui/localized-input';
import React, {useState} from 'react';

import '@clayui/css/lib/css/atlas.css';

export default function App() {
const locales = [
{
label: 'en-US',
symbol: 'en-us',
},
{
label: 'es-ES',
symbol: 'es-es',
},
{
label: 'fr-FR',
symbol: 'fr-fr',
},
{
label: 'hr-HR',
symbol: 'hr-hr',
},
];

const [selectedLocaleError, setSelectedLocaleError] = useState(locales[0]);
const [translationsError, setTranslationsError] = useState({
'en-US': 'Apple',
'es-ES': 'Manzana',
});

return (
<Provider spritemap="/public/icons.svg">
<div className="p-4">
<ClayForm.Group className="has-error">
<LocalizedInput
id="locale3"
label="Localized Input Error State"
locales={locales}
onSelectedLocaleChange={setSelectedLocaleError}
onTranslationsChange={setTranslationsError}
selectedLocale={selectedLocaleError}
translations={translationsError}
/>
<ClayForm.FeedbackGroup>
<ClayForm.Text>Clay Form Text</ClayForm.Text>
<ClayForm.FeedbackItem id="input-group-error">
<ClayForm.FeedbackIndicator symbol="exclamation-full" />
This is a description of the error!
</ClayForm.FeedbackItem>
</ClayForm.FeedbackGroup>
</ClayForm.Group>
</div>
</Provider>
);
}
```

## Group Caption

Use `ClayForm.Text` for creating a caption on Form Groups.
Expand Down
63 changes: 63 additions & 0 deletions packages/clay-localized-input/docs/localized-input.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,66 @@ export default function App() {
);
}
```

## Error State

```jsx preview
import {Provider} from '@clayui/core';
import ClayForm from '@clayui/form';
import LocalizedInput from '@clayui/localized-input';
import React, {useState} from 'react';

import '@clayui/css/lib/css/atlas.css';

export default function App() {
const locales = [
{
label: 'en-US',
symbol: 'en-us',
},
{
label: 'es-ES',
symbol: 'es-es',
},
{
label: 'fr-FR',
symbol: 'fr-fr',
},
{
label: 'hr-HR',
symbol: 'hr-hr',
},
];

const [selectedLocaleError, setSelectedLocaleError] = useState(locales[0]);
const [translationsError, setTranslationsError] = useState({
'en-US': 'Apple',
'es-ES': 'Manzana',
});

return (
<Provider spritemap="/public/icons.svg">
<div className="p-4">
<ClayForm.Group className="has-error">
<LocalizedInput
id="locale3"
label="Error State"
locales={locales}
onSelectedLocaleChange={setSelectedLocaleError}
onTranslationsChange={setTranslationsError}
selectedLocale={selectedLocaleError}
translations={translationsError}
/>
<ClayForm.FeedbackGroup>
<ClayForm.Text>Clay Form Text</ClayForm.Text>
<ClayForm.FeedbackItem id="input-group-error">
<ClayForm.FeedbackIndicator symbol="exclamation-full" />
This is a description of the error!
</ClayForm.FeedbackItem>
</ClayForm.FeedbackGroup>
</ClayForm.Group>
</div>
</Provider>
);
}
```
12 changes: 8 additions & 4 deletions packages/clay-localized-input/docs/localized-input/markup.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,9 @@ packageUse: "import LocalizedInput from '@clayui/localized-input';"
</ul>
</div>
</div>
<div className="form-text">http://www.liferay.com/en-us/clay</div>
<div className="blockquote form-text">
http://www.liferay.com/en-us/clay
</div>
</div>
</div>

Expand Down Expand Up @@ -313,7 +315,9 @@ packageUse: "import LocalizedInput from '@clayui/localized-input';"
</ul>
</div>
</div>
<div className="form-text">http://www.liferay.com/en-us/clay</div>
<div className="blockquote form-text">
http://www.liferay.com/en-us/clay
</div>
</div>
```

Expand Down Expand Up @@ -456,7 +460,7 @@ packageUse: "import LocalizedInput from '@clayui/localized-input';"
</ul>
</div>
</div>
<div className="form-text">.form-text</div>
<div className="blockquote form-text">.form-text</div>
</div>
</div>

Expand Down Expand Up @@ -610,6 +614,6 @@ packageUse: "import LocalizedInput from '@clayui/localized-input';"
</ul>
</div>
</div>
<div className="form-text">.form-text</div>
<div className="blockquote form-text">.form-text</div>
</div>
```
Loading
Loading