Skip to content

Commit 20d57d6

Browse files
authored
feat(code-block): components theming with CSS-vars (#DS-2806) (#271)
1 parent df9afc7 commit 20d57d6

File tree

8 files changed

+532
-149
lines changed

8 files changed

+532
-149
lines changed

docs/guides/theming-2.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
- [button](/packages/components/button/button-tokens.scss)
6161
- [button-toggle](/packages/components/button-toggle/button-toggle-tokens.scss)
6262
- [checkbox,pseudo-checkbox](/packages/components/checkbox/checkbox-tokens.scss)
63+
- [code-block](/packages/components/code-block/code-block-tokens.scss)
6364
- [datepicker](/packages/components/datepicker/datepicker-tokens.scss)
6465
- [divider](/packages/components/divider/divider-tokens.scss)
6566
- [dropdown](/packages/components/dropdown/dropdown-tokens.scss)

packages/components/code-block/_code-block-theme.scss

Lines changed: 124 additions & 143 deletions
Large diffs are not rendered by default.

packages/components/code-block/code-block-tokens.scss

Lines changed: 400 additions & 0 deletions
Large diffs are not rendered by default.

packages/components/code-block/code-block.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const hasScroll = (element: HTMLElement) => {
6565
selector: 'kbq-code-block',
6666
exportAs: 'kbqCodeBlock',
6767
templateUrl: './code-block.component.html',
68-
styleUrls: ['./code-block.scss'],
68+
styleUrls: ['./code-block.scss', './code-block-tokens.scss'],
6969
host: {
7070
class: 'kbq-code-block',
7171
'[class.kbq-code-block_filled]': 'filled',

packages/components/code-block/code-block.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
@use 'sass:meta';
22
@use 'sass:map';
3-
@use '../core/styles/tokens';
43
@use '../core/styles/common/tokens' as *;
54

6-
$tokens: meta.module-variables(tokens) !default;
5+
@use './code-block-theme' as *;
76

87
$border-radius: kbq-css-variable(code-block-size-container-border-radius);
98
$border-width: kbq-css-variable(code-block-size-container-border-width);
@@ -199,3 +198,6 @@ $border-width: kbq-css-variable(code-block-size-container-border-width);
199198
border-radius: kbq-css-variable(button-size-border-radius);
200199
}
201200
}
201+
202+
@include kbq-code-block-theme();
203+
@include kbq-code-block-typography();

packages/components/core/styles/_koobiq-theme.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
@use 'theming/scrollbar-theme' as *;
77

8-
@use '../../code-block/code-block-theme' as *;
98
@use '../../empty-state/empty-state-theme' as *;
109
@use '../../file-upload/file-upload-theme' as *;
1110
@use '../../link/link-theme' as *;
@@ -40,7 +39,6 @@
4039
@mixin koobiq-theme($theme) {
4140
@include kbq-core-theme($theme);
4241

43-
@include kbq-code-block-theme($theme);
4442
@include kbq-dl-theme($theme);
4543
@include kbq-empty-state-theme($theme);
4644
@include kbq-file-upload-theme($theme);
@@ -86,7 +84,6 @@
8684
@include kbq-base-typography();
8785
@include kbq-markdown-base-typography();
8886

89-
@include kbq-code-block-typography($config);
9087
@include kbq-empty-state-typography($config);
9188
@include kbq-dl-typography($config);
9289
@include kbq-file-upload-typography($config);

tools/tokens/build-each-component.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const componentsWithCss = [
2020
'button',
2121
'button-toggle',
2222
'checkbox',
23+
'code-block',
2324
'datepicker',
2425
'divider',
2526
'dropdown',

tools/tokens/utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const { formatHelpers } = require('style-dictionary');
55
const filter = {
66
autocomplete: 'select-panel-dropdown',
77
button: 'kbq-states-focused-color',
8+
'code-block': 'kbq-states-focused-color',
89
'pseudo-checkbox': 'checkbox',
910
datepicker: 'states-foreground-disabled',
1011
dropdown: ['kbq-list', 'foreground-contrast-secondary'],

0 commit comments

Comments
 (0)