diff --git a/packages/libraries/theming/size/ods-theming-size.code.scss b/packages/libraries/theming/size/ods-theming-size.code.scss index 1deb9202a2..606655b84c 100644 --- a/packages/libraries/theming/size/ods-theming-size.code.scss +++ b/packages/libraries/theming/size/ods-theming-size.code.scss @@ -4,8 +4,8 @@ @return ( border-radius: var(--ods-size-code-#{$size-name}-border-radius), min-height: var(--ods-size-code-#{$size-name}-min-height), - padding-y: var(--ods-size-code-#{$size-name}-padding-y), - padding-x: var(--ods-size-code-#{$size-name}-padding-x) + global-padding: var(--ods-size-code-#{$size-name}-global-padding), + code-padding: var(--ods-size-code-#{$size-name}-code-padding) ) } diff --git a/packages/stencil/components/code/src/components/osds-code/osds-code.scss b/packages/stencil/components/code/src/components/osds-code/osds-code.scss index 57c6f436ae..54614b6e44 100644 --- a/packages/stencil/components/code/src/components/osds-code/osds-code.scss +++ b/packages/stencil/components/code/src/components/osds-code/osds-code.scss @@ -9,24 +9,17 @@ // CSS for the component but not for theming :host { @include osds-code-on-main-element() { - position: relative; - margin: 0; display: flex; - justify-content: space-between; @include osds-code-on-container-element() { - flex: 1 1 auto; - display: flex; - justify-content: flex-start; - align-items: flex-start; + flex-grow: 1; white-space: pre-line; } } -} -slot[name='copy'] { - display: flex; - margin: var(--ods-size-03); + ::slotted([slot="copy"]) { + flex-shrink: 0; + } } // apply the theme template for the component diff --git a/packages/stencil/components/code/src/components/osds-code/styles/osds-code.size.scss b/packages/stencil/components/code/src/components/osds-code/styles/osds-code.size.scss index 7a814c4a05..9daa703db9 100644 --- a/packages/stencil/components/code/src/components/osds-code/styles/osds-code.size.scss +++ b/packages/stencil/components/code/src/components/osds-code/styles/osds-code.size.scss @@ -2,16 +2,16 @@ @import './osds-code.mixins'; @mixin osds-code-theme-size() { - /** sizes */ - @include ods-foreach-theme-size(code) using ($sizes) { @include osds-code-on-selected-host() { border-radius: ods-get-size-property($sizes, border-radius); + margin: 0; // browser reset of
tag min-height: ods-get-size-properties($sizes, min-height); - padding: 0; + padding: ods-get-size-property($sizes, global-padding); + @include osds-code-on-container-element() { - padding: ods-get-size-property($sizes, padding-y) ods-get-size-property($sizes, padding-x); + padding: ods-get-size-property($sizes, code-padding); } } } diff --git a/packages/themes/blue-jeans/theme/theme.scss b/packages/themes/blue-jeans/theme/theme.scss index e6e509ebe0..e6e060e3fc 100644 --- a/packages/themes/blue-jeans/theme/theme.scss +++ b/packages/themes/blue-jeans/theme/theme.scss @@ -131,9 +131,9 @@ $code: ( md: ( border-radius: var(--ods-size-border-radius-01), - min-height: calc(2.75rem * var(--ods-size-ratio)), - padding-y: var(--ods-size-inline-05), - padding-x: var(--ods-size-inline-05) + min-height: var(--ods-size-09), + global-padding: var(--ods-size-inset-03), + code-padding: var(--ods-size-inset-04) ), ), $divider: ( diff --git a/packages/tools/storybook/stories/components/code/code.web-components.stories.ts b/packages/tools/storybook/stories/components/code/code.web-components.stories.ts index 83aea03a00..7c4458c108 100644 --- a/packages/tools/storybook/stories/components/code/code.web-components.stories.ts +++ b/packages/tools/storybook/stories/components/code/code.web-components.stories.ts @@ -53,7 +53,7 @@ Default.args = { }; const TemplateCopy = (args: any) => html` -+ ${unsafeHTML(args.codeContent)} `; export const Copy = TemplateCopy.bind({}); Copy.args = { ${unsafeHTML(args.codeContent)}