Skip to content

Commit

Permalink
feat: move dnb-ui-tags to themes
Browse files Browse the repository at this point in the history
BREAKING CHANGE:

`dnb-ui-tags` was moved form `/style/` to `/style/themes/theme-ui/`.
  • Loading branch information
tujoworker committed Mar 22, 2023
1 parent 119c366 commit a1e8434
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Packages such as:
- `dnb-ui-core`
- `dnb-ui-elements`
- `dnb-ui-tags`
- `dnb-ui-fonts` (moved to theme as well)
- `dnb-ui-fonts`

do not contain the properties anymore. Properties are only a part of a theme file, such as: `/style/themes/theme-ui/dnb-theme-ui.*`.

Expand Down Expand Up @@ -211,6 +211,10 @@ Stopped supporting Internet Explorer (IE), as Microsoft formally ended support f
Find the SCSS @mixin `fakeFocus` and replace it with `focusRing`.
Find the SCSS @mixin `removeFakeFocus` and replace it with `removeFocusRing`.

## CSS Packages

- `dnb-ui-tags` was moved form `/style` to `/style/themes/theme-ui`.

### Deprecations

- Helper class `.dnb-sr-only--inline` and SCSS mixin `srOnlyInline` was removed.
Expand Down
8 changes: 4 additions & 4 deletions packages/dnb-eufemia/scripts/prebuild/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
// runStyleFactory,
// convertSvgToJsx,
// makeLibStyles
// makeMainStyle
generateTypes,
makeMainStyle,
// generateTypes,
// makePropertiesFile
// prepareTemplates
// makeLibModules
Expand All @@ -35,8 +35,8 @@ const dev = async () => {
// await runStyleFactory()
// await convertSvgToJsx({ preventDelete })
// await makeLibStyles()
// await makeMainStyle()
await generateTypes()
await makeMainStyle()
// await generateTypes()
// await makePropertiesFile()
// await prepareTemplates()
// await makeLibModules()
Expand Down
13 changes: 0 additions & 13 deletions packages/dnb-eufemia/src/style/dnb-ui-tags.scss

This file was deleted.

5 changes: 3 additions & 2 deletions packages/dnb-eufemia/src/style/elements/blockquote.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*
*/

@use './ui-spacing.scss';
@import '../../elements/anchor/style/anchor-mixins.scss';

@mixin blockquoteStyle() {
Expand Down Expand Up @@ -117,7 +118,7 @@
@include blockquoteStyle();
}
.dnb-spacing blockquote {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
p:last-child {
margin-bottom: 0;
}
Expand All @@ -128,7 +129,7 @@
@include blockquoteStyle();
}
.dnb-spacing .dnb-blockquote {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
p:last-child {
margin-bottom: 0;
}
Expand Down
7 changes: 5 additions & 2 deletions packages/dnb-eufemia/src/style/elements/code.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
*
*/

@use './ui-spacing.scss';
@import '../core/utilities.scss';

@mixin codeStyle() {
display: inline-block;

Expand Down Expand Up @@ -59,7 +62,7 @@
}

.dnb-spacing pre {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}

&.dnb-pre--focus {
Expand Down Expand Up @@ -88,7 +91,7 @@
}

.dnb-spacing .dnb-pre {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}

.dnb-skeleton {
Expand Down
6 changes: 4 additions & 2 deletions packages/dnb-eufemia/src/style/elements/hr.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*
*/

@use './ui-spacing.scss';

@mixin hrStyle() {
position: relative;
padding: 0;
Expand Down Expand Up @@ -40,7 +42,7 @@
}

.dnb-spacing hr {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}
}

Expand Down Expand Up @@ -84,5 +86,5 @@
}

.dnb-spacing .dnb-hr {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}
7 changes: 5 additions & 2 deletions packages/dnb-eufemia/src/style/elements/lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
*
*/

@use './ui-spacing.scss';
@import '../core/utilities.scss';

@mixin listDefaults() {
& ul,
& ol {
Expand Down Expand Up @@ -174,7 +177,7 @@
}
}
@mixin listSpacing() {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
& > li {
margin-top: 1rem;
margin-bottom: 1rem;
Expand All @@ -192,7 +195,7 @@
}
}
@mixin dlSpacing() {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}
@mixin ulTag() {
ul {
Expand Down
6 changes: 4 additions & 2 deletions packages/dnb-eufemia/src/style/elements/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*
*/

@use './ui-spacing.scss';

@mixin headingDefaults() {
padding: 0;

Expand Down Expand Up @@ -317,7 +319,7 @@

p,
.dnb-core-style & p {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}
}
}
Expand Down Expand Up @@ -437,6 +439,6 @@ sub {

.dnb-p,
.dnb-core-style & .dnb-p {
@include defaultSpacing();
@include ui-spacing.defaultSpacing();
}
}
1 change: 0 additions & 1 deletion packages/dnb-eufemia/src/style/elements/ui-elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

// include spacings here, cause they are used in elements
@import './ui-spacing.scss';
@import './typography.scss';
@import './blockquote.scss';
@import './lists.scss';
Expand Down
31 changes: 0 additions & 31 deletions packages/dnb-eufemia/src/style/elements/ui-tags.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* CSS Package Test
*
*/

import { loadScss } from '../../../../core/jest/jestSetup'

describe('dnb-ui-tags.css', () => {
const scss = loadScss(require.resolve('../dnb-ui-tags.scss'))

it('should contain ".dnb-core-style blockquote"', () => {
expect(scss).toContain('.dnb-core-style blockquote')
})

it('should contain ".dnb-core-style ul"', () => {
expect(scss).toContain('.dnb-core-style ul')
})
})
38 changes: 38 additions & 0 deletions packages/dnb-eufemia/src/style/themes/theme-ui/dnb-ui-tags.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* HTML Element Tags
*
*/

@use '../../../elements/anchor/style/anchor-mixins.scss';
@use '../../elements/blockquote.scss';
@use '../../elements/typography.scss';
@use '../../elements/lists.scss';
@use '../../elements/label.scss';
@use '../../elements/form.scss';
@use '../../elements/code.scss';
@use '../../elements/image.scss';
@use '../../elements/hr.scss';

.dnb-core-style {
// div
@include anchor-mixins.anchorTag();
@include image.imageTag();
@include blockquote.blockquoteTag();
@include hr.hrTag();

// typography
@include typography.typographyTags();

// lists
@include lists.ulTag();
@include lists.olTag();
@include lists.dlTag();

// form
@include form.formTag();
@include label.labelTag();

// additional
@include code.codeTag();
@include code.preTag();
}

0 comments on commit a1e8434

Please sign in to comment.