Skip to content

Commit

Permalink
fix: issues from PR
Browse files Browse the repository at this point in the history
  • Loading branch information
nmerget committed Apr 12, 2024
1 parent b4daed5 commit faaaf44
Show file tree
Hide file tree
Showing 91 changed files with 64 additions and 64 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
2 changes: 1 addition & 1 deletion packages/components/src/components/button/button.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { DBButton } from './index';
import { DEFAULT_VIEWPORT } from '../../shared/constants.ts';

const testButton = () => {
for (const variant of ['outlined', 'primary', 'solid', 'text']) {
for (const variant of ['outlined', 'brand', 'filled', 'ghost']) {
test(`should contain text for variant ${variant}`, async ({
mount
}) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ export default function DBCheckbox(props: DBCheckboxProps) {
id={state._invalidMessageId}
size="small"
semantic="critical">
{props.invalidMessage || DEFAULT_INVALID_MESSAGE}
{props.invalidMessage ||
ref?.validationMessage ||
DEFAULT_INVALID_MESSAGE}
</DBInfotext>
</div>
);
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/components/input/input.lite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ export default function DBInput(props: DBInputProps) {
id={state._invalidMessageId}
size="small"
semantic="critical">
{props.invalidMessage || DEFAULT_INVALID_MESSAGE}
{props.invalidMessage ||
ref?.validationMessage ||
DEFAULT_INVALID_MESSAGE}
</DBInfotext>
</div>
);
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/components/select/select.lite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ export default function DBSelect(props: DBSelectProps) {
id={state._invalidMessageId}
size="small"
semantic="critical">
{props.invalidMessage || DEFAULT_INVALID_MESSAGE}
{props.invalidMessage ||
ref?.validationMessage ||
DEFAULT_INVALID_MESSAGE}
</DBInfotext>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ export default function DBTextarea(props: DBTextareaProps) {
id={state._invalidMessageId}
size="small"
semantic="critical">
{props.invalidMessage || DEFAULT_INVALID_MESSAGE}
{props.invalidMessage ||
ref?.validationMessage ||
DEFAULT_INVALID_MESSAGE}
</DBInfotext>
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/styles/_form-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ $input-types: "button", "checkbox", "color", "date", "datetime-local", "email",
&[data-variant="floating"] {
label {
@extend %db-overwrite-font-size-md;
opacity: component.$default-disabled;
position: absolute;
z-index: 2;
inset-block-start: calc(
Expand Down Expand Up @@ -110,6 +111,7 @@ $input-types: "button", "checkbox", "color", "date", "datetime-local", "email",
label {
@extend %db-overwrite-font-size-2xs;
inset-block-start: variables.$db-spacing-fixed-2xs;
opacity: 1;
}

#{$selector} {
Expand Down Expand Up @@ -310,7 +312,6 @@ $input-valid-types: "color", "date", "datetime-local", "email", "file", "hidden"
padding-block-end: variables.$db-spacing-fixed-xs;
pointer-events: none;
cursor: text;
opacity: component.$default-disabled;

transition: font-size variables.$db-transition-straight-emotional;
max-inline-size: 25ch;
Expand Down
93 changes: 42 additions & 51 deletions packages/foundations/src/colors.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,68 +38,59 @@

<body style="padding: var(--db-spacing-fixed-md)">
<div>
<div class="db-bg-base">base</div>
<div class="db-bg-base-strong">base-strong</div>
<div class="db-bg-base" data-emphasis="weak">base-weak</div>
<div class="db-bg-base-transparent-semi">base-transparent-semi</div>
<div class="db-bg-base-transparent-full">base-transparent-full</div>
<div class="db-bg-neutral">neutral</div>
<div class="db-bg-neutral-strong">neutral-strong</div>
<div class="db-bg-neutral" data-emphasis="weak">neutral-weak</div>
<div class="db-bg-neutral-transparent-semi">
neutral-transparent-semi
<div class="db-neutral-bg-lvl-1">neutral-bg-lvl-1</div>
<div class="db-neutral-bg-lvl-2">neutral-bg-lvl-2</div>
<div class="db-neutral-bg-lvl-3">neutral-bg-lvl-3</div>
<div class="db-neutral-bg-transparent-semi">
neutral-bg-transparent-semi
</div>
<div class="db-bg-neutral-transparent-full">
neutral-transparent-full
<div class="db-neutral-bg-transparent-full">
neutral-bg-transparent-full
</div>
<div class="db-bg-brand">brand</div>
<div class="db-bg-brand-strong">brand-strong</div>
<div class="db-bg-brand" data-emphasis="weak">brand-weak</div>
<div class="db-bg-brand-transparent-semi">
brand-transparent-semi
<div class="db-brand-bg-lvl-1">brand-bg-lvl-1</div>
<div class="db-brand-bg-lvl-2">brand-bg-lvl-2</div>
<div class="db-brand-bg-lvl-3">brand-bg-lvl-3</div>
<div class="db-brand-bg-transparent-semi">
brand-bg-transparent-semi
</div>
<div class="db-bg-brand-transparent-full">
brand-transparent-full
<div class="db-brand-bg-transparent-full">
brand-bg-transparent-full
</div>
<div class="db-bg-successful">successful</div>
<div class="db-bg-successful-strong">successful-strong</div>
<div class="db-bg-successful" data-emphasis="weak">
successful-weak
<div class="db-critical-bg-lvl-1">critical-bg-lvl-1</div>
<div class="db-critical-bg-lvl-2">critical-bg-lvl-2</div>
<div class="db-critical-bg-lvl-3">critical-bg-lvl-3</div>
<div class="db-critical-bg-transparent-semi">
critical-bg-transparent-semi
</div>
<div class="db-bg-successful-transparent-semi">
successful-transparent-semi
<div class="db-critical-bg-transparent-full">
critical-bg-transparent-full
</div>
<div class="db-bg-successful-transparent-full">
successful-transparent-full
<div class="db-warning-bg-lvl-1">warning-bg-lvl-1</div>
<div class="db-warning-bg-lvl-2">warning-bg-lvl-2</div>
<div class="db-warning-bg-lvl-3">warning-bg-lvl-3</div>
<div class="db-warning-bg-transparent-semi">
warning-bg-transparent-semi
</div>
<div class="db-bg-critical">critical</div>
<div class="db-bg-critical-strong">critical-strong</div>
<div class="db-bg-critical" data-emphasis="weak">critical-weak</div>
<div class="db-bg-critical-transparent-semi">
critical-transparent-semi
<div class="db-warning-bg-transparent-full">
warning-bg-transparent-full
</div>
<div class="db-bg-critical-transparent-full">
critical-transparent-full
<div class="db-successful-bg-lvl-1">successful-bg-lvl-1</div>
<div class="db-successful-bg-lvl-2">successful-bg-lvl-2</div>
<div class="db-successful-bg-lvl-3">successful-bg-lvl-3</div>
<div class="db-successful-bg-transparent-semi">
successful-bg-transparent-semi
</div>
<div class="db-bg-warning">warning</div>
<div class="db-bg-warning-strong">warning-strong</div>
<div class="db-bg-warning" data-emphasis="weak">warning-weak</div>
<div class="db-bg-warning-transparent-semi">
warning-transparent-semi
<div class="db-successful-bg-transparent-full">
successful-bg-transparent-full
</div>
<div class="db-bg-warning-transparent-full">
warning-transparent-full
<div class="db-informational-bg-lvl-1">informational-bg-lvl-1</div>
<div class="db-informational-bg-lvl-2">informational-bg-lvl-2</div>
<div class="db-informational-bg-lvl-3">informational-bg-lvl-3</div>
<div class="db-informational-bg-transparent-semi">
informational-bg-transparent-semi
</div>
<div class="db-bg-informational">informational</div>
<div class="db-bg-informational-strong">informational-strong</div>
<div class="db-bg-informational" data-emphasis="weak">
informational-weak
</div>
<div class="db-bg-informational-transparent-semi">
informational-transparent-semi
</div>
<div class="db-bg-informational-transparent-full">
informational-transparent-full
<div class="db-informational-bg-transparent-full">
informational-bg-transparent-full
</div>
</div>
</body>
Expand Down
5 changes: 2 additions & 3 deletions packages/foundations/src/fonts.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
href="/build/css/db-ui-foundations-absolute.css"
/>
<link rel="stylesheet" href="/build/css/default-theme.css" />
<link rel="stylesheet" href="/build/css/internals.css" />
<style>
body {
font-family: "DB Screen Sans";
Expand All @@ -25,8 +24,8 @@
}

small {
/* TODO: define "DB Screen Sans" as a fallback */
font-family: "DB Screen Sans Digital";
font-family: "DB Screen Sans";
font-weight: 300;
}

p strong {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@if (exampleProps.img) {
<img
image
src="./assets/images/placeholder.png"
src="./assets/images/placeholder.jpg"
alt="Placeholder"
/>
}
Expand Down
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const getNotification = ({
<img
src={`${
import.meta.env.BASE_URL
}/assets/images/placeholder.png`}
}/assets/images/placeholder.jpg`}
alt="Placeholder"
/>
) : undefined
Expand Down
3 changes: 2 additions & 1 deletion showcases/shared/navigation-item.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
{
"name": "Text - Icons (Leading, Chevron)",
"props": {
"icon": "account"
"icon": "account",
"areaPopup": true
}
},
{
Expand Down
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const log = (exampleName: string) => {
</template>
<template v-if="exampleProps.img" v-slot:image>
<img
src="/assets/images/placeholder.png"
src="/assets/images/placeholder.jpg"
alt="Placeholder"
/>
</template>
Expand Down

0 comments on commit faaaf44

Please sign in to comment.