From 46075f6582544661b0bb4500e07891599bd0beaf Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Wed, 16 Nov 2022 09:39:48 +0100 Subject: [PATCH 01/13] refactor: updated DB UI Base dependency --- package-lock.json | 20 +++++++++++++------- package.json | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f6ab2a3bca..2a412343980 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.0.0", - "@db-ui/base": "2.0.0-5-6db143b" + "@db-ui/base": "2.0.0-6-465c73a" }, "devDependencies": { "@babel/cli": "^7.19.3", @@ -2237,9 +2237,12 @@ } }, "node_modules/@db-ui/base": { - "version": "2.0.0-5-6db143b", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-5-6db143b.tgz", - "integrity": "sha512-e6w4XIHULsLusIy3WHHi0AOpJYWsTDQZgIMPYylFgwbTkN8oHexkzMbafOyZbaZmF8+hOzfcfcFOFY37+bfPsw==" + "version": "2.0.0-6-465c73a", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-6-465c73a.tgz", + "integrity": "sha512-q2StHD4+Z/hyR6EDnnUzfC1TI9MqvAUXtoGTbQPn2cvm/qTBZW0qADqqpdLp0WuE0eB6Tv5uRJrw9MDKeCmuGA==", + "dependencies": { + "@csstools/normalize.css": "^12.0.0" + } }, "node_modules/@eslint/eslintrc": { "version": "1.3.2", @@ -18586,9 +18589,12 @@ "requires": {} }, "@db-ui/base": { - "version": "2.0.0-5-6db143b", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-5-6db143b.tgz", - "integrity": "sha512-e6w4XIHULsLusIy3WHHi0AOpJYWsTDQZgIMPYylFgwbTkN8oHexkzMbafOyZbaZmF8+hOzfcfcFOFY37+bfPsw==" + "version": "2.0.0-6-465c73a", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-6-465c73a.tgz", + "integrity": "sha512-q2StHD4+Z/hyR6EDnnUzfC1TI9MqvAUXtoGTbQPn2cvm/qTBZW0qADqqpdLp0WuE0eB6Tv5uRJrw9MDKeCmuGA==", + "requires": { + "@csstools/normalize.css": "^12.0.0" + } }, "@eslint/eslintrc": { "version": "1.3.2", diff --git a/package.json b/package.json index 696e72c1b41..ee042e42187 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.0.0", - "@db-ui/base": "2.0.0-5-6db143b" + "@db-ui/base": "2.0.0-6-465c73a" }, "devDependencies": { "@babel/cli": "^7.19.3", From de42b8e23bc7989f5ee48ba8d0b189f3808132a1 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Wed, 16 Nov 2022 12:20:56 +0100 Subject: [PATCH 02/13] refactor: removed some obsolete SCSS files that contents have been moved to DB UI Base (and others that aren't relevant that for any more) --- source/_patterns/00-base/colors/_colors.scss | 2 - .../00-base/colors/_colors.variables.scss | 3 - .../colors/enterprise/_colors.variables.scss | 2 - .../00-base/colors/enterprise/colors.scss | 2 - .../icons/_icons.attributes-mappings.scss | 14 - .../icons/_icons.custom-properties.scss | 33 -- .../00-base/icons/_icons.font-faces.scss | 37 -- .../00-base/icons/_icons.helpers.scss | 98 ---- .../00-base/icons/_icons.placeholder.scss | 45 -- .../00-base/icons/_icons.variables.scss | 442 ------------------ .../enterprise/_icons.custom-properties.scss | 50 -- .../icons/enterprise/_icons.font-faces.scss | 37 -- .../icons/enterprise/_icons.variables.scss | 86 ---- .../00-base/icons/enterprise/icons.scss | 5 - source/_patterns/00-base/icons/icons.scss | 35 -- .../type/enterprise/_fonts.demonstration.scss | 0 .../00-base/type/enterprise/fonts.scss | 2 - source/css/helpers/_a11y.scss | 8 - source/css/helpers/_clearfix.scss | 5 - source/css/helpers/_functions.scss | 33 -- 20 files changed, 939 deletions(-) delete mode 100644 source/_patterns/00-base/colors/_colors.scss delete mode 100644 source/_patterns/00-base/colors/_colors.variables.scss delete mode 100644 source/_patterns/00-base/colors/enterprise/_colors.variables.scss delete mode 100644 source/_patterns/00-base/colors/enterprise/colors.scss delete mode 100644 source/_patterns/00-base/icons/_icons.attributes-mappings.scss delete mode 100644 source/_patterns/00-base/icons/_icons.custom-properties.scss delete mode 100644 source/_patterns/00-base/icons/_icons.font-faces.scss delete mode 100644 source/_patterns/00-base/icons/_icons.helpers.scss delete mode 100644 source/_patterns/00-base/icons/_icons.placeholder.scss delete mode 100644 source/_patterns/00-base/icons/_icons.variables.scss delete mode 100644 source/_patterns/00-base/icons/enterprise/_icons.custom-properties.scss delete mode 100644 source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss delete mode 100644 source/_patterns/00-base/icons/enterprise/_icons.variables.scss delete mode 100644 source/_patterns/00-base/icons/enterprise/icons.scss delete mode 100644 source/_patterns/00-base/icons/icons.scss delete mode 100644 source/_patterns/00-base/type/enterprise/_fonts.demonstration.scss delete mode 100644 source/_patterns/00-base/type/enterprise/fonts.scss delete mode 100644 source/css/helpers/_a11y.scss delete mode 100644 source/css/helpers/_clearfix.scss delete mode 100644 source/css/helpers/_functions.scss diff --git a/source/_patterns/00-base/colors/_colors.scss b/source/_patterns/00-base/colors/_colors.scss deleted file mode 100644 index 0576562c88a..00000000000 --- a/source/_patterns/00-base/colors/_colors.scss +++ /dev/null @@ -1,2 +0,0 @@ -// * Attention ! Please expect that these declarations will get moved to DB UI Base sooner than later for easier consumption -@import "colors.variables"; diff --git a/source/_patterns/00-base/colors/_colors.variables.scss b/source/_patterns/00-base/colors/_colors.variables.scss deleted file mode 100644 index b5b29284402..00000000000 --- a/source/_patterns/00-base/colors/_colors.variables.scss +++ /dev/null @@ -1,3 +0,0 @@ -// * Marketingportal brand colors - -@import "@db-ui/base/build/scss/variables"; diff --git a/source/_patterns/00-base/colors/enterprise/_colors.variables.scss b/source/_patterns/00-base/colors/enterprise/_colors.variables.scss deleted file mode 100644 index 1761f91314a..00000000000 --- a/source/_patterns/00-base/colors/enterprise/_colors.variables.scss +++ /dev/null @@ -1,2 +0,0 @@ -// DB colors -@import "../colors.variables"; diff --git a/source/_patterns/00-base/colors/enterprise/colors.scss b/source/_patterns/00-base/colors/enterprise/colors.scss deleted file mode 100644 index 6ce2535f681..00000000000 --- a/source/_patterns/00-base/colors/enterprise/colors.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "colors.variables"; -@import "../colors"; diff --git a/source/_patterns/00-base/icons/_icons.attributes-mappings.scss b/source/_patterns/00-base/icons/_icons.attributes-mappings.scss deleted file mode 100644 index 459eaf5665d..00000000000 --- a/source/_patterns/00-base/icons/_icons.attributes-mappings.scss +++ /dev/null @@ -1,14 +0,0 @@ -// @import "icons.variables"; - -// *** Attribute based method *** -@each $icon-name, $icon-glyph in $icon-glyphs { - [data-icon="#{$icon-name}"], - [data-icon-before="#{$icon-name}"] { - &::before { - --icon-glyph: "#{$icon-glyph}"; - } - } - [data-icon-after="#{$icon-name}"]::after { - --icon-glyph: "#{$icon-glyph}"; - } -} diff --git a/source/_patterns/00-base/icons/_icons.custom-properties.scss b/source/_patterns/00-base/icons/_icons.custom-properties.scss deleted file mode 100644 index 4b58c9c7c09..00000000000 --- a/source/_patterns/00-base/icons/_icons.custom-properties.scss +++ /dev/null @@ -1,33 +0,0 @@ -@import "icons.variables"; - -// TODO: The following construct was especially meant to enable a branch (EDS & FV) specific result - probably we could refactor this the sooner the later -[data-icon]:not([data-icon-variant]), -[data-icon-before]:not([data-icon-variant-before]) { - &::before { - @extend %defaultIconCustomProperties !optional; - } -} - -[data-icon-after]:not([data-icon-variant-after]) { - &::after { - @extend %defaultIconCustomProperties !optional; - } -} - -// DB UX Icons -@each $icon-style, $icon-sizes in $icon-font-families-personenverkehr { - @each $icon-size, $icon-categories in $icon-sizes { - [data-icon-variant="#{$icon-size}-#{$icon-style}"], - [data-icon-variant-before="#{$icon-size}-#{$icon-style}"] { - &[data-icon], - &[data-icon-before] { - @include iconMeta($icon-size, $icon-style); - } - } - [data-icon-variant-after="#{$icon-size}-#{$icon-style}"] { - &[data-icon-after] { - @include iconMeta($icon-size, $icon-style, "after"); - } - } - } -} diff --git a/source/_patterns/00-base/icons/_icons.font-faces.scss b/source/_patterns/00-base/icons/_icons.font-faces.scss deleted file mode 100644 index c9801c03f5c..00000000000 --- a/source/_patterns/00-base/icons/_icons.font-faces.scss +++ /dev/null @@ -1,37 +0,0 @@ -@import "../../../css/db-ui-core.variables"; - -@import "icons.variables"; - -// Potential TODO: usage of the standard filenames described by https://marketingportal.extranet.deutschebahn.com/de/icons-2 - -@font-face { - font-display: block; - font-family: "missing-icons"; - src: url("#{$icons-path}functional/fonts/icons-empty.woff2?4r2095") - format("woff2"), - url("#{$icons-path}functional/fonts/icons-empty.woff?4r2095") - format("woff"); -} - -// DB UX Icons -@each $icon-style, $icon-sizes in $icon-font-families-personenverkehr { - @each $icon-size, $icon-categories in $icon-sizes { - @each $icon-category, $icon-font-unicodes in $icon-categories { - @font-face { - $icon-font-family: "icons-" + $icon-size + "-" + $icon-style; - - font-display: block; - - font-family: $icon-font-family; - font-style: normal; - font-weight: normal; - src: url("#{$icons-path}functional/fonts/#{$icon-font-family+ "-" + $icon-category}.woff2?4r2095") - format("woff2"), - url("#{$icons-path}functional/fonts/#{$icon-font-family+ "-" + $icon-category}.woff?4r2095") - format("woff"); - - unicode-range: unquote($icon-font-unicodes); - } - } - } -} diff --git a/source/_patterns/00-base/icons/_icons.helpers.scss b/source/_patterns/00-base/icons/_icons.helpers.scss deleted file mode 100644 index 2884e301d65..00000000000 --- a/source/_patterns/00-base/icons/_icons.helpers.scss +++ /dev/null @@ -1,98 +0,0 @@ -// Icon SCSS mixin -@mixin icon( - $glyph: "", - $size: $icon-size, - $style: $icon-style, - $position: "before", - $partial: false -) { - &::#{$position} { - --icon-font-family: "#{"icons-" + $size + "-" + $style}", - "missing-icons" !important; - --icon-font-size: #{to-rem($pxValue: $size)}; - - @if $position == "before" { - margin-inline-end: var(--icon-margin-after, #{$icon-content-space}); - } - @if $position == "after" { - margin-inline-start: var( - --icon-margin-before, - #{$icon-content-space} - ); - } - - @if $glyph != "" { - --icon-glyph: "#{$glyph}"; - } - @if $partial { - content: var(--icon-glyph); - display: inline-block; - /*** icon - partial ***/ - // * use !important to prevent issues with browser extensions that change fonts - font-family: var(--icon-font-family) !important; - - font-size: var(--icon-font-size); - font-style: normal; - font-variant: normal; - - font-weight: normal; // CSS variables fallback - font-weight: var(--icon-font-weight, normal); - line-height: 1; - text-transform: none; - vertical-align: middle; - - /* stylelint-disable */ - // * Better Font Rendering =========== - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - /* stylelint-enable */ - - // Hiding icon from screenreaders - @supports (content: ""/"") { - content: var(--icon-glyph) / ""; // https://www.w3.org/TR/css-content-3/#alt - } - /* stylelint-disable */ - -webkit-alt: ""; - /* stylelint-enable */ - alt: ""; - speak: none; - @media aural { - content: none; - } - @media speech { - content: none; - } - } @else { - @extend %icon !optional; - } - } -} - -// SCSS mixin for elements that text should get hidden in favour of only displaying the included icon -@mixin is-icon-text-replace($position: "before") { - font-size: 0; - - @if $position == "before" { - &::before { - --icon-margin-after: 0; - } - } @else { - &::after { - --icon-margin-before: 0; - } - } -} - -// Icon glyph mixin -@function glyph($glyph) { - @return map-get($icon-glyphs, $glyph); -} - -// Icon meta data mixin -@mixin iconMeta($size: $icon-size, $style: $icon-style, $position: "before") { - &::#{$position} { - --icon-font-family: "#{"icons-" + $size + "-" + $style}", - "missing-icons" !important; - --icon-font-size: #{to-rem($pxValue: $size)}; - } -} diff --git a/source/_patterns/00-base/icons/_icons.placeholder.scss b/source/_patterns/00-base/icons/_icons.placeholder.scss deleted file mode 100644 index ebcb128cc36..00000000000 --- a/source/_patterns/00-base/icons/_icons.placeholder.scss +++ /dev/null @@ -1,45 +0,0 @@ -%icon { - // Hiding icon from screenreaders - -webkit-alt: ""; - alt: ""; - - content: var(--icon-glyph); - - display: inline-block; - /*** icon - placeholder ***/ - // * use !important to prevent issues with browser extensions that change fonts - font-family: var(--icon-font-family) !important; - - font-size: var(--icon-font-size); - - // * Better Font Rendering =========== - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - font-style: normal; - font-variant: normal; - font-weight: normal; // CSS variables fallback - font-weight: var(--icon-font-weight, normal); - line-height: 1; - speak: none; // Hiding icon from screenreaders - text-transform: none; - - vertical-align: middle; - - // Hiding icon from screenreaders - @supports (content: ""/"") { - content: var(--icon-glyph) / ""; // https://www.w3.org/TR/css-content-3/#alt - } - @media aural { - content: none; - } - @media speech { - content: none; - } -} - -// TODO: The following construct was especially meant to enable a branch (EDS & FV) specific result - probably we could refactor this the sooner the later -%defaultIconCustomProperties { - --icon-font-family: #{$icons-font-family} !important; - --icon-font-size: #{to-rem($pxValue: $icon-size)}; -} diff --git a/source/_patterns/00-base/icons/_icons.variables.scss b/source/_patterns/00-base/icons/_icons.variables.scss deleted file mode 100644 index 29738105c75..00000000000 --- a/source/_patterns/00-base/icons/_icons.variables.scss +++ /dev/null @@ -1,442 +0,0 @@ -@import "../../../css/helpers/functions"; - -// Default parameters -$icon-size: 24 !default; -$icon-style: "outline" !default; -$icons-font-family: '#{"icons-" + $icon-size + "-" + $icon-style}, "missing-icons"' !default; -$icon-content-space: to-rem( - $pxValue: 6 -) !default; - -$icon-glyphs-personenverkehr: ( - "account": "\1f642", - "add": "\002B", - "add-circle": "\2295", - "air-condition": "\2744", - "alarm": "\23F0", - "alarm-add": "\e1062", - "alert": "\1F514", - "alert-off": "\1F515", - "calendar": "\1F4C6", - "check-circle": "\2705", - "credit-card": "\1F4B3", - "delete": "\1F5D1", - "discount": "\e1066", - "document": "\1F5B9", - "done": "\2713", - "download": "\2B73", - "edit": "\270F", - "filter": "\e1069", - "generic-card": "\e1070", - "giftcard": "\1F381", - "heart": "\2661", - "help": "\003F", - "info": "\1F6C8", - "legal": "\00A7", - "log-out": "\21A6", - "minus": "\2212", - "print": "\1F5A8", - "remove": "\229D", - "schedule": "\1F553", - "search": "\1F50D", - "send": "\25F9", - "settings": "\2699", - "share": "\e1077", - "shopping-bag": "\1F6CD", - "shopping-basket": "\e1079", - "shopping-cart": "\1F6D2", - "star": "\2606", - "swap-horizontal": "\21C6", - "swap-vertical": "\21F5", - "upload": "\e1081", - "visibility": "\1F441", - "visibility-off": "\e1082", - "website": "\1F310", - "zoom-in": "\e1083", - "zoom-out": "\e1084", - "fast-backward-10": "\e1085", - "fast-backward-30": "\e1086", - "fast-backward-empty": "\293A", - "fast-forward-10": "\e1087", - "fast-forward-30": "\e1088", - "fast-forward-empty": "\293B", - "pause": "\23F8", - "play": "\25B7", - "skip-backward": "\23EE", - "skip-forward": "\23ED", - "stop": "\25A1", - "subtitles": "\e1091", - "volume-down": "\1F509", - "volume-mute": "\1F508", - "volume-off": "\1F507", - "volume-up": "\1F50A", - "call": "\1F4DE", - "chat": "\1F4AC", - "conversation": "\e1095", - "fax": "\1F5B7", - "feedback": "\2370", - "mail": "\2709", - "mobile-off": "\1F4F4", - "mobile-phone": "\1F4F1", - "wifi": "\e1098", - "wifi-off": "\e1149", - "mask": "\1F637", - "wc": "\1F6BB", - "wc-men": "\1F6B9", - "wc-sign": "\1F6BE", - "wc-woman": "\1F6BA", - "entry-aid": "\e1150", - "luggage-rack": "\1F9F3", - "medical": "\271A", - "power-outlet": "\1F50C", - "coffee-cup": "\2615", - "drink": "\e1101", - "restaurant": "\1F37D", - "1st-class": "\2488", - "2nd-class": "\2489", - "alternative-connection": "\e1102", - "booking": "\e1103", - "capacity-indicator": "\e1104", - "capacity-indicator-fully-booked": "\e1106", - "capacity-indicator-high": "\e1108", - "capacity-indicator-low": "\e1110", - "destination": "\1F4CD", - "intermediary-stop": "\e1113", - "round-trip": "\2B94", - "single-trip": "\291E", - "start": "\29BF", - "home": "\2302", - "map": "\1F5FA", - "map-stop": "\e1115", - "place": "\e1116", - "set-position": "\1F78B", - "trainstation": "\1F689", - "arrow-back": "\2190", - "arrow-down": "\2193", - "arrow-forward": "\2192", - "arrow-up": "\2191", - "cancel": "\2BBE", - "chevron-left": "\003C", - "chevron-right": "\003E", - "close": "\2A2F", - "expand-less": "\2303", - "expand-more": "\2304", - "fullscreen": "\e1119", - "fullscreen-exit": "\e1120", - "grid-view": "\1030E", - "link": "\1F862", - "link-external": "\1F865", - "list": "\e1121", - "menu": "\e1122", - "more-horizontal": "\22EF", - "more-vertical": "\22EE", - "refresh": "\1F5D8", - "error": "\e1123", - "error-triangle": "\26A0", - "notify": "\e1126", - "notify-cutoff": "\e1127", - "aisle": "\1F4BA", - "elderly": "\e1128", - "handicapped": "\267F", - "table": "\e1129", - "window": "\e1130", - "bahnbonus": "\e1131", - "bahnbonus-card": "\e1132", - "bahncard": "\e1134", - "commuter-ticket": "\e1136", - "komfort-check-in": "\e1137", - "komfort-check-in-check": "\2714", - "komfort-check-in-circle": "\1F907", - "my-travel": "\e1138", - "outward-journey": "\e1139", - "qr-code": "\e1140", - "return-journey": "\e1141", - "ticket": "\1F3AB", - "ticket-discount": "\e1142", - "ticket-multiple": "\e1143", - "time-outward-journey": "\e1144", - "time-return-journey": "\e1145", - "timetable": "\e1146", - "bicycle": "\1F6B2", - "car": "\e1151", - "car-sequence": "\e1147", - "ice-side-view": "\1F684", - "sprinter": "\e1148", - "walking": "\1F6B6", - "logo": "\e1152", - "buggy": "\e1153", - "childrens-compartment": "\1F37C", - "parent-child-compartment": "\1F46A", - "quiet-zone": "\1F92B", - "duplicate": "\e1154", - "image": "\1F5BC", - "lock-close": "\1F512", - "lock-open": "\1F513", - "restricted-mobility-toilet": "\e1163", - "shopping-basket-disabled": "\e1155", - "shopping-cart-disabled": "\e1156", - "gps": "\e1157", - "gps-north": "\e1158", - "local-train": "\1F688", - "rail-and-fly": "\e1159", - "seat-priority": "\e1162", - "standing-room": "\e1160", - "mixed-class": "\e1161", - "transportation-train-ec": "\e900", - "transportation-train-ic": "\e901", - "transportation-train-ice": "\e902", - "transportation-train-rb": "\e903", - "transportation-train-re": "\e904", - "transportation-bikesharing": "\e905", - "transportation-bus-local": "\e906", - "transportation-carsharing": "\e907", - "transportation-bus-long-distance": "\e908", - "transportation-airplane": "\e909", - "transportation-s-bahn": "\e90a", - "transportation-ship": "\e90b", - "transportation-taxi": "\e90c", - "transportation-train-tram": "\e90d", - "transportation-underground": "\e90e", - "transportation-walking": "\e90f" -) !default; - -$icon-font-families-personenverkehr: ( - "outline": ( - 16: ( - "action": ( - "U+002B,U+2713,U+2212" - ), - "navigation": ( - "U+003C,U+003E,U+2A2F,U+2303,U+2304" - ) - ), - 20: ( - "action": ( - "U+1f642,U+e1062,U+e1066,U+e1069-e1070,U+e1077,U+e1079,U+e1081-e1084,U+002B,U+2295,U+23F0,U+1F514-1F515,U+1F4C6,U+2705,U+1F4B3,U+1F5D1,U+1F5B9,U+2713,U+2B73,U+270F,U+1F381,U+2661,U+003F,U+1F6C8,U+00A7,U+21A6,U+2212,U+1F5A8,U+229D,U+1F553,U+1F50D,U+25F9,U+2699,U+1F6CD,U+1F6D2,U+2606,U+21C6,U+21F5,U+1F441,U+1F310,U+e1154,U+1F5BC,U+1F512,U+1F513,U+e1155,U+e1156" - ), - "av": ( - "U+e1085-e1088,U+e1091,U+293A,U+293B,U+23F8,U+25B7,U+23EE,U+23ED,U+25A1,U+1F507-1F509,U+1F50A" - ), - "brand": ( - "U+e1152" - ), - "communication": ( - "U+1F4DE,U+e1095,U+e1098,U+e1149,U+1F4AC,U+1F5B7,U+2370,U+2709,U+1F4F4,U+1F4F1" - ), - "covid-19": ( - "U+1F637" - ), - "facilities": ( - "U+1F6BB,U+1F6B9,U+1F6BE,U+1F6BA,U+e1163" - ), - "feature": ( - "U+1F9F3,U+271A,U+1F50C,U+e1150,U+e1153,U+e1160,U+2744" - ), - "food": ( - "U+2615,U+e1101,U+1F37D" - ), - "journey": ( - "U+2488,U+2489,U+e1102-e1104,U+e1106,U+e1108,U+e1110,U+e1113,U+1F4CD,U+2B94,U+291E,U+29BF,U+e1161" - ), - "maps": ( - "U+2302,U+e1115-e1116,U+1F5FA,U+1F78B,U+1F689,U+e1157" - ), - "navigation": ( - "U+2190-2193,U+2BBE,U+e1119-e1122,U+003C,U+003E,U+2A2F,U+2303,U+2304,U+1030E,U+1F862,U+1F865,U+22EF,U+22EE,U+1F5D8" - ), - "notification": ( - "U+e1123,U+26A0,U+e1126,U+e1127" - ), - "seat": ( - "U+e1128-e1130,U+1F4BA,U+267F,U+1F37C,U+1F46A,U+1F92B,U+e1162" - ), - "ticket": ( - "U+e1131-e1132,U+e1134,U+e1136-e1146,U+2714,U+1F907,U+1F3AB" - ), - "transportation": ( - "U+1F6B2,U+e1147,U+e1151,U+1F684,U+e1148,U+1F6B6,U+1F688,U+e1159" - ) - ), - 24: ( - "action": ( - "U+1f642,U+002B,U+2295,U+23F0,U+e1062,U+1F514-1F515,U+1F4C6,U+2705,U+1F4B3,U+1F5D1,U+e1066,U+1F5B9,U+2713,U+2B73,U+270F,U+e1069,U+e1070,U+1F381,U+2661,U+003F,U+1F6C8,U+00A7,U+21A6,U+2212,U+1F5A8,U+229D,U+1F553,U+1F50D,U+25F9,U+2699,U+e1077,U+1F6CD,U+e1079,U+1F6D2,U+2606,U+21C6,U+21F5,U+e1081,U+1F441,U+e1082,U+1F310,U+e1083,U+e1084,U+e1154,U+1F512,U+1F513,U+e1155,U+e1156" - ), - "av": ( - "U+e1085,U+e1086,U+293A,U+e1087,U+e1088,U+293B,U+23F8,U+25B7,U+23EE,U+23ED,U+25A1,U+e1091,U+1F509,U+1F508,U+1F507,U+1F50A" - ), - "brand": ( - "U+e1152" - ), - "communication": ( - "U+1F4DE,U+1F4AC,U+e1095,U+1F5B7,U+2370,U+2709,U+1F4F4,U+1F4F1,U+e1098,U+e1149" - ), - "covid-19": ( - "U+1F637" - ), - "facilities": ( - "U+1F6BB,U+1F6B9,U+1F6BE,U+1F6BA,U+e1163" - ), - "feature": ( - "U+1F9F3,U+271A,U+1F50C,U+e1150,U+e1153,U+e1160,U+2744" - ), - "food": ( - "U+2615,U+e1101,U+1F37D" - ), - "journey": ( - "U+2488-2489,U+e1102-e1104,U+e1106,U+e1108,U+e1110,U+1F4CD,U+e1113,U+2B94,U+291E,U+29BF,U+e1161" - ), - "maps": ( - "U+2302,U+1F5FA,U+e1115,U+e1116,U+1F78B,U+1F689,U+e1157" - ), - "navigation": ( - "U+2190-2193,U+2BBE,U+003C,U+003E,U+2A2F,U+2303,U+2304,U+e1119,U+e1120,U+1030E,U+1F862,U+1F865,U+e1121,U+e1122,U+22EF,U+22EE,U+1F5D8" - ), - "notification": ( - "U+e1123-e1127,U+26A0" - ), - "seat": ( - "U+1F4BA,U+e1128-e1130,U+267F,U+1F37C,U+1F46A,U+1F92B,U+e1162" - ), - "ticket": ( - "U+e1131-e1146,U+2714,U+1F907,U+1F3AB" - ), - "transportation": ( - "U+1F6B2,U+e1147,U+e1151,U+1F684,U+e1148,U+1F6B6,U+1F688,U+e1159" - ) - ), - 32: ( - "action": ( - "U+1f642,U+2295,U+002B,U+e1062,U+e1064-e1084,U+23F0,U+1F514-1F515,U+1F4C6,U+2705,U+1F4B3,U+1F5D1,U+1F5B9,U+2713,U+2B73,U+270F,U+1F381,U+2661,U+003F,U+1F6C8,U+00A7,U+21A6,U+2212,U+1F5A8,U+229D,U+1F553,U+1F50D,U+25F9,U+2699,U+1F6CD,U+1F6D2,U+2606,U+21C6,U+21F5,U+1F441,U+1F310,U+e1154,U+1F512,U+1F513,U+e1155,U+e1156" - ), - "av": ( - "U+e1085-e1088,U+e1091,U+293A,U+293B,U+23F8,U+25B7,U+23EE,U+23ED,U+25A1,U+1F509,U+1F508,U+1F507,U+1F50A" - ), - "brand": ( - "U+e1152" - ), - "communication": ( - "U+1F4DE,U+1F4AC,U+e1095,U+1F5B7,U+2370,U+2709,U+1F4F4,U+1F4F1,U+e1098,U+e1149" - ), - "covid-19": ( - "U+1F637" - ), - "facilities": ( - "U+1F6B9,U+1F6BE,U+1F6BA,U+1F6BB,U+e1163" - ), - "feature": ( - "U+1F9F3,U+271A,U+1F50C,U+e1150,U+e1153,U+e1160,U+2744" - ), - "food": ( - "U+2615,U+e1101,U+1F37D" - ), - "journey": ( - "U+2488,U+2489,U+e1102-e1110,U+1F4CD,U+e1113,U+2B94,U+291E,U+29BF,U+e1161" - ), - "maps": ( - "U+2302,U+1F5FA,U+e1116,U+1F78B,U+e1115,U+1F689,U+e1157" - ), - "navigation": ( - "U+2190-2193,U+e1119-e1122,U+2BBE,U+003C,U+003E,U+2A2F,U+2303,U+2304,U+1030E,U+1F865,U+1F862,U+22EF,U+22EE,U+1F5D8" - ), - "notification": ( - "U+26A0,U+e1123-e1127" - ), - "seat": ( - "U+1F4BA,U+e1128-e1130,U+267F,U+1F37C,U+1F46A,U+1F92B,U+e1162" - ), - "ticket": ( - "U+e1131-e1146,U+2714,U+1F907,U+1F3AB" - ), - "transportation": ( - "U+1F6B2,U+e1147,U+e1151,U+1F684,U+e1148,U+1F6B6,U+1F688,U+e1159" - ) - ), - 48: ( - "av": ( - "U+23F8,U+25B7" - ) - ), - 64: ( - "av": ( - "U+23F8,U+25B7" - ) - ) - ), - "filled": ( - 20: ( - "action": ( - "U+1f642,U+2295,U+1F514,U+2705,U+1F4B3,U+e1066,U+270F,U+e1070,U+003F,U+1F6C8,U+1F5A8,U+229D,U+1F553,U+1F6CD,U+e1079,U+2661,U+2606,U+e1154,U+1F5BC,U+1F512,U+1F513,U+e1155" - ), - "av": ( - "U+25B7,U+23EE,U+23ED,U+25A1,U+e1091" - ), - "communication": ( - "U+1F4DE,U+1F4AC,U+e1095,U+2370" - ), - "feature": ( - "U+271A" - ), - "food": ( - "U+2615" - ), - "journey": ( - "U+e1104,U+e1106,U+e1108,U+e1110,U+1F4CD" - ), - "maps": ( - "U+2302,U+e1116,U+e1157,U+e1158" - ), - "navigation": ( - "U+2BBE" - ), - "notification": ( - "U+e1123,U+26A0" - ), - "ticket": ( - "U+e1132,U+e1134" - ) - ), - 24: ( - "action": ( - "U+1F514,U+2661,U+2606" - ), - "av": ( - "U+25B7,U+25A1,U+23EE,U+23ED" - ), - "journey": ( - "U+e1104,U+e1106,U+e1108,U+e1110,U+1F4CD" - ), - "maps": ( - "U+e1157,U+e1158" - ), - "navigation": ( - "U+2BBE" - ) - ), - 32: ( - "action": ( - "U+1F514,U+2661,U+2606" - ), - "av": ( - "U+25B7,U+23EE,U+23ED,U+25A1" - ), - "maps": ( - "U+e1157,U+e1158" - ), - "navigation": ( - "U+2BBE" - ) - ), - 48: ( - "av": ( - "U+25B7" - ) - ), - 64: ( - "av": ( - "U+25B7" - ) - ) - ) -) !default; - -$icon-glyphs: $icon-glyphs-personenverkehr !default; diff --git a/source/_patterns/00-base/icons/enterprise/_icons.custom-properties.scss b/source/_patterns/00-base/icons/enterprise/_icons.custom-properties.scss deleted file mode 100644 index 8216337d247..00000000000 --- a/source/_patterns/00-base/icons/enterprise/_icons.custom-properties.scss +++ /dev/null @@ -1,50 +0,0 @@ -// Branch specific icon styles -@each $icon-domain, $icon-families in $icon-font-families { - @each $icon-style, $icon-font-sizes in $icon-families { - @if $icon-font-sizes { - @each $icon-size in $icon-font-sizes { - [data-icon-variant="#{$icon-size}-#{$icon-domain}-#{$icon-style}"], - [data-icon-variant-before="#{$icon-size}-#{$icon-domain}-#{$icon-style}"] { - &[data-icon], - &[data-icon-before] { - &::before { - --icon-font-family: "#{"icons-" + $icon-size + "-" + $icon-domain + "-" + $icon-style}", - "missing-icons" !important; - --icon-font-size: #{to-rem($pxValue: $icon-size)}; - } - } - } - [data-icon-variant-after="#{$icon-size}-#{$icon-domain}-#{$icon-style}"] { - &[data-icon-after] { - &::after { - --icon-font-family: "#{"icons-" + $icon-size + $icon-domain + "-" + "-" + $icon-style}", - "missing-icons" !important; - --icon-font-size: #{to-rem($pxValue: $icon-size)}; - } - } - } - } - } @else { - [data-icon-variant="#{$icon-domain}-#{$icon-style}"], - [data-icon-variant-before="#{$icon-domain}-#{$icon-style}"] { - &[data-icon], - &[data-icon-before] { - &::before { - --icon-font-family: "#{"icons-" + $icon-domain + "-" + $icon-style}", - "missing-icons" !important; - --icon-font-size: #{to-rem($pxValue: 16)}; - } - } - } - [data-icon-variant-after="#{$icon-domain}-#{$icon-style}"] { - &[data-icon-after] { - &::after { - --icon-font-family: "#{"icons-" + $icon-domain + "-" + $icon-style}", - "missing-icons" !important; - --icon-font-size: #{to-rem($pxValue: 16)}; - } - } - } - } - } -} diff --git a/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss b/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss deleted file mode 100644 index cd3f8f60548..00000000000 --- a/source/_patterns/00-base/icons/enterprise/_icons.font-faces.scss +++ /dev/null @@ -1,37 +0,0 @@ -// Generate the different font families -@each $icon-domain, $icon-families in $icon-font-families { - @if $icon-domain != "personenverkehr-legacy" { - $icons-path: $icons-path + $icon-domain + "/"; - } - @each $icon-style, $icon-font-sizes in $icon-families { - @if $icon-font-sizes { - @each $icon-size in $icon-font-sizes { - @font-face { - $icon-font-family: "icons-" + $icon-size + "-" + - $icon-domain + "-" + $icon-style; - - font-display: block; - - font-family: $icon-font-family; - font-style: normal; - font-weight: normal; - src: url("#{$icons-path}functional/fonts/#{$icon-font-family}.woff2?4r2095") - format("woff2"), - url("#{$icons-path}functional/fonts/#{$icon-font-family}.woff?4r2095") - format("woff"); - } - } - } @else { - @font-face { - font-display: block; - font-family: $icon-style; - font-style: normal; - font-weight: normal; - src: url("#{$icons-path}functional/fonts/#{$icon-style}.woff2?4r2095") - format("woff2"), - url("#{$icons-path}functional/fonts/#{$icon-style}.woff?4r2095") - format("woff"); - } - } - } -} diff --git a/source/_patterns/00-base/icons/enterprise/_icons.variables.scss b/source/_patterns/00-base/icons/enterprise/_icons.variables.scss deleted file mode 100644 index 8fc4b04df90..00000000000 --- a/source/_patterns/00-base/icons/enterprise/_icons.variables.scss +++ /dev/null @@ -1,86 +0,0 @@ -@import "../../../../css/helpers/functions"; -@import "../icons.variables"; - -// Icon font files -$icon-font-families: ( - // "enterprise": ( - // "solid": ( - // 24 - // ), - // "outline": ( - // 24, - // 32, - // 48, - // 96 - // ) - // ), - // "personenverkehr-legacy": ( - // "db_transportation-solid": ( - // 40 - // ) - // ) -) !default; - -$icon-glyphs-enterprise: ( - // "attachment": "\1F4CE", - // "build": "\1f527", - // "cam": "\1f4f7", - // "circle-attention": "\21", - // // TODO: the glyph would need to get corrected in one of the next versions of the glyph icon fonts - // "circle-check": "\2713", - // "circle-forbidden": "\274c", - // "cloud": "\2601", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "copy": "\e913", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "dashboard": "\e902", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "database": "\e906", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "discard": "\e901", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "document": "\e905", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "document-check": "\e903", - // "document-list": "\1f4c4", - // "euro": "\20ac", - // "faqs": "\2370", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "folder-close": "\1f4c1", - // "folder-open": "\1f4c2", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "forward": "\e900", - // "freight-car-catalog": "\1f68b", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "history": "\e910", - // "image": "\1f5bc", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "incoming": "\e911", - // "hyperlink": "\1F517", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "list-l": "\e912", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "list-m": "\e908", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "list-s": "\e909", - // "lock-open": "\1f513", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "marketplace": "\e907", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "maximize": "\e914", - // "mic": "\1f399", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "new-open": "\e915", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "reset": "\e917", - // "save": "\1f4be", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "scale": "\e920", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "undo": "\e922", - // // TODO: would need to get replaced by non-out-of-range unicodes - // "upload-cloud": "\e923", - // "watch": "\1f552" -); - -$icon-glyphs: map-merge($icon-glyphs-enterprise, $icon-glyphs-personenverkehr); diff --git a/source/_patterns/00-base/icons/enterprise/icons.scss b/source/_patterns/00-base/icons/enterprise/icons.scss deleted file mode 100644 index 90291fa650f..00000000000 --- a/source/_patterns/00-base/icons/enterprise/icons.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import "icons.variables"; - -@import "icons.custom-properties"; -@import "icons.font-faces"; -@import "../icons"; diff --git a/source/_patterns/00-base/icons/icons.scss b/source/_patterns/00-base/icons/icons.scss deleted file mode 100644 index 738404cc76c..00000000000 --- a/source/_patterns/00-base/icons/icons.scss +++ /dev/null @@ -1,35 +0,0 @@ -// @import "icons.variables"; - -@import "icons.variables"; -@import "icons.attributes-mappings"; -@import "icons.helpers"; -@import "icons.custom-properties"; -@import "icons.font-faces"; -@import "icons.placeholder"; - -[data-icon], -[data-icon-before] { - &::before { - @extend %icon !optional; - margin-inline-end: var(--icon-margin-after, #{$icon-content-space}); - } -} - -[data-icon-after] { - &::after { - @extend %icon !optional; - margin-inline-start: var(--icon-margin-before, #{$icon-content-space}); - } -} - -// Providing a mechanism for text replacements -.is-icon-text-replace { - &[data-icon], - &[data-icon-before] { - @include is-icon-text-replace(); - } - - &[data-icon-after] { - @include is-icon-text-replace("after"); - } -} diff --git a/source/_patterns/00-base/type/enterprise/_fonts.demonstration.scss b/source/_patterns/00-base/type/enterprise/_fonts.demonstration.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/source/_patterns/00-base/type/enterprise/fonts.scss b/source/_patterns/00-base/type/enterprise/fonts.scss deleted file mode 100644 index 2e29561e528..00000000000 --- a/source/_patterns/00-base/type/enterprise/fonts.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../../../css/enterprise/db-ui-core.variables"; -@import "../fonts"; diff --git a/source/css/helpers/_a11y.scss b/source/css/helpers/_a11y.scss deleted file mode 100644 index 821df040f5e..00000000000 --- a/source/css/helpers/_a11y.scss +++ /dev/null @@ -1,8 +0,0 @@ -%a11y-visually-hidden { - clip: rect(0, 0, 0, 0); - height: 1px; - overflow: hidden; - position: absolute !important; - white-space: nowrap; - width: 1px; -} diff --git a/source/css/helpers/_clearfix.scss b/source/css/helpers/_clearfix.scss deleted file mode 100644 index e64c6843fa6..00000000000 --- a/source/css/helpers/_clearfix.scss +++ /dev/null @@ -1,5 +0,0 @@ -%clearfix::after { - clear: both; - content: " "; - display: table; -} diff --git a/source/css/helpers/_functions.scss b/source/css/helpers/_functions.scss deleted file mode 100644 index a1f62422891..00000000000 --- a/source/css/helpers/_functions.scss +++ /dev/null @@ -1,33 +0,0 @@ -@import "../db-ui-core.variables"; - -@function to-rem($pxValue) { - @return #{$pxValue * $dbBaseFontSizeSass}rem; -} -@function to-em($pxValue) { - @return #{$pxValue * $dbBaseFontSizeSass}em; -} - -// Mixin wrappers around the SCSS placeholders -@mixin a11y-visually-hidden($partial: false) { - @if $partial { - clip: rect(0, 0, 0, 0); - height: 1px; - overflow: hidden; - position: absolute !important; - white-space: nowrap; - width: 1px; - } @else { - @extend %a11y-visually-hidden; - } -} -@mixin clearfix($partial: false) { - @if $partial { - &::after { - clear: both; - content: " "; - display: table; - } - } @else { - @extend %clearfix; - } -} From 30ca44a62fe45d5714facc82c28846614829ffeb Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Wed, 16 Nov 2022 12:32:26 +0100 Subject: [PATCH 03/13] refactor: using files from DB UI Base from now on --- source/_patterns/00-base/_init.global.scss | 3 +++ source/_patterns/00-base/_init.scss | 2 ++ .../00-base/icons/_icons.demonstration.scss | 3 +++ source/_patterns/00-base/type/_fonts.scss | 13 +++++++++---- .../_patterns/01-elements/_form-elements.scss | 3 ++- .../01-elements/_form-elements.variables.scss | 2 ++ .../01-elements/buttons/_button.variables.scss | 7 ++++--- .../_patterns/01-elements/buttons/button.scss | 8 ++++++-- .../buttons/enterprise/_button.variables.scss | 1 - .../checkbox/_checkbox.variables.scss | 6 +++--- .../01-elements/checkbox/checkbox.scss | 5 +++++ .../enterprise/_checkbox.demonstration.scss | 2 ++ .../enterprise/_checkbox.variables.scss | 4 ++-- .../01-elements/chips/_chip.variables.scss | 7 ++++--- source/_patterns/01-elements/chips/chip.scss | 8 ++++++-- .../chips/enterprise/_chip.variables.scss | 3 +-- .../01-elements/image/_image.variables.scss | 2 +- source/_patterns/01-elements/image/image.scss | 1 + .../01-elements/input/_input.variables.scss | 3 ++- source/_patterns/01-elements/input/input.scss | 2 ++ .../01-elements/link/_link.variables.scss | 6 +++--- .../link/enterprise/_link.variables.scss | 2 -- source/_patterns/01-elements/link/link.scss | 9 +++++++-- .../loading-indicator/loading-indicator.scss | 1 + .../progress/_progress.variables.scss | 2 ++ .../enterprise/_progress.demonstration.scss | 2 ++ .../01-elements/progress/progress.scss | 3 ++- .../01-elements/radio/_radio.variables.scss | 3 ++- .../radio/enterprise/_radio.variables.scss | 1 - source/_patterns/01-elements/radio/radio.scss | 2 ++ .../01-elements/select/_select.variables.scss | 2 +- .../select/enterprise/_select.variables.scss | 2 +- source/_patterns/01-elements/select/select.scss | 2 ++ .../01-elements/tags/_tag.variables.scss | 7 ++++--- .../tags/enterprise/_tag.variables.scss | 3 +-- source/_patterns/01-elements/tags/tag.scss | 8 ++++++-- .../textarea/_textarea.variables.scss | 3 ++- .../enterprise/_textarea.variables.scss | 1 - .../01-elements/textarea/textarea.scss | 2 ++ .../01-elements/toggle/_toggle.variables.scss | 3 ++- .../toggle/enterprise/_toggle.variables.scss | 1 - source/_patterns/01-elements/toggle/toggle.scss | 2 ++ .../accordion/_accordion.variables.scss | 6 +++--- .../02-components/accordion/accordion.scss | 4 ++++ .../enterprise/_accordion.variables.scss | 2 -- .../02-components/brand/_brand.variables.scss | 2 +- source/_patterns/02-components/brand/brand.scss | 1 + .../breadcrumb/_breadcrumb.variables.scss | 6 +++--- .../02-components/breadcrumb/breadcrumb.scss | 4 ++++ .../enterprise/_breadcrumb.variables.scss | 2 -- source/_patterns/02-components/cards/card.scss | 3 ++- source/_patterns/02-components/cards/cards.scss | 2 +- .../02-components/dialog/_dialog.variables.scss | 6 +++--- .../_patterns/02-components/dialog/dialog.scss | 4 ++++ .../dialog/enterprise/_dialog.variables.scss | 2 -- .../dropdown/_dropdown.variables.scss | 6 +++--- .../02-components/dropdown/dropdown.scss | 3 +++ .../enterprise/_dropdown.variables.scss | 1 - .../_language-switcher.variables.scss | 7 ++++--- .../_language-switcher.variables.scss | 2 -- .../language-switcher/language-switcher.scss | 4 ++++ .../link-list/_link-list.variables.scss | 6 +++--- .../enterprise/_link-list.variables.scss | 2 -- .../02-components/link-list/link-list.scss | 4 ++++ .../_mainnavigation.variables.scss | 7 ++++--- .../enterprise/_mainnavigation.variables.scss | 1 - .../mainnavigation/mainnavigation.scss | 4 ++++ .../_metanavigation.variables.scss | 7 ++++--- .../_metanavigation.demonstration.scss | 3 ++- .../enterprise/_metanavigation.variables.scss | 1 - .../metanavigation/metanavigation.scss | 3 +++ .../notifications/_notification.variables.scss | 3 ++- .../enterprise/_notification.variables.scss | 1 - .../notifications/notification.scss | 1 + .../overflow-menu/_overflow-menu.variables.scss | 7 ++++--- .../enterprise/_overflow-menu.variables.scss | 1 - .../overflow-menu/overflow-menu.scss | 3 +++ .../pagination/_pagination.variables.scss | 6 +++--- .../enterprise/_pagination.variables.scss | 2 -- .../02-components/pagination/pagination.scss | 4 ++++ .../sidenavi/_sidenavi.variables.scss | 7 ++++--- .../enterprise/_sidenavi.variables.scss | 2 -- .../02-components/sidenavi/sidenavi.scss | 5 +++++ .../sitesearch/_sitesearch.variables.scss | 7 ++++--- .../enterprise/_sitesearch.variables.scss | 1 - .../02-components/sitesearch/sitesearch.scss | 4 ++++ .../tab-bar/_tab-bar.variables.scss | 3 ++- .../tab-bar/enterprise/_tab-bar.variables.scss | 1 - .../02-components/tab-bar/tab-bar.scss | 2 ++ .../02-components/table/_table.variables.scss | 2 ++ .../table/enterprise/_table.variables.scss | 1 - source/_patterns/02-components/table/table.scss | 3 ++- .../03-areas/00-header/_header.variables.scss | 3 ++- .../03-areas/00-header/_meta.variables.scss | 6 +++--- .../00-header/enterprise/_header.variables.scss | 1 - source/_patterns/03-areas/00-header/header.scss | 2 +- source/_patterns/03-areas/00-header/meta.scss | 3 +++ source/_patterns/03-areas/01-main/_main.scss | 2 +- source/_patterns/03-areas/02-grid/_grid.scss | 2 ++ .../02-grid/enterprise/_grid.variables.scss | 2 ++ source/_patterns/03-areas/03-footer/footer.scss | 3 ++- source/css/_db-ui-core.variables.scss | 9 +++------ source/css/_fonts.general.scss | 2 ++ source/css/db-ui-core.vars.scss | 4 ++-- .../css/enterprise/_db-ui-core.variables.scss | 4 ++-- .../enterprise/db-ui-core.demonstration.scss | 4 ++-- source/css/enterprise/db-ui-core.scss | 17 ++++++++--------- source/css/enterprise/db-ui-core.vars.scss | 7 +++---- .../pattern-scaffolding-project-specific.scss | 5 +++-- 109 files changed, 251 insertions(+), 148 deletions(-) diff --git a/source/_patterns/00-base/_init.global.scss b/source/_patterns/00-base/_init.global.scss index e7511f154f1..2a3af7aa323 100644 --- a/source/_patterns/00-base/_init.global.scss +++ b/source/_patterns/00-base/_init.global.scss @@ -1,3 +1,6 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; + // *! this is an opionionated (especially based on "enhancing" normalize.css) version of minireset.css v0.0.4 | MIT License | github.com/jgthms/minireset.css html, body { diff --git a/source/_patterns/00-base/_init.scss b/source/_patterns/00-base/_init.scss index a17851e5b28..1246d2d5328 100644 --- a/source/_patterns/00-base/_init.scss +++ b/source/_patterns/00-base/_init.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; + // Box sizing html { box-sizing: border-box; diff --git a/source/_patterns/00-base/icons/_icons.demonstration.scss b/source/_patterns/00-base/icons/_icons.demonstration.scss index 289ac0fbaba..7b78d6e0852 100644 --- a/source/_patterns/00-base/icons/_icons.demonstration.scss +++ b/source/_patterns/00-base/icons/_icons.demonstration.scss @@ -1,3 +1,6 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; + .DO-NOT-COPY-THIS-CLASS-example-icon-list { &, ul { diff --git a/source/_patterns/00-base/type/_fonts.scss b/source/_patterns/00-base/type/_fonts.scss index 61326a3a316..0b774250c8d 100644 --- a/source/_patterns/00-base/type/_fonts.scss +++ b/source/_patterns/00-base/type/_fonts.scss @@ -1,6 +1,7 @@ @import "../../../css/db-ui-core.variables"; @import "fonts.variables"; +// TODO: migrate this to DB UI Base @each $font-name, $font-meta in $font-families { $font-family: map-get($font-meta, "font-family"); $font-filename: map-get($font-meta, "font-filename"); @@ -14,11 +15,15 @@ font-weight: $font-weight; @if $font-local { src: local("#{$font-name}"), - url("#{$fonts-path}#{$font-filename}.woff2?4r0080") format("woff2"), - url("#{$fonts-path}#{$font-filename}.woff?4r0080") format("woff"); + url("#{$fonts-path}#{$font-filename}.woff2?4r0080") + format("woff2"), + url("#{$fonts-path}#{$font-filename}.woff?4r0080") + format("woff"); } @else { - src: url("#{$fonts-path}#{$font-filename}.woff2?4r0080") format("woff2"), - url("#{$fonts-path}#{$font-filename}.woff?4r0080") format("woff"); + src: url("#{$fonts-path}#{$font-filename}.woff2?4r0080") + format("woff2"), + url("#{$fonts-path}#{$font-filename}.woff?4r0080") + format("woff"); } } } diff --git a/source/_patterns/01-elements/_form-elements.scss b/source/_patterns/01-elements/_form-elements.scss index 8694fbfe8d3..5adcff2c573 100644 --- a/source/_patterns/01-elements/_form-elements.scss +++ b/source/_patterns/01-elements/_form-elements.scss @@ -1,4 +1,5 @@ -@import "../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "form-elements.variables"; %form-element { diff --git a/source/_patterns/01-elements/_form-elements.variables.scss b/source/_patterns/01-elements/_form-elements.variables.scss index 2deb17c367d..29b97faa4c5 100644 --- a/source/_patterns/01-elements/_form-elements.variables.scss +++ b/source/_patterns/01-elements/_form-elements.variables.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; + $form-elements-color: $db-colors-secondary-enabled !default; $form-elements-border-radius: 4px !default; diff --git a/source/_patterns/01-elements/buttons/_button.variables.scss b/source/_patterns/01-elements/buttons/_button.variables.scss index 21efa0083e2..ddd091e3269 100644 --- a/source/_patterns/01-elements/buttons/_button.variables.scss +++ b/source/_patterns/01-elements/buttons/_button.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $button---color: #fff !default; diff --git a/source/_patterns/01-elements/buttons/button.scss b/source/_patterns/01-elements/buttons/button.scss index 8797e8cae2d..74cffd38db2 100644 --- a/source/_patterns/01-elements/buttons/button.scss +++ b/source/_patterns/01-elements/buttons/button.scss @@ -1,5 +1,9 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "button.variables"; .elm-button { @@ -144,11 +148,11 @@ &[data-icon], &[data-icon-before] { - @include iconMeta(20); + @include icon-meta(20); } &[data-icon-after] { - @include iconMeta($size: 20, $position: "after"); + @include icon-meta($size: 20, $position: "after"); } // Square icon only buttons &.is-icon-text-replace { diff --git a/source/_patterns/01-elements/buttons/enterprise/_button.variables.scss b/source/_patterns/01-elements/buttons/enterprise/_button.variables.scss index f80acea386f..e69de29bb2d 100644 --- a/source/_patterns/01-elements/buttons/enterprise/_button.variables.scss +++ b/source/_patterns/01-elements/buttons/enterprise/_button.variables.scss @@ -1 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/01-elements/checkbox/_checkbox.variables.scss b/source/_patterns/01-elements/checkbox/_checkbox.variables.scss index 1d6020e988f..556e174c702 100644 --- a/source/_patterns/01-elements/checkbox/_checkbox.variables.scss +++ b/source/_patterns/01-elements/checkbox/_checkbox.variables.scss @@ -1,6 +1,6 @@ -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; -@import "../../00-base/colors/colors.variables"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $checkbox---backgroundColor: rgba(255, 255, 255, 0.1) !default; $checkbox---borderColor: $db-colors-secondary-enabled !default; diff --git a/source/_patterns/01-elements/checkbox/checkbox.scss b/source/_patterns/01-elements/checkbox/checkbox.scss index 68fca0080f4..20aa573b822 100644 --- a/source/_patterns/01-elements/checkbox/checkbox.scss +++ b/source/_patterns/01-elements/checkbox/checkbox.scss @@ -1,5 +1,10 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; + @import "../../../css/partials.meta"; @import "checkbox.variables"; diff --git a/source/_patterns/01-elements/checkbox/enterprise/_checkbox.demonstration.scss b/source/_patterns/01-elements/checkbox/enterprise/_checkbox.demonstration.scss index 02d49730b8a..9ff0f5c2107 100644 --- a/source/_patterns/01-elements/checkbox/enterprise/_checkbox.demonstration.scss +++ b/source/_patterns/01-elements/checkbox/enterprise/_checkbox.demonstration.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "checkbox.variables"; @import "../checkbox.variables"; diff --git a/source/_patterns/01-elements/checkbox/enterprise/_checkbox.variables.scss b/source/_patterns/01-elements/checkbox/enterprise/_checkbox.variables.scss index c1ebecd7a46..3ce76cef648 100644 --- a/source/_patterns/01-elements/checkbox/enterprise/_checkbox.variables.scss +++ b/source/_patterns/01-elements/checkbox/enterprise/_checkbox.variables.scss @@ -1,2 +1,2 @@ -@import "../../../00-base/icons/icons.variables"; -@import "../../../00-base/colors/colors.variables"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; diff --git a/source/_patterns/01-elements/chips/_chip.variables.scss b/source/_patterns/01-elements/chips/_chip.variables.scss index f341af8f267..dee27d56232 100644 --- a/source/_patterns/01-elements/chips/_chip.variables.scss +++ b/source/_patterns/01-elements/chips/_chip.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $chip---radius: to-rem( $pxValue: 4 diff --git a/source/_patterns/01-elements/chips/chip.scss b/source/_patterns/01-elements/chips/chip.scss index bc24d2ba801..9e9252a411f 100644 --- a/source/_patterns/01-elements/chips/chip.scss +++ b/source/_patterns/01-elements/chips/chip.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "chip.variables"; .elm-chip { @@ -20,11 +24,11 @@ // Icons &[data-icon], &[data-icon-before] { - @include iconMeta(20); + @include icon-meta(20); } &[data-icon-after] { - @include iconMeta($size: 20, $position: "after"); + @include icon-meta($size: 20, $position: "after"); } } diff --git a/source/_patterns/01-elements/chips/enterprise/_chip.variables.scss b/source/_patterns/01-elements/chips/enterprise/_chip.variables.scss index 4737cf5fd1c..5827b69bac4 100644 --- a/source/_patterns/01-elements/chips/enterprise/_chip.variables.scss +++ b/source/_patterns/01-elements/chips/enterprise/_chip.variables.scss @@ -1,2 +1 @@ -@import "../../../../css/helpers/functions"; -@import "../../../00-base/colors/enterprise/colors.variables"; +@use "@db-ui/base/build/scss/helpers/functions" as *; diff --git a/source/_patterns/01-elements/image/_image.variables.scss b/source/_patterns/01-elements/image/_image.variables.scss index cfb2ecf9862..5d6fcb065b0 100644 --- a/source/_patterns/01-elements/image/_image.variables.scss +++ b/source/_patterns/01-elements/image/_image.variables.scss @@ -1,4 +1,4 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/helpers/functions" as *; $brand-image--width: 39px !default; $image-logo--maxwidth: 200px !default; diff --git a/source/_patterns/01-elements/image/image.scss b/source/_patterns/01-elements/image/image.scss index 1958c30689a..1200a0d51e2 100644 --- a/source/_patterns/01-elements/image/image.scss +++ b/source/_patterns/01-elements/image/image.scss @@ -1,3 +1,4 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "image.variables"; .elm-image { diff --git a/source/_patterns/01-elements/input/_input.variables.scss b/source/_patterns/01-elements/input/_input.variables.scss index 78a2a8f4cb8..0973de98518 100644 --- a/source/_patterns/01-elements/input/_input.variables.scss +++ b/source/_patterns/01-elements/input/_input.variables.scss @@ -1,4 +1,5 @@ $icons-path: "../../../icons/" !default; -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; $input---color: $db-colors-secondary-enabled !default; diff --git a/source/_patterns/01-elements/input/input.scss b/source/_patterns/01-elements/input/input.scss index f71760473a6..e4c54ebbaef 100644 --- a/source/_patterns/01-elements/input/input.scss +++ b/source/_patterns/01-elements/input/input.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "input.variables"; @import "../form-elements"; diff --git a/source/_patterns/01-elements/link/_link.variables.scss b/source/_patterns/01-elements/link/_link.variables.scss index b35bc2a94d9..cd2846dddce 100644 --- a/source/_patterns/01-elements/link/_link.variables.scss +++ b/source/_patterns/01-elements/link/_link.variables.scss @@ -1,6 +1,6 @@ -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/colors/colors.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $link--disabled-opacity: 0.4 !default; $link-reaMain--color: $db-colors-information-enabled !default; diff --git a/source/_patterns/01-elements/link/enterprise/_link.variables.scss b/source/_patterns/01-elements/link/enterprise/_link.variables.scss index da54734ddab..e69de29bb2d 100644 --- a/source/_patterns/01-elements/link/enterprise/_link.variables.scss +++ b/source/_patterns/01-elements/link/enterprise/_link.variables.scss @@ -1,2 +0,0 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/01-elements/link/link.scss b/source/_patterns/01-elements/link/link.scss index 4abba982672..2c9c2282ed9 100644 --- a/source/_patterns/01-elements/link/link.scss +++ b/source/_patterns/01-elements/link/link.scss @@ -1,3 +1,8 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; + @import "../../../css/partials.meta"; @import "link.variables"; @@ -36,11 +41,11 @@ &[rel], &[data-icon], &[data-icon-before] { - @include iconMeta(20); + @include icon-meta(20); } &[data-icon-after]::after { - @include iconMeta($size: 20, $position: "after"); + @include icon-meta($size: 20, $position: "after"); } } diff --git a/source/_patterns/01-elements/loading-indicator/loading-indicator.scss b/source/_patterns/01-elements/loading-indicator/loading-indicator.scss index ceb559f071d..f7730e37962 100644 --- a/source/_patterns/01-elements/loading-indicator/loading-indicator.scss +++ b/source/_patterns/01-elements/loading-indicator/loading-indicator.scss @@ -1,6 +1,7 @@ @charset "utf-8"; @use "sass:math"; +@use "@db-ui/base/build/scss/variables" as *; @import "loading-indicator.variables"; .elm-loadingindicator { diff --git a/source/_patterns/01-elements/progress/_progress.variables.scss b/source/_patterns/01-elements/progress/_progress.variables.scss index b085ea8ad6e..18d31318efd 100644 --- a/source/_patterns/01-elements/progress/_progress.variables.scss +++ b/source/_patterns/01-elements/progress/_progress.variables.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/db-ui-core.variables"; $progress---height: to-rem( diff --git a/source/_patterns/01-elements/progress/enterprise/_progress.demonstration.scss b/source/_patterns/01-elements/progress/enterprise/_progress.demonstration.scss index c2cc614b7f1..740b046ac61 100644 --- a/source/_patterns/01-elements/progress/enterprise/_progress.demonstration.scss +++ b/source/_patterns/01-elements/progress/enterprise/_progress.demonstration.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "progress.variables"; @import "../progress.variables"; diff --git a/source/_patterns/01-elements/progress/progress.scss b/source/_patterns/01-elements/progress/progress.scss index 34a9b84fdfa..3464d950ab6 100644 --- a/source/_patterns/01-elements/progress/progress.scss +++ b/source/_patterns/01-elements/progress/progress.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "progress.variables"; .elm-progress { diff --git a/source/_patterns/01-elements/radio/_radio.variables.scss b/source/_patterns/01-elements/radio/_radio.variables.scss index 383a6693a4e..d3d7bf25fb7 100644 --- a/source/_patterns/01-elements/radio/_radio.variables.scss +++ b/source/_patterns/01-elements/radio/_radio.variables.scss @@ -1,3 +1,4 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; $radio---border: $db-colors-secondary-enabled !default; diff --git a/source/_patterns/01-elements/radio/enterprise/_radio.variables.scss b/source/_patterns/01-elements/radio/enterprise/_radio.variables.scss index f80acea386f..e69de29bb2d 100644 --- a/source/_patterns/01-elements/radio/enterprise/_radio.variables.scss +++ b/source/_patterns/01-elements/radio/enterprise/_radio.variables.scss @@ -1 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/01-elements/radio/radio.scss b/source/_patterns/01-elements/radio/radio.scss index ed0c0363507..74798d6fc97 100644 --- a/source/_patterns/01-elements/radio/radio.scss +++ b/source/_patterns/01-elements/radio/radio.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "radio.variables"; .elm-radio { diff --git a/source/_patterns/01-elements/select/_select.variables.scss b/source/_patterns/01-elements/select/_select.variables.scss index a2b41c551e6..f449659814d 100644 --- a/source/_patterns/01-elements/select/_select.variables.scss +++ b/source/_patterns/01-elements/select/_select.variables.scss @@ -1,4 +1,4 @@ $icons-path: "../../../icons/" !default; -@import "../../00-base/colors/enterprise/colors.variables"; +@use "@db-ui/base/build/scss/variables" as *; $select-floatingLabel--color: $db-colors-secondary-enabled !default; diff --git a/source/_patterns/01-elements/select/enterprise/_select.variables.scss b/source/_patterns/01-elements/select/enterprise/_select.variables.scss index 89c2dd37e78..5286fd7f63e 100644 --- a/source/_patterns/01-elements/select/enterprise/_select.variables.scss +++ b/source/_patterns/01-elements/select/enterprise/_select.variables.scss @@ -1,3 +1,3 @@ $icons-path: "../../../../icons/" !default; -@import "../../../00-base/colors/enterprise/colors.variables"; + @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/01-elements/select/select.scss b/source/_patterns/01-elements/select/select.scss index 453215acb2b..56ee25acd3d 100644 --- a/source/_patterns/01-elements/select/select.scss +++ b/source/_patterns/01-elements/select/select.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "select.variables"; @import "../form-elements"; @import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/01-elements/tags/_tag.variables.scss b/source/_patterns/01-elements/tags/_tag.variables.scss index bbf99a99b62..be504322df9 100644 --- a/source/_patterns/01-elements/tags/_tag.variables.scss +++ b/source/_patterns/01-elements/tags/_tag.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $tag---radius: to-rem( $pxValue: 4 diff --git a/source/_patterns/01-elements/tags/enterprise/_tag.variables.scss b/source/_patterns/01-elements/tags/enterprise/_tag.variables.scss index 4737cf5fd1c..5827b69bac4 100644 --- a/source/_patterns/01-elements/tags/enterprise/_tag.variables.scss +++ b/source/_patterns/01-elements/tags/enterprise/_tag.variables.scss @@ -1,2 +1 @@ -@import "../../../../css/helpers/functions"; -@import "../../../00-base/colors/enterprise/colors.variables"; +@use "@db-ui/base/build/scss/helpers/functions" as *; diff --git a/source/_patterns/01-elements/tags/tag.scss b/source/_patterns/01-elements/tags/tag.scss index 72a1aedee78..8d64bd93809 100644 --- a/source/_patterns/01-elements/tags/tag.scss +++ b/source/_patterns/01-elements/tags/tag.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "tag.variables"; .elm-tag { @@ -97,7 +101,7 @@ // Icons &[data-icon], &[data-icon-before] { - @include iconMeta(20); + @include icon-meta(20); &::before { --icon-margin-after: #{to-rem($pxValue: 2)}; @@ -105,7 +109,7 @@ } &[data-icon-after] { - @include iconMeta($size: 20, $position: "after"); + @include icon-meta($size: 20, $position: "after"); &::after { --icon-margin-before: #{to-rem($pxValue: 2)}; diff --git a/source/_patterns/01-elements/textarea/_textarea.variables.scss b/source/_patterns/01-elements/textarea/_textarea.variables.scss index 8a534abd809..9411b4d8088 100644 --- a/source/_patterns/01-elements/textarea/_textarea.variables.scss +++ b/source/_patterns/01-elements/textarea/_textarea.variables.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; $textarea---color: $db-colors-secondary-enabled !default; diff --git a/source/_patterns/01-elements/textarea/enterprise/_textarea.variables.scss b/source/_patterns/01-elements/textarea/enterprise/_textarea.variables.scss index f80acea386f..e69de29bb2d 100644 --- a/source/_patterns/01-elements/textarea/enterprise/_textarea.variables.scss +++ b/source/_patterns/01-elements/textarea/enterprise/_textarea.variables.scss @@ -1 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/01-elements/textarea/textarea.scss b/source/_patterns/01-elements/textarea/textarea.scss index 920b4183fb8..32c0fdb685e 100644 --- a/source/_patterns/01-elements/textarea/textarea.scss +++ b/source/_patterns/01-elements/textarea/textarea.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "textarea.variables"; @import "../form-elements"; diff --git a/source/_patterns/01-elements/toggle/_toggle.variables.scss b/source/_patterns/01-elements/toggle/_toggle.variables.scss index 631cddefd31..df149934703 100644 --- a/source/_patterns/01-elements/toggle/_toggle.variables.scss +++ b/source/_patterns/01-elements/toggle/_toggle.variables.scss @@ -1,3 +1,4 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; $toggle--checked-backgroundColor: $db-colors-secondary-enabled !default; diff --git a/source/_patterns/01-elements/toggle/enterprise/_toggle.variables.scss b/source/_patterns/01-elements/toggle/enterprise/_toggle.variables.scss index f80acea386f..e69de29bb2d 100644 --- a/source/_patterns/01-elements/toggle/enterprise/_toggle.variables.scss +++ b/source/_patterns/01-elements/toggle/enterprise/_toggle.variables.scss @@ -1 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/01-elements/toggle/toggle.scss b/source/_patterns/01-elements/toggle/toggle.scss index cd4bb117da7..928e462aab8 100644 --- a/source/_patterns/01-elements/toggle/toggle.scss +++ b/source/_patterns/01-elements/toggle/toggle.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "toggle.variables"; // adapted by https://danklammer.com/articles/simple-css-toggle-switch/ diff --git a/source/_patterns/02-components/accordion/_accordion.variables.scss b/source/_patterns/02-components/accordion/_accordion.variables.scss index b6d028fe99d..6421062e544 100644 --- a/source/_patterns/02-components/accordion/_accordion.variables.scss +++ b/source/_patterns/02-components/accordion/_accordion.variables.scss @@ -1,6 +1,6 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $accordion---paddingLeft: 46 !default; $accordion---paddingRight: to-rem( diff --git a/source/_patterns/02-components/accordion/accordion.scss b/source/_patterns/02-components/accordion/accordion.scss index 420c5f77a7f..a6fbf1cf6f5 100644 --- a/source/_patterns/02-components/accordion/accordion.scss +++ b/source/_patterns/02-components/accordion/accordion.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "accordion.variables"; diff --git a/source/_patterns/02-components/accordion/enterprise/_accordion.variables.scss b/source/_patterns/02-components/accordion/enterprise/_accordion.variables.scss index 6f0bb4d708c..e69de29bb2d 100644 --- a/source/_patterns/02-components/accordion/enterprise/_accordion.variables.scss +++ b/source/_patterns/02-components/accordion/enterprise/_accordion.variables.scss @@ -1,2 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; -@import "../../../00-base/icons/enterprise/icons.variables"; diff --git a/source/_patterns/02-components/brand/_brand.variables.scss b/source/_patterns/02-components/brand/_brand.variables.scss index 825b26d266b..8c72cbd2b93 100644 --- a/source/_patterns/02-components/brand/_brand.variables.scss +++ b/source/_patterns/02-components/brand/_brand.variables.scss @@ -1,4 +1,4 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/helpers/functions" as *; $rea-header-cmp-brand-padding-top: to-rem( $pxValue: 32 diff --git a/source/_patterns/02-components/brand/brand.scss b/source/_patterns/02-components/brand/brand.scss index f89b70eb98f..e575d2c066d 100644 --- a/source/_patterns/02-components/brand/brand.scss +++ b/source/_patterns/02-components/brand/brand.scss @@ -1,3 +1,4 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "brand.variables"; .cmp-brand { diff --git a/source/_patterns/02-components/breadcrumb/_breadcrumb.variables.scss b/source/_patterns/02-components/breadcrumb/_breadcrumb.variables.scss index a9d23711536..e78193968f6 100644 --- a/source/_patterns/02-components/breadcrumb/_breadcrumb.variables.scss +++ b/source/_patterns/02-components/breadcrumb/_breadcrumb.variables.scss @@ -1,6 +1,6 @@ -@import "../../00-base/icons/icons.helpers"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/colors/colors.variables"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; $breadcrumb-divider--icon: "chevron-right" !default; $breadcrumb-link-hover-backgroundColor: rgba( diff --git a/source/_patterns/02-components/breadcrumb/breadcrumb.scss b/source/_patterns/02-components/breadcrumb/breadcrumb.scss index b93ef9b3aea..27503433452 100644 --- a/source/_patterns/02-components/breadcrumb/breadcrumb.scss +++ b/source/_patterns/02-components/breadcrumb/breadcrumb.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "breadcrumb.variables"; diff --git a/source/_patterns/02-components/breadcrumb/enterprise/_breadcrumb.variables.scss b/source/_patterns/02-components/breadcrumb/enterprise/_breadcrumb.variables.scss index da54734ddab..e69de29bb2d 100644 --- a/source/_patterns/02-components/breadcrumb/enterprise/_breadcrumb.variables.scss +++ b/source/_patterns/02-components/breadcrumb/enterprise/_breadcrumb.variables.scss @@ -1,2 +0,0 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/02-components/cards/card.scss b/source/_patterns/02-components/cards/card.scss index 92a691643e7..a1c4e462c37 100644 --- a/source/_patterns/02-components/cards/card.scss +++ b/source/_patterns/02-components/cards/card.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "cards.variables"; .cmp-card { diff --git a/source/_patterns/02-components/cards/cards.scss b/source/_patterns/02-components/cards/cards.scss index 22fb513a6bb..89b10845528 100644 --- a/source/_patterns/02-components/cards/cards.scss +++ b/source/_patterns/02-components/cards/cards.scss @@ -1,4 +1,4 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/helpers/functions" as *; .cmp-cards { list-style: none; diff --git a/source/_patterns/02-components/dialog/_dialog.variables.scss b/source/_patterns/02-components/dialog/_dialog.variables.scss index ac2de68d36a..f152f01d831 100644 --- a/source/_patterns/02-components/dialog/_dialog.variables.scss +++ b/source/_patterns/02-components/dialog/_dialog.variables.scss @@ -1,5 +1,5 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $dialog-backdrop--backgroundColor: rgba(0, 0, 0, 0.9) !default; diff --git a/source/_patterns/02-components/dialog/dialog.scss b/source/_patterns/02-components/dialog/dialog.scss index 0a574a2c71f..b7ddfc5dece 100644 --- a/source/_patterns/02-components/dialog/dialog.scss +++ b/source/_patterns/02-components/dialog/dialog.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "dialog.variables"; diff --git a/source/_patterns/02-components/dialog/enterprise/_dialog.variables.scss b/source/_patterns/02-components/dialog/enterprise/_dialog.variables.scss index da54734ddab..e69de29bb2d 100644 --- a/source/_patterns/02-components/dialog/enterprise/_dialog.variables.scss +++ b/source/_patterns/02-components/dialog/enterprise/_dialog.variables.scss @@ -1,2 +0,0 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/02-components/dropdown/_dropdown.variables.scss b/source/_patterns/02-components/dropdown/_dropdown.variables.scss index f78f84a3de0..0d458986802 100644 --- a/source/_patterns/02-components/dropdown/_dropdown.variables.scss +++ b/source/_patterns/02-components/dropdown/_dropdown.variables.scss @@ -1,3 +1,3 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; diff --git a/source/_patterns/02-components/dropdown/dropdown.scss b/source/_patterns/02-components/dropdown/dropdown.scss index 09ae2d46877..629a97bbf10 100644 --- a/source/_patterns/02-components/dropdown/dropdown.scss +++ b/source/_patterns/02-components/dropdown/dropdown.scss @@ -1,3 +1,6 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "../overflow-menu/overflow-menu"; @import "dropdown.variables"; diff --git a/source/_patterns/02-components/dropdown/enterprise/_dropdown.variables.scss b/source/_patterns/02-components/dropdown/enterprise/_dropdown.variables.scss index 5afd5d07122..b06098d43a4 100644 --- a/source/_patterns/02-components/dropdown/enterprise/_dropdown.variables.scss +++ b/source/_patterns/02-components/dropdown/enterprise/_dropdown.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/language-switcher/_language-switcher.variables.scss b/source/_patterns/02-components/language-switcher/_language-switcher.variables.scss index d3e2d9df3aa..c96df195894 100644 --- a/source/_patterns/02-components/language-switcher/_language-switcher.variables.scss +++ b/source/_patterns/02-components/language-switcher/_language-switcher.variables.scss @@ -1,3 +1,4 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.helpers"; -@import "../../00-base/icons/icons.variables"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/02-components/language-switcher/enterprise/_language-switcher.variables.scss b/source/_patterns/02-components/language-switcher/enterprise/_language-switcher.variables.scss index 2a2b5b07c5d..e69de29bb2d 100644 --- a/source/_patterns/02-components/language-switcher/enterprise/_language-switcher.variables.scss +++ b/source/_patterns/02-components/language-switcher/enterprise/_language-switcher.variables.scss @@ -1,2 +0,0 @@ -@import "../../../../css/enterprise/db-ui-core.variables"; -@import "../../../00-base/icons/enterprise/icons.variables"; diff --git a/source/_patterns/02-components/language-switcher/language-switcher.scss b/source/_patterns/02-components/language-switcher/language-switcher.scss index 446d16fb0e9..4b9759e029c 100644 --- a/source/_patterns/02-components/language-switcher/language-switcher.scss +++ b/source/_patterns/02-components/language-switcher/language-switcher.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "language-switcher.variables"; diff --git a/source/_patterns/02-components/link-list/_link-list.variables.scss b/source/_patterns/02-components/link-list/_link-list.variables.scss index f78f84a3de0..0d458986802 100644 --- a/source/_patterns/02-components/link-list/_link-list.variables.scss +++ b/source/_patterns/02-components/link-list/_link-list.variables.scss @@ -1,3 +1,3 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; diff --git a/source/_patterns/02-components/link-list/enterprise/_link-list.variables.scss b/source/_patterns/02-components/link-list/enterprise/_link-list.variables.scss index da54734ddab..e69de29bb2d 100644 --- a/source/_patterns/02-components/link-list/enterprise/_link-list.variables.scss +++ b/source/_patterns/02-components/link-list/enterprise/_link-list.variables.scss @@ -1,2 +0,0 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/02-components/link-list/link-list.scss b/source/_patterns/02-components/link-list/link-list.scss index 1c637244afe..571e3e2c5de 100644 --- a/source/_patterns/02-components/link-list/link-list.scss +++ b/source/_patterns/02-components/link-list/link-list.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "link-list.variables"; diff --git a/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss b/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss index 82e1065876e..376928c7127 100644 --- a/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss +++ b/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; +@import "../../../css/db-ui-core.variables"; $header-big-link-paddingTop: 32 * 0.0625 !default; $header---backgroundColor: #fdfdfd !default; // TODO: This would need to get replaced by the correct (semantic) color diff --git a/source/_patterns/02-components/mainnavigation/enterprise/_mainnavigation.variables.scss b/source/_patterns/02-components/mainnavigation/enterprise/_mainnavigation.variables.scss index 5afd5d07122..b06098d43a4 100644 --- a/source/_patterns/02-components/mainnavigation/enterprise/_mainnavigation.variables.scss +++ b/source/_patterns/02-components/mainnavigation/enterprise/_mainnavigation.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/mainnavigation/mainnavigation.scss b/source/_patterns/02-components/mainnavigation/mainnavigation.scss index d30a9cb3338..85ea1ebfd36 100644 --- a/source/_patterns/02-components/mainnavigation/mainnavigation.scss +++ b/source/_patterns/02-components/mainnavigation/mainnavigation.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; // TODO: Replace magic numbers e.g. with flexbox implementations and extract variables as well for multi-brand @import "mainnavigation.variables"; diff --git a/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss b/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss index f78f84a3de0..e4b1f4617a5 100644 --- a/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss +++ b/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss @@ -1,3 +1,4 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; +@import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.demonstration.scss b/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.demonstration.scss index 08f2cd670b4..e32807e2ff9 100644 --- a/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.demonstration.scss +++ b/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.demonstration.scss @@ -1,4 +1,5 @@ -@import "../../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; // We're changing this via a demonstration SCSS file here, but within a real project it's obviously the variable $metanavigation-iconOnly--maxWidth that could get changed for that instead .cmp-metanavigation { diff --git a/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.variables.scss b/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.variables.scss index 5afd5d07122..b06098d43a4 100644 --- a/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.variables.scss +++ b/source/_patterns/02-components/metanavigation/enterprise/_metanavigation.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/metanavigation/metanavigation.scss b/source/_patterns/02-components/metanavigation/metanavigation.scss index 8aba261c91d..892e1ad7146 100644 --- a/source/_patterns/02-components/metanavigation/metanavigation.scss +++ b/source/_patterns/02-components/metanavigation/metanavigation.scss @@ -1,3 +1,6 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "metanavigation.variables"; .cmp-metanavigation { diff --git a/source/_patterns/02-components/notifications/_notification.variables.scss b/source/_patterns/02-components/notifications/_notification.variables.scss index 1d73bbd167b..91467b40b42 100644 --- a/source/_patterns/02-components/notifications/_notification.variables.scss +++ b/source/_patterns/02-components/notifications/_notification.variables.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; $notification-alert--color: #fff !default; diff --git a/source/_patterns/02-components/notifications/enterprise/_notification.variables.scss b/source/_patterns/02-components/notifications/enterprise/_notification.variables.scss index f80acea386f..e69de29bb2d 100644 --- a/source/_patterns/02-components/notifications/enterprise/_notification.variables.scss +++ b/source/_patterns/02-components/notifications/enterprise/_notification.variables.scss @@ -1 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/02-components/notifications/notification.scss b/source/_patterns/02-components/notifications/notification.scss index 66d8aacd143..740b2f9fa72 100644 --- a/source/_patterns/02-components/notifications/notification.scss +++ b/source/_patterns/02-components/notifications/notification.scss @@ -1,3 +1,4 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/partials.meta"; @import "notification.variables"; diff --git a/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss b/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss index d551a171558..ec2d87c96da 100644 --- a/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss +++ b/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; +@import "../../../css/db-ui-core.variables"; $overflowMenu---borderRadius: 8px !default; $overflowMenu---backgroundColor: #fff !default; diff --git a/source/_patterns/02-components/overflow-menu/enterprise/_overflow-menu.variables.scss b/source/_patterns/02-components/overflow-menu/enterprise/_overflow-menu.variables.scss index 5afd5d07122..b06098d43a4 100644 --- a/source/_patterns/02-components/overflow-menu/enterprise/_overflow-menu.variables.scss +++ b/source/_patterns/02-components/overflow-menu/enterprise/_overflow-menu.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.scss b/source/_patterns/02-components/overflow-menu/overflow-menu.scss index 8953b9e4ff7..0ccf6b6b990 100644 --- a/source/_patterns/02-components/overflow-menu/overflow-menu.scss +++ b/source/_patterns/02-components/overflow-menu/overflow-menu.scss @@ -1,3 +1,6 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "overflow-menu.variables"; diff --git a/source/_patterns/02-components/pagination/_pagination.variables.scss b/source/_patterns/02-components/pagination/_pagination.variables.scss index f78f84a3de0..0d458986802 100644 --- a/source/_patterns/02-components/pagination/_pagination.variables.scss +++ b/source/_patterns/02-components/pagination/_pagination.variables.scss @@ -1,3 +1,3 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; diff --git a/source/_patterns/02-components/pagination/enterprise/_pagination.variables.scss b/source/_patterns/02-components/pagination/enterprise/_pagination.variables.scss index da54734ddab..e69de29bb2d 100644 --- a/source/_patterns/02-components/pagination/enterprise/_pagination.variables.scss +++ b/source/_patterns/02-components/pagination/enterprise/_pagination.variables.scss @@ -1,2 +0,0 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/02-components/pagination/pagination.scss b/source/_patterns/02-components/pagination/pagination.scss index 2b1c82c52b8..8f2e9fd402a 100644 --- a/source/_patterns/02-components/pagination/pagination.scss +++ b/source/_patterns/02-components/pagination/pagination.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "pagination.variables"; diff --git a/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss b/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss index 414a343c33a..09a5f155582 100644 --- a/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss +++ b/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; // TODO: We need to replace this by its correct color variable $sidenavi-link--color: #d7dce1 !default; diff --git a/source/_patterns/02-components/sidenavi/enterprise/_sidenavi.variables.scss b/source/_patterns/02-components/sidenavi/enterprise/_sidenavi.variables.scss index bc030c9f8a8..b06098d43a4 100644 --- a/source/_patterns/02-components/sidenavi/enterprise/_sidenavi.variables.scss +++ b/source/_patterns/02-components/sidenavi/enterprise/_sidenavi.variables.scss @@ -1,3 +1 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; -@import "../../../00-base/colors/enterprise/colors.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/sidenavi/sidenavi.scss b/source/_patterns/02-components/sidenavi/sidenavi.scss index 53610e6c106..1043cd2f37d 100644 --- a/source/_patterns/02-components/sidenavi/sidenavi.scss +++ b/source/_patterns/02-components/sidenavi/sidenavi.scss @@ -1,5 +1,10 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "sidenavi.variables"; +@import "../../../css/db-ui-core.variables"; .cmp-sidenavi { background-color: $db-colors-secondary-enabled; diff --git a/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss b/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss index 3c96b5c9138..f5d2f2550ee 100644 --- a/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss +++ b/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss @@ -1,6 +1,7 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; +@import "../../../css/db-ui-core.variables"; $sitesearch-form-full-maxWidth: to-rem( $pxValue: 500 diff --git a/source/_patterns/02-components/sitesearch/enterprise/_sitesearch.variables.scss b/source/_patterns/02-components/sitesearch/enterprise/_sitesearch.variables.scss index 5afd5d07122..b06098d43a4 100644 --- a/source/_patterns/02-components/sitesearch/enterprise/_sitesearch.variables.scss +++ b/source/_patterns/02-components/sitesearch/enterprise/_sitesearch.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/icons/enterprise/icons.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/sitesearch/sitesearch.scss b/source/_patterns/02-components/sitesearch/sitesearch.scss index aa6e6a2d29c..f8b282097fa 100644 --- a/source/_patterns/02-components/sitesearch/sitesearch.scss +++ b/source/_patterns/02-components/sitesearch/sitesearch.scss @@ -1,3 +1,7 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "sitesearch.variables"; diff --git a/source/_patterns/02-components/tab-bar/_tab-bar.variables.scss b/source/_patterns/02-components/tab-bar/_tab-bar.variables.scss index 4eed173d121..a09fc75c7ac 100644 --- a/source/_patterns/02-components/tab-bar/_tab-bar.variables.scss +++ b/source/_patterns/02-components/tab-bar/_tab-bar.variables.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/db-ui-core.variables"; $tabBar-tabSection--backgroundColor: #fdfdfd !default; // TODO: This would need to get replaced by the correct (semantic) color diff --git a/source/_patterns/02-components/tab-bar/enterprise/_tab-bar.variables.scss b/source/_patterns/02-components/tab-bar/enterprise/_tab-bar.variables.scss index 3dfa490e4b4..b06098d43a4 100644 --- a/source/_patterns/02-components/tab-bar/enterprise/_tab-bar.variables.scss +++ b/source/_patterns/02-components/tab-bar/enterprise/_tab-bar.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/tab-bar/tab-bar.scss b/source/_patterns/02-components/tab-bar/tab-bar.scss index 331c069cf51..80f20d2d6f1 100644 --- a/source/_patterns/02-components/tab-bar/tab-bar.scss +++ b/source/_patterns/02-components/tab-bar/tab-bar.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/partials.meta"; @import "tab-bar.variables"; diff --git a/source/_patterns/02-components/table/_table.variables.scss b/source/_patterns/02-components/table/_table.variables.scss index f0b0bc7951a..066692421b4 100644 --- a/source/_patterns/02-components/table/_table.variables.scss +++ b/source/_patterns/02-components/table/_table.variables.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/db-ui-core.variables"; $cmp-table-cell-height-36: to-rem( diff --git a/source/_patterns/02-components/table/enterprise/_table.variables.scss b/source/_patterns/02-components/table/enterprise/_table.variables.scss index 3dfa490e4b4..b06098d43a4 100644 --- a/source/_patterns/02-components/table/enterprise/_table.variables.scss +++ b/source/_patterns/02-components/table/enterprise/_table.variables.scss @@ -1,2 +1 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; @import "../../../../css/enterprise/db-ui-core.variables"; diff --git a/source/_patterns/02-components/table/table.scss b/source/_patterns/02-components/table/table.scss index 4e236bd85cd..0022fdd30a2 100644 --- a/source/_patterns/02-components/table/table.scss +++ b/source/_patterns/02-components/table/table.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "table.variables"; @import "table.helpers"; diff --git a/source/_patterns/03-areas/00-header/_header.variables.scss b/source/_patterns/03-areas/00-header/_header.variables.scss index 3f3a84f9395..d9ec71a3444 100644 --- a/source/_patterns/03-areas/00-header/_header.variables.scss +++ b/source/_patterns/03-areas/00-header/_header.variables.scss @@ -1,4 +1,5 @@ -@import "../../../css/helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; // offset-x | offset-y | blur-radius | spread-radius | color $header---boxShadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1), diff --git a/source/_patterns/03-areas/00-header/_meta.variables.scss b/source/_patterns/03-areas/00-header/_meta.variables.scss index 54226d99e99..88dbc6f6e0e 100644 --- a/source/_patterns/03-areas/00-header/_meta.variables.scss +++ b/source/_patterns/03-areas/00-header/_meta.variables.scss @@ -1,6 +1,6 @@ -@import "../../../css/helpers/functions"; -@import "../../00-base/icons/icons.variables"; -@import "../../00-base/icons/icons.helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; $header-big-link-paddingTop: 32 * 0.0625 !default; diff --git a/source/_patterns/03-areas/00-header/enterprise/_header.variables.scss b/source/_patterns/03-areas/00-header/enterprise/_header.variables.scss index f80acea386f..e69de29bb2d 100644 --- a/source/_patterns/03-areas/00-header/enterprise/_header.variables.scss +++ b/source/_patterns/03-areas/00-header/enterprise/_header.variables.scss @@ -1 +0,0 @@ -@import "../../../00-base/colors/enterprise/colors.variables"; diff --git a/source/_patterns/03-areas/00-header/header.scss b/source/_patterns/03-areas/00-header/header.scss index cdfdfb4d0d6..bb0afef52ff 100644 --- a/source/_patterns/03-areas/00-header/header.scss +++ b/source/_patterns/03-areas/00-header/header.scss @@ -1,6 +1,6 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/partials.meta"; @import "header.variables"; -@import "../../../css/helpers/functions"; .rea-header { @include clearfix($partial: $partial); diff --git a/source/_patterns/03-areas/00-header/meta.scss b/source/_patterns/03-areas/00-header/meta.scss index 81290c75798..23bf33a223a 100644 --- a/source/_patterns/03-areas/00-header/meta.scss +++ b/source/_patterns/03-areas/00-header/meta.scss @@ -1,3 +1,6 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "meta.variables"; .rea-meta { diff --git a/source/_patterns/03-areas/01-main/_main.scss b/source/_patterns/03-areas/01-main/_main.scss index 3994f408100..c5597c5d5bc 100644 --- a/source/_patterns/03-areas/01-main/_main.scss +++ b/source/_patterns/03-areas/01-main/_main.scss @@ -2,7 +2,7 @@ // In case that you're building a web application you might want to have more freedom // and probably would want to not include it's contents into your SCSS build / references. -@import "../../../css/helpers/clearfix"; +@import "@db-ui/base/build/scss/helpers/clearfix"; @import "main.variables"; diff --git a/source/_patterns/03-areas/02-grid/_grid.scss b/source/_patterns/03-areas/02-grid/_grid.scss index ae43ffc2200..feac8af7373 100644 --- a/source/_patterns/03-areas/02-grid/_grid.scss +++ b/source/_patterns/03-areas/02-grid/_grid.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/helpers/functions" as *; + .rea-grid { // TODO: We would probably need to recheck on this declaration regarding compabitility flex-wrap: wrap; diff --git a/source/_patterns/03-areas/02-grid/enterprise/_grid.variables.scss b/source/_patterns/03-areas/02-grid/enterprise/_grid.variables.scss index 62dbb0f6379..14f72f91d2a 100644 --- a/source/_patterns/03-areas/02-grid/enterprise/_grid.variables.scss +++ b/source/_patterns/03-areas/02-grid/enterprise/_grid.variables.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/helpers/functions" as *; + $column-gap: to-rem( $pxValue: 10 ) !default; diff --git a/source/_patterns/03-areas/03-footer/footer.scss b/source/_patterns/03-areas/03-footer/footer.scss index a5735608672..c4669b2bf17 100644 --- a/source/_patterns/03-areas/03-footer/footer.scss +++ b/source/_patterns/03-areas/03-footer/footer.scss @@ -1,7 +1,8 @@ @charset "utf-8"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; @import "../../../css/partials.meta"; -@import "../../../css/helpers/functions"; @import "footer.variables"; .rea-footer { diff --git a/source/css/_db-ui-core.variables.scss b/source/css/_db-ui-core.variables.scss index 41fb46137ab..5a8c5c5628d 100644 --- a/source/css/_db-ui-core.variables.scss +++ b/source/css/_db-ui-core.variables.scss @@ -7,12 +7,9 @@ $icons-path: "../../icons/" !default; $images-path: "../../images/" !default; $fonts-path: "../../fonts/" !default; -// TODO change later and use db-ui/base bundle files - -@import "@db-ui/base/build/scss/variables"; -@import "@db-ui/base/build/scss/variables.global"; -// TODO change later, placeholders shouldn't be imported here -@import "@db-ui/base/build/scss/color-placeholder"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/variables.global" as *; +@use "@db-ui/base/build/scss/color-placeholder" as *; // General configurations $dbBaseFontSize: 16px; diff --git a/source/css/_fonts.general.scss b/source/css/_fonts.general.scss index 326b88b58f2..2854e747ca9 100644 --- a/source/css/_fonts.general.scss +++ b/source/css/_fonts.general.scss @@ -1,3 +1,5 @@ +@use "@db-ui/base/build/scss/variables" as *; + /* ***** SCSS placeholder for general font declarations ***** */ diff --git a/source/css/db-ui-core.vars.scss b/source/css/db-ui-core.vars.scss index 1902bb9ed78..fcbdc50165b 100644 --- a/source/css/db-ui-core.vars.scss +++ b/source/css/db-ui-core.vars.scss @@ -9,8 +9,8 @@ $icons-path: "../icons/" !default; $images-path: "../images/" !default; $fonts-path: "../fonts/" !default; -@import "../_patterns/00-base/icons/icons.variables"; -@import "../_patterns/00-base/icons/icons.font-faces"; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.font-faces" as *; :root { // Overwriting the referenced SVG icons as this is going to get inlined and the path would be relative to the pages URL instead of the CSS, which would break diff --git a/source/css/enterprise/_db-ui-core.variables.scss b/source/css/enterprise/_db-ui-core.variables.scss index 6d4680bb121..0eeacc76a53 100644 --- a/source/css/enterprise/_db-ui-core.variables.scss +++ b/source/css/enterprise/_db-ui-core.variables.scss @@ -1,4 +1,4 @@ $domain: "enterprise"; -@import "../helpers/functions"; -@import "../../_patterns/00-base/colors/enterprise/colors.variables"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; diff --git a/source/css/enterprise/db-ui-core.demonstration.scss b/source/css/enterprise/db-ui-core.demonstration.scss index 6644cb01427..52b497050eb 100644 --- a/source/css/enterprise/db-ui-core.demonstration.scss +++ b/source/css/enterprise/db-ui-core.demonstration.scss @@ -1,8 +1,8 @@ @charset "utf-8"; -@import "db-ui-core.variables"; +@use "db-ui-core.variables"; -@import "@db-ui/base/build/scss/typescale"; +@use "@db-ui/base/build/scss/tonality"; @import "../../_patterns/00-base/helpers"; diff --git a/source/css/enterprise/db-ui-core.scss b/source/css/enterprise/db-ui-core.scss index c7d60d0786a..5a9bc663bfd 100644 --- a/source/css/enterprise/db-ui-core.scss +++ b/source/css/enterprise/db-ui-core.scss @@ -6,21 +6,20 @@ $partial: false; // TODO: Let's include normalize e.g. via postcss-normalize @use "@csstools/normalize.css/normalize.css"; -@import "../helpers/functions"; -@import "../../_patterns/00-base/helpers"; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "../../_patterns/00-base/helpers" as *; -@import "db-ui-core.variables"; +@use "db-ui-core.variables" as *; -@import "../../_patterns/00-base/init.global"; -@import "../../_patterns/00-base/init"; +@use "../../_patterns/00-base/init.global" as *; +@use "../../_patterns/00-base/init" as *; // Importing helpers -@import "../helpers/a11y"; -@import "../helpers/clearfix"; +@use "@db-ui/base/build/scss/helpers/functions" as *; // GENERAL -@import "../../_patterns/00-base/type/enterprise/fonts"; -@import "../../_patterns/00-base/icons/enterprise/icons"; +@use "@db-ui/base/build/scss/font-faces" as *; +@use "@db-ui/base/build/scss/icon/icons" as *; // @import "../../_patterns/00-base/03-body/background"; // ELEMENTS diff --git a/source/css/enterprise/db-ui-core.vars.scss b/source/css/enterprise/db-ui-core.vars.scss index db33323ef96..1fb729adee4 100644 --- a/source/css/enterprise/db-ui-core.vars.scss +++ b/source/css/enterprise/db-ui-core.vars.scss @@ -3,8 +3,7 @@ $icons-path: "../../icons/" !default; $images-path: "../../images/" !default; $fonts-path: "../../fonts/" !default; -@import "../../_patterns/00-base/colors/enterprise/colors"; -@import "../../_patterns/00-base/type/enterprise/fonts"; -@import "../../_patterns/00-base/icons/enterprise/icons.variables"; -@import "../../_patterns/00-base/icons/enterprise/icons.font-faces"; +@use "@db-ui/base/build/scss/font-faces" as *; +@use "@db-ui/base/build/scss/icon/icons.variables" as *; +@use "@db-ui/base/build/scss/icon/icons.font-faces" as *; @import "../db-ui-core.vars"; diff --git a/source/css/pattern-scaffolding-project-specific.scss b/source/css/pattern-scaffolding-project-specific.scss index ce8f1c4d939..c2b0886d91c 100644 --- a/source/css/pattern-scaffolding-project-specific.scss +++ b/source/css/pattern-scaffolding-project-specific.scss @@ -1,7 +1,8 @@ -@import "helpers/functions"; +@use "@db-ui/base/build/scss/variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; +@use "@db-ui/base/build/scss/font-faces" as *; @import "db-ui-core.variables"; $fonts-path: "../fonts/"; -@import "../_patterns/00-base/type/fonts"; /* project specific declarations */ body, From eb24cae934d0bbfd3336bfb7eccf7e7f00ab5b64 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Wed, 16 Nov 2022 16:28:55 +0100 Subject: [PATCH 04/13] refactor: updated DB UI Base dependency --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a412343980..5bbffc37478 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.0.0", - "@db-ui/base": "2.0.0-6-465c73a" + "@db-ui/base": "2.0.0-7-b88517c" }, "devDependencies": { "@babel/cli": "^7.19.3", @@ -2237,9 +2237,9 @@ } }, "node_modules/@db-ui/base": { - "version": "2.0.0-6-465c73a", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-6-465c73a.tgz", - "integrity": "sha512-q2StHD4+Z/hyR6EDnnUzfC1TI9MqvAUXtoGTbQPn2cvm/qTBZW0qADqqpdLp0WuE0eB6Tv5uRJrw9MDKeCmuGA==", + "version": "2.0.0-7-b88517c", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-7-b88517c.tgz", + "integrity": "sha512-GluoCcgI7xja0/1BGqgcXc94MnAq1Z2GUwhdCE0e3IMifFhQHb+U832IMvAh+dXIQlaIbKXAeh1+8jIc3Rp0Hg==", "dependencies": { "@csstools/normalize.css": "^12.0.0" } @@ -18589,9 +18589,9 @@ "requires": {} }, "@db-ui/base": { - "version": "2.0.0-6-465c73a", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-6-465c73a.tgz", - "integrity": "sha512-q2StHD4+Z/hyR6EDnnUzfC1TI9MqvAUXtoGTbQPn2cvm/qTBZW0qADqqpdLp0WuE0eB6Tv5uRJrw9MDKeCmuGA==", + "version": "2.0.0-7-b88517c", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-7-b88517c.tgz", + "integrity": "sha512-GluoCcgI7xja0/1BGqgcXc94MnAq1Z2GUwhdCE0e3IMifFhQHb+U832IMvAh+dXIQlaIbKXAeh1+8jIc3Rp0Hg==", "requires": { "@csstools/normalize.css": "^12.0.0" } diff --git a/package.json b/package.json index ee042e42187..8526b4192ff 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.0.0", - "@db-ui/base": "2.0.0-6-465c73a" + "@db-ui/base": "2.0.0-7-b88517c" }, "devDependencies": { "@babel/cli": "^7.19.3", From ded5aa52268d96e44344583e509b3acc51dcabae Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Wed, 16 Nov 2022 16:29:20 +0100 Subject: [PATCH 05/13] chore: simplification --- source/_patterns/01-elements/buttons/_button.variables.scss | 1 - source/_patterns/01-elements/buttons/button.scss | 1 - source/_patterns/01-elements/checkbox/_checkbox.variables.scss | 1 - source/_patterns/01-elements/checkbox/checkbox.scss | 1 - source/_patterns/01-elements/chips/_chip.variables.scss | 1 - source/_patterns/01-elements/chips/chip.scss | 1 - source/_patterns/01-elements/link/_link.variables.scss | 1 - source/_patterns/01-elements/link/link.scss | 1 - source/_patterns/01-elements/tags/_tag.variables.scss | 1 - source/_patterns/01-elements/tags/tag.scss | 1 - .../_patterns/02-components/accordion/_accordion.variables.scss | 1 - source/_patterns/02-components/accordion/accordion.scss | 1 - source/_patterns/02-components/breadcrumb/breadcrumb.scss | 1 - source/_patterns/02-components/dialog/_dialog.variables.scss | 1 - source/_patterns/02-components/dialog/dialog.scss | 1 - source/_patterns/02-components/dropdown/_dropdown.variables.scss | 1 - source/_patterns/02-components/dropdown/dropdown.scss | 1 - .../02-components/language-switcher/language-switcher.scss | 1 - .../_patterns/02-components/link-list/_link-list.variables.scss | 1 - source/_patterns/02-components/link-list/link-list.scss | 1 - .../02-components/mainnavigation/_mainnavigation.variables.scss | 1 - .../_patterns/02-components/mainnavigation/mainnavigation.scss | 1 - .../02-components/metanavigation/_metanavigation.variables.scss | 1 - .../_patterns/02-components/metanavigation/metanavigation.scss | 1 - .../02-components/overflow-menu/_overflow-menu.variables.scss | 1 - source/_patterns/02-components/overflow-menu/overflow-menu.scss | 1 - .../02-components/pagination/_pagination.variables.scss | 1 - source/_patterns/02-components/pagination/pagination.scss | 1 - source/_patterns/02-components/sidenavi/_sidenavi.variables.scss | 1 - source/_patterns/02-components/sidenavi/sidenavi.scss | 1 - .../02-components/sitesearch/_sitesearch.variables.scss | 1 - source/_patterns/02-components/sitesearch/sitesearch.scss | 1 - source/_patterns/03-areas/00-header/_meta.variables.scss | 1 - source/_patterns/03-areas/00-header/meta.scss | 1 - 34 files changed, 34 deletions(-) diff --git a/source/_patterns/01-elements/buttons/_button.variables.scss b/source/_patterns/01-elements/buttons/_button.variables.scss index ddd091e3269..b150f01aca5 100644 --- a/source/_patterns/01-elements/buttons/_button.variables.scss +++ b/source/_patterns/01-elements/buttons/_button.variables.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $button---color: #fff !default; diff --git a/source/_patterns/01-elements/buttons/button.scss b/source/_patterns/01-elements/buttons/button.scss index 74cffd38db2..fa1cef97768 100644 --- a/source/_patterns/01-elements/buttons/button.scss +++ b/source/_patterns/01-elements/buttons/button.scss @@ -2,7 +2,6 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "button.variables"; diff --git a/source/_patterns/01-elements/checkbox/_checkbox.variables.scss b/source/_patterns/01-elements/checkbox/_checkbox.variables.scss index 556e174c702..e568d6e27a1 100644 --- a/source/_patterns/01-elements/checkbox/_checkbox.variables.scss +++ b/source/_patterns/01-elements/checkbox/_checkbox.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/variables" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $checkbox---backgroundColor: rgba(255, 255, 255, 0.1) !default; diff --git a/source/_patterns/01-elements/checkbox/checkbox.scss b/source/_patterns/01-elements/checkbox/checkbox.scss index 20aa573b822..6c1765b4f47 100644 --- a/source/_patterns/01-elements/checkbox/checkbox.scss +++ b/source/_patterns/01-elements/checkbox/checkbox.scss @@ -2,7 +2,6 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; diff --git a/source/_patterns/01-elements/chips/_chip.variables.scss b/source/_patterns/01-elements/chips/_chip.variables.scss index dee27d56232..59700d0a6ab 100644 --- a/source/_patterns/01-elements/chips/_chip.variables.scss +++ b/source/_patterns/01-elements/chips/_chip.variables.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $chip---radius: to-rem( diff --git a/source/_patterns/01-elements/chips/chip.scss b/source/_patterns/01-elements/chips/chip.scss index 9e9252a411f..b7c95c78182 100644 --- a/source/_patterns/01-elements/chips/chip.scss +++ b/source/_patterns/01-elements/chips/chip.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "chip.variables"; diff --git a/source/_patterns/01-elements/link/_link.variables.scss b/source/_patterns/01-elements/link/_link.variables.scss index cd2846dddce..082635a9e10 100644 --- a/source/_patterns/01-elements/link/_link.variables.scss +++ b/source/_patterns/01-elements/link/_link.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/variables" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $link--disabled-opacity: 0.4 !default; diff --git a/source/_patterns/01-elements/link/link.scss b/source/_patterns/01-elements/link/link.scss index 2c9c2282ed9..70c72188bc6 100644 --- a/source/_patterns/01-elements/link/link.scss +++ b/source/_patterns/01-elements/link/link.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; diff --git a/source/_patterns/01-elements/tags/_tag.variables.scss b/source/_patterns/01-elements/tags/_tag.variables.scss index be504322df9..df0d1c89e77 100644 --- a/source/_patterns/01-elements/tags/_tag.variables.scss +++ b/source/_patterns/01-elements/tags/_tag.variables.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $tag---radius: to-rem( diff --git a/source/_patterns/01-elements/tags/tag.scss b/source/_patterns/01-elements/tags/tag.scss index 8d64bd93809..6e68333b773 100644 --- a/source/_patterns/01-elements/tags/tag.scss +++ b/source/_patterns/01-elements/tags/tag.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "tag.variables"; diff --git a/source/_patterns/02-components/accordion/_accordion.variables.scss b/source/_patterns/02-components/accordion/_accordion.variables.scss index 6421062e544..5fc475d0f25 100644 --- a/source/_patterns/02-components/accordion/_accordion.variables.scss +++ b/source/_patterns/02-components/accordion/_accordion.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $accordion---paddingLeft: 46 !default; diff --git a/source/_patterns/02-components/accordion/accordion.scss b/source/_patterns/02-components/accordion/accordion.scss index a6fbf1cf6f5..2507632d7ed 100644 --- a/source/_patterns/02-components/accordion/accordion.scss +++ b/source/_patterns/02-components/accordion/accordion.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "accordion.variables"; diff --git a/source/_patterns/02-components/breadcrumb/breadcrumb.scss b/source/_patterns/02-components/breadcrumb/breadcrumb.scss index 27503433452..e0589f5656d 100644 --- a/source/_patterns/02-components/breadcrumb/breadcrumb.scss +++ b/source/_patterns/02-components/breadcrumb/breadcrumb.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "breadcrumb.variables"; diff --git a/source/_patterns/02-components/dialog/_dialog.variables.scss b/source/_patterns/02-components/dialog/_dialog.variables.scss index f152f01d831..5a7e44d57ba 100644 --- a/source/_patterns/02-components/dialog/_dialog.variables.scss +++ b/source/_patterns/02-components/dialog/_dialog.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $dialog-backdrop--backgroundColor: rgba(0, 0, 0, 0.9) !default; diff --git a/source/_patterns/02-components/dialog/dialog.scss b/source/_patterns/02-components/dialog/dialog.scss index b7ddfc5dece..df4761bda50 100644 --- a/source/_patterns/02-components/dialog/dialog.scss +++ b/source/_patterns/02-components/dialog/dialog.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "dialog.variables"; diff --git a/source/_patterns/02-components/dropdown/_dropdown.variables.scss b/source/_patterns/02-components/dropdown/_dropdown.variables.scss index 0d458986802..d6eba2ed574 100644 --- a/source/_patterns/02-components/dropdown/_dropdown.variables.scss +++ b/source/_patterns/02-components/dropdown/_dropdown.variables.scss @@ -1,3 +1,2 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; diff --git a/source/_patterns/02-components/dropdown/dropdown.scss b/source/_patterns/02-components/dropdown/dropdown.scss index 629a97bbf10..dc614caf660 100644 --- a/source/_patterns/02-components/dropdown/dropdown.scss +++ b/source/_patterns/02-components/dropdown/dropdown.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/variables" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "../overflow-menu/overflow-menu"; diff --git a/source/_patterns/02-components/language-switcher/language-switcher.scss b/source/_patterns/02-components/language-switcher/language-switcher.scss index 4b9759e029c..81212cfe205 100644 --- a/source/_patterns/02-components/language-switcher/language-switcher.scss +++ b/source/_patterns/02-components/language-switcher/language-switcher.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "language-switcher.variables"; diff --git a/source/_patterns/02-components/link-list/_link-list.variables.scss b/source/_patterns/02-components/link-list/_link-list.variables.scss index 0d458986802..d6eba2ed574 100644 --- a/source/_patterns/02-components/link-list/_link-list.variables.scss +++ b/source/_patterns/02-components/link-list/_link-list.variables.scss @@ -1,3 +1,2 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; diff --git a/source/_patterns/02-components/link-list/link-list.scss b/source/_patterns/02-components/link-list/link-list.scss index 571e3e2c5de..0459f08d626 100644 --- a/source/_patterns/02-components/link-list/link-list.scss +++ b/source/_patterns/02-components/link-list/link-list.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "link-list.variables"; diff --git a/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss b/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss index 376928c7127..09ab6e9f551 100644 --- a/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss +++ b/source/_patterns/02-components/mainnavigation/_mainnavigation.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/02-components/mainnavigation/mainnavigation.scss b/source/_patterns/02-components/mainnavigation/mainnavigation.scss index 85ea1ebfd36..072bcfe84c4 100644 --- a/source/_patterns/02-components/mainnavigation/mainnavigation.scss +++ b/source/_patterns/02-components/mainnavigation/mainnavigation.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; // TODO: Replace magic numbers e.g. with flexbox implementations and extract variables as well for multi-brand diff --git a/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss b/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss index e4b1f4617a5..ee0de8d86a2 100644 --- a/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss +++ b/source/_patterns/02-components/metanavigation/_metanavigation.variables.scss @@ -1,4 +1,3 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/02-components/metanavigation/metanavigation.scss b/source/_patterns/02-components/metanavigation/metanavigation.scss index 892e1ad7146..b834efa3cce 100644 --- a/source/_patterns/02-components/metanavigation/metanavigation.scss +++ b/source/_patterns/02-components/metanavigation/metanavigation.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "metanavigation.variables"; diff --git a/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss b/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss index ec2d87c96da..724c9984ca8 100644 --- a/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss +++ b/source/_patterns/02-components/overflow-menu/_overflow-menu.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.scss b/source/_patterns/02-components/overflow-menu/overflow-menu.scss index 0ccf6b6b990..c97613acf56 100644 --- a/source/_patterns/02-components/overflow-menu/overflow-menu.scss +++ b/source/_patterns/02-components/overflow-menu/overflow-menu.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "overflow-menu.variables"; diff --git a/source/_patterns/02-components/pagination/_pagination.variables.scss b/source/_patterns/02-components/pagination/_pagination.variables.scss index 0d458986802..d6eba2ed574 100644 --- a/source/_patterns/02-components/pagination/_pagination.variables.scss +++ b/source/_patterns/02-components/pagination/_pagination.variables.scss @@ -1,3 +1,2 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; diff --git a/source/_patterns/02-components/pagination/pagination.scss b/source/_patterns/02-components/pagination/pagination.scss index 8f2e9fd402a..b0dce43fe77 100644 --- a/source/_patterns/02-components/pagination/pagination.scss +++ b/source/_patterns/02-components/pagination/pagination.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "pagination.variables"; diff --git a/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss b/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss index 09a5f155582..e592dfc2671 100644 --- a/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss +++ b/source/_patterns/02-components/sidenavi/_sidenavi.variables.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; // TODO: We need to replace this by its correct color variable diff --git a/source/_patterns/02-components/sidenavi/sidenavi.scss b/source/_patterns/02-components/sidenavi/sidenavi.scss index 1043cd2f37d..7bdb870d777 100644 --- a/source/_patterns/02-components/sidenavi/sidenavi.scss +++ b/source/_patterns/02-components/sidenavi/sidenavi.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "sidenavi.variables"; diff --git a/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss b/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss index f5d2f2550ee..54664ca5cb1 100644 --- a/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss +++ b/source/_patterns/02-components/sitesearch/_sitesearch.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/db-ui-core.variables"; diff --git a/source/_patterns/02-components/sitesearch/sitesearch.scss b/source/_patterns/02-components/sitesearch/sitesearch.scss index f8b282097fa..7ea3a1564a5 100644 --- a/source/_patterns/02-components/sitesearch/sitesearch.scss +++ b/source/_patterns/02-components/sitesearch/sitesearch.scss @@ -1,6 +1,5 @@ @use "@db-ui/base/build/scss/variables" as *; @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "../../../css/partials.meta"; @import "sitesearch.variables"; diff --git a/source/_patterns/03-areas/00-header/_meta.variables.scss b/source/_patterns/03-areas/00-header/_meta.variables.scss index 88dbc6f6e0e..28077f24852 100644 --- a/source/_patterns/03-areas/00-header/_meta.variables.scss +++ b/source/_patterns/03-areas/00-header/_meta.variables.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; $header-big-link-paddingTop: 32 * 0.0625 !default; diff --git a/source/_patterns/03-areas/00-header/meta.scss b/source/_patterns/03-areas/00-header/meta.scss index 23bf33a223a..534e3614575 100644 --- a/source/_patterns/03-areas/00-header/meta.scss +++ b/source/_patterns/03-areas/00-header/meta.scss @@ -1,5 +1,4 @@ @use "@db-ui/base/build/scss/helpers/functions" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.helpers" as *; @import "meta.variables"; From a56d54281ebf3ef320a04ea8ebd41e41d5fc6a31 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Fri, 18 Nov 2022 14:28:55 +0100 Subject: [PATCH 06/13] chore: updated DB UI Base version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5976f4a2cc0..d9589cf0e6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.0.0", - "@db-ui/base": "2.0.0-7-b88517c" + "@db-ui/base": "2.0.0-9-02bf7f9" }, "devDependencies": { "@babel/cli": "^7.19.3", @@ -2210,9 +2210,9 @@ } }, "node_modules/@db-ui/base": { - "version": "2.0.0-7-b88517c", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-7-b88517c.tgz", - "integrity": "sha512-GluoCcgI7xja0/1BGqgcXc94MnAq1Z2GUwhdCE0e3IMifFhQHb+U832IMvAh+dXIQlaIbKXAeh1+8jIc3Rp0Hg==", + "version": "2.0.0-9-02bf7f9", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-9-02bf7f9.tgz", + "integrity": "sha512-qOMh22t2G9fP25Xd+o9qmm0pG6vXEzSHhIp5SvSCaIlvKk45QTI/F9XflFHCj1gnSsmm6ZqwV7huPma2r7kFuw==", "dependencies": { "@csstools/normalize.css": "^12.0.0" } @@ -18558,9 +18558,9 @@ "requires": {} }, "@db-ui/base": { - "version": "2.0.0-7-b88517c", - "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-7-b88517c.tgz", - "integrity": "sha512-GluoCcgI7xja0/1BGqgcXc94MnAq1Z2GUwhdCE0e3IMifFhQHb+U832IMvAh+dXIQlaIbKXAeh1+8jIc3Rp0Hg==", + "version": "2.0.0-9-02bf7f9", + "resolved": "https://registry.npmjs.org/@db-ui/base/-/base-2.0.0-9-02bf7f9.tgz", + "integrity": "sha512-qOMh22t2G9fP25Xd+o9qmm0pG6vXEzSHhIp5SvSCaIlvKk45QTI/F9XflFHCj1gnSsmm6ZqwV7huPma2r7kFuw==", "requires": { "@csstools/normalize.css": "^12.0.0" } diff --git a/package.json b/package.json index 8445aac3dad..83d6b80f3b9 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "license": "Apache-2.0", "dependencies": { "@csstools/normalize.css": "^12.0.0", - "@db-ui/base": "2.0.0-7-b88517c" + "@db-ui/base": "2.0.0-9-02bf7f9" }, "devDependencies": { "@babel/cli": "^7.19.3", From 43d6f25003c52a7bffc7f6b2427762bff9a24a96 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Fri, 18 Nov 2022 18:22:12 +0100 Subject: [PATCH 07/13] chore: replaced these values --- .../01-elements/logo/_logo.demonstration.scss | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/_patterns/01-elements/logo/_logo.demonstration.scss b/source/_patterns/01-elements/logo/_logo.demonstration.scss index 074777ab3f7..66a7080aa9b 100644 --- a/source/_patterns/01-elements/logo/_logo.demonstration.scss +++ b/source/_patterns/01-elements/logo/_logo.demonstration.scss @@ -1,9 +1,11 @@ +@use "@db-ui/base/build/scss/variables" as *; + .DO-NOT-COPY-THIS-CLASS-example-logo-list { list-style: none; padding-left: 0; - color: $db-color-cool-gray-700; + color: $db-colors-secondary-enabled; li { display: inline-block; @@ -13,19 +15,19 @@ padding: 80px; border-radius: 4px; - color: $db-color-cool-gray-700; + color: $db-colors-secondary-enabled; &.DO-NOT-COPY-THIS-CLASS-example-bg-variants-cool-gray { - background-color: $db-color-cool-gray-100; + background-color: $db-colors-secondary-on-enabled; } &.DO-NOT-COPY-THIS-CLASS-example-bg-variants-red { - --db-logo-color: #{$db-color-white}; - background-color: $db-color-red-500; + --db-logo-color: #{$db-colors-secondary-on-enabled}; + background-color: $db-colors-primary-enabled; } &.DO-NOT-COPY-THIS-CLASS-example-bg-variants-image { - --db-logo-backgroundColor: #{$db-color-white}; + --db-logo-backgroundColor: #{$db-colors-secondary-on-enabled}; background-image: url("https://marketingportal.extranet.deutschebahn.com/sites/default/files/2021-05-19/Gruppe%20maskieren%2024.png"); background-repeat: no-repeat; background-size: cover; From f13140ac6cb6ef88e6687867158af19ea0d1b421 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Mon, 21 Nov 2022 10:55:52 +0100 Subject: [PATCH 08/13] chore: simplified the scss compiling --- package.json | 4 +--- source/css/enterprise/db-ui-core.vars.scss | 9 --------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 source/css/enterprise/db-ui-core.vars.scss diff --git a/package.json b/package.json index 97cf8ca9956..7337ea59755 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,8 @@ "css-copy": "cpr out/css/ dist/css/ --filter=\"^(?!.*db-ui-core[.a-z]*[.]css([.]map)?).*$\"", "css-watch": "nodemon --watch source/_patterns/ -e scss -x \"npm-run-all css-build:* css-postcss\"", "css-postcss": "postcss out/css/**/*.css --replace --map", - "css-build:general": "sass source/css/enterprise/:out/css/enterprise --style=compressed --embed-sources --load-path=node_modules", + "css-build:general": "sass source/css/:out/css/ --style=compressed --embed-sources --load-path=node_modules", "css-build:incremental:partials": "sass source/_patterns:dist/css --style=compressed --embed-sources --load-path=node_modules", - "css-build:base": "sass source/css/db-ui-core.vars.scss:dist/css/db-ui-core.vars.css source/css/db-ui-core.general.scss:dist/css/db-ui-core.general.css --style=compressed --embed-sources --load-path=node_modules", - "css-build:pattern-lab-ui": "sass source/css/pattern-scaffolding-project-specific.scss:out/css/pattern-scaffolding-project-specific.css --style=compressed --embed-sources --load-path=node_modules", "js-deploy": "npm run js-build && cpr source/js dist/js -d", "js-build": "babel source/_patterns/**/*.script.js --minified --out-file source/js/main.min.js --source-maps & babel source/**/*.plugin.js --minified --out-file source/js/plugins.min.js --source-maps", "js-watch": "npm run js-build -- --watch", diff --git a/source/css/enterprise/db-ui-core.vars.scss b/source/css/enterprise/db-ui-core.vars.scss deleted file mode 100644 index 1fb729adee4..00000000000 --- a/source/css/enterprise/db-ui-core.vars.scss +++ /dev/null @@ -1,9 +0,0 @@ -// Define the path for both image and font folders -$icons-path: "../../icons/" !default; -$images-path: "../../images/" !default; -$fonts-path: "../../fonts/" !default; - -@use "@db-ui/base/build/scss/font-faces" as *; -@use "@db-ui/base/build/scss/icon/icons.variables" as *; -@use "@db-ui/base/build/scss/icon/icons.font-faces" as *; -@import "../db-ui-core.vars"; From 15fc19c1907560d1c82667b6919138e1f07a3177 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Mon, 21 Nov 2022 10:59:59 +0100 Subject: [PATCH 09/13] chore: forward the DB UI Base files --- source/css/_db-ui-core.variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/css/_db-ui-core.variables.scss b/source/css/_db-ui-core.variables.scss index c04d6ec29df..8203675d451 100644 --- a/source/css/_db-ui-core.variables.scss +++ b/source/css/_db-ui-core.variables.scss @@ -7,9 +7,9 @@ $icons-path: "../../icons/" !default; $images-path: "../../images/" !default; $fonts-path: "../../fonts/" !default; -@use "@db-ui/base/build/scss/variables" as *; -@use "@db-ui/base/build/scss/variables.global" as *; -@use "@db-ui/base/build/scss/color-placeholder" as *; +@forward "@db-ui/base/build/scss/variables"; +@forward "@db-ui/base/build/scss/variables.global"; +@forward "@db-ui/base/build/scss/color-placeholder"; // General configurations $dbBaseFontSize: 16px; From 4e80327d71d4092971247b8fbde8f45ac11d1c63 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Mon, 21 Nov 2022 11:00:28 +0100 Subject: [PATCH 10/13] chore: we need to include font face declarations in this file as well --- source/css/db-ui-core.vars.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/source/css/db-ui-core.vars.scss b/source/css/db-ui-core.vars.scss index fcbdc50165b..57154274bc4 100644 --- a/source/css/db-ui-core.vars.scss +++ b/source/css/db-ui-core.vars.scss @@ -9,6 +9,7 @@ $icons-path: "../icons/" !default; $images-path: "../images/" !default; $fonts-path: "../fonts/" !default; +@use "@db-ui/base/build/scss/font-faces" as *; @use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.font-faces" as *; From de7bc6d97dbfecebe82f95469c1a71564ee9bbbf Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Mon, 21 Nov 2022 11:00:52 +0100 Subject: [PATCH 11/13] refactor: corrected the path definition --- source/css/_db-ui-core.variables.scss | 5 ----- source/css/db-ui-core.vars.scss | 10 +++++----- source/css/enterprise/db-ui-core.scss | 7 +++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/source/css/_db-ui-core.variables.scss b/source/css/_db-ui-core.variables.scss index 8203675d451..0767d568a31 100644 --- a/source/css/_db-ui-core.variables.scss +++ b/source/css/_db-ui-core.variables.scss @@ -2,11 +2,6 @@ This file summarizes the general variables relevant for using DB UI Core with SCSS. ***** */ -// Define the path for both image and font folders -$icons-path: "../../icons/" !default; -$images-path: "../../images/" !default; -$fonts-path: "../../fonts/" !default; - @forward "@db-ui/base/build/scss/variables"; @forward "@db-ui/base/build/scss/variables.global"; @forward "@db-ui/base/build/scss/color-placeholder"; diff --git a/source/css/db-ui-core.vars.scss b/source/css/db-ui-core.vars.scss index 57154274bc4..5c982454996 100644 --- a/source/css/db-ui-core.vars.scss +++ b/source/css/db-ui-core.vars.scss @@ -4,11 +4,11 @@ of DB UI Core for each element and component. ***** */ -// Define the path for both image and font folders -$icons-path: "../icons/" !default; -$images-path: "../images/" !default; -$fonts-path: "../fonts/" !default; - +// Define the path for image and font folders +@use "@db-ui/base/build/scss/default.assets-paths" as * with ( + $icons-path: "../icons/", + $fonts-path: "../fonts/" +); @use "@db-ui/base/build/scss/font-faces" as *; @use "@db-ui/base/build/scss/icon/icons.variables" as *; @use "@db-ui/base/build/scss/icon/icons.font-faces" as *; diff --git a/source/css/enterprise/db-ui-core.scss b/source/css/enterprise/db-ui-core.scss index 0945f807514..2420b6508c7 100644 --- a/source/css/enterprise/db-ui-core.scss +++ b/source/css/enterprise/db-ui-core.scss @@ -3,6 +3,13 @@ // Global setting to differentiate from the CSS partials rendering $partial: false; +// Define the path for image, icons and font folders +@use "@db-ui/base/build/scss/default.assets-paths" as * with ( + $icons-path: "../../icons/", + $images-path: "../../images/", + $fonts-path: "../../fonts/" +); + // TODO: Let's include normalize e.g. via postcss-normalize @use "@csstools/normalize.css/normalize.css"; From 15feab5e6a041d38e8ca03933c7034fe6f251385 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Mon, 21 Nov 2022 11:06:51 +0100 Subject: [PATCH 12/13] chore: removed obsolete reference --- source/_patterns/01-elements/headline/headline.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/_patterns/01-elements/headline/headline.scss b/source/_patterns/01-elements/headline/headline.scss index 84c6df9185c..017225d8812 100644 --- a/source/_patterns/01-elements/headline/headline.scss +++ b/source/_patterns/01-elements/headline/headline.scss @@ -1,5 +1,3 @@ -@import "headline.variables"; - .elm-headline { margin-bottom: to-rem($pxValue: 16); From abed13b3173b5a20b3b2cd07632fc8b22bd3def4 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Mon, 21 Nov 2022 11:08:39 +0100 Subject: [PATCH 13/13] chore: added necessary references --- source/_patterns/01-elements/headline/headline.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/_patterns/01-elements/headline/headline.scss b/source/_patterns/01-elements/headline/headline.scss index 017225d8812..e0fb3b7ca50 100644 --- a/source/_patterns/01-elements/headline/headline.scss +++ b/source/_patterns/01-elements/headline/headline.scss @@ -1,3 +1,6 @@ +@use "../../../css/db-ui-core.variables" as *; +@use "@db-ui/base/build/scss/helpers/functions" as *; + .elm-headline { margin-bottom: to-rem($pxValue: 16);