Skip to content

Commit

Permalink
Merge pull request #896 from SwedbankPay/feature/SWED-2269-import_svg…
Browse files Browse the repository at this point in the history
…_path

SWED-2269 revert syntax import svg path in entry LESS files
  • Loading branch information
goldenraphti authored Aug 23, 2023
2 parents cb177aa + 6a913ac commit ef2ba3a
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 74 deletions.
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
{
"ignoreFunctions": ["fade", "darken"]
}
]
],
"import-notation": "string"
}
}
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [10.8.5] - 03.07.2023

## Bug Fixes

- We reverted back the way CSS stylesheets were imported internally. It caused a regression bug, svg files would not load when imported from CSS properties (e.g. checkbox, ...). Paths resolution were failing. (not an issue for projects importing CSS via CDN, only for the ones importing styles via the local npm package)

## Component changes

### Non breaking UI changes
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/less/components/button.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("../global.less");
@import "../global.less";

.btn {
display: inline-flex;
Expand Down
2 changes: 1 addition & 1 deletion src/less/components/expandable.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("../global.less");
@import "../global.less";

.expandable {
border: none;
Expand Down
6 changes: 3 additions & 3 deletions src/less/documentation-payex.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import url("variables-swedbankpay.less");
@import url("variables-payex.less");
@import url("documentation-swedbankpay.less");
@import "variables-swedbankpay.less";
@import "variables-payex.less";
@import "documentation-swedbankpay.less";

.documentation {
.doc-container {
Expand Down
4 changes: 2 additions & 2 deletions src/less/documentation-swedbankpay.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import url("variables-swedbankpay.less");
@import url("global.less");
@import "variables-swedbankpay.less";
@import "global.less";

#designguide {
display: flex;
Expand Down
10 changes: 7 additions & 3 deletions src/less/global.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable-next-line import-notation */
@import (css)
url("https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined");

Expand Down Expand Up @@ -90,17 +91,20 @@

@font-face {
font-family: "Futura PT W08 Book";
src: url("../fonts/FuturaBook.woff2") format("woff2"),
src:
url("../fonts/FuturaBook.woff2") format("woff2"),
url("../fonts/FuturaBook.woff") format("woff");
}
@font-face {
font-family: "Futura PT W08 Medium";
src: url("../fonts/FuturaMedium.woff2") format("woff2"),
src:
url("../fonts/FuturaMedium.woff2") format("woff2"),
url("../fonts/FuturaMedium.woff") format("woff");
}
@font-face {
font-family: "Futura PT W08 Demi";
src: url("../fonts/FuturaDemi.woff2") format("woff2"),
src:
url("../fonts/FuturaDemi.woff2") format("woff2"),
url("../fonts/FuturaDemi.woff") format("woff");
}

Expand Down
40 changes: 20 additions & 20 deletions src/less/payex.less
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
@import url("swedbankpay.less");
@import "swedbankpay.less";

/* Override variables */
@import url("variables-payex");
@import "variables-payex";

@import url("components/payex/alert.less");
@import url("components/payex/badge.less");
@import url("components/payex/button.less");
@import url("components/payex/checkbox.less");
@import url("components/payex/datepicker.less");
@import url("components/payex/form.less");
@import url("components/payex/input-group.less");
@import url("components/payex/links.less");
@import url("components/payex/loader.less");
@import url("components/payex/logo.less");
@import url("components/payex/progress-step.less");
@import url("components/payex/radio.less");
@import url("components/payex/sidebar.less");
@import url("components/payex/table.less");
@import url("components/payex/tabs.less");
@import url("components/payex/toast.less");
@import url("components/payex/tooltip.less");
@import url("components/payex/card.less");
@import "components/payex/alert.less";
@import "components/payex/badge.less";
@import "components/payex/button.less";
@import "components/payex/checkbox.less";
@import "components/payex/datepicker.less";
@import "components/payex/form.less";
@import "components/payex/input-group.less";
@import "components/payex/links.less";
@import "components/payex/loader.less";
@import "components/payex/logo.less";
@import "components/payex/progress-step.less";
@import "components/payex/radio.less";
@import "components/payex/sidebar.less";
@import "components/payex/table.less";
@import "components/payex/tabs.less";
@import "components/payex/toast.less";
@import "components/payex/tooltip.less";
@import "components/payex/card.less";

html,
body {
Expand Down
86 changes: 43 additions & 43 deletions src/less/swedbankpay.less
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
@import url("global");
@import url("variables-swedbankpay");
@import url("utilities/all");
@import url("core/all");
@import "global";
@import "variables-swedbankpay";
@import "utilities/all";
@import "core/all";

/* Components */
@import url("components/accordion");
@import url("components/action-list");
@import url("components/alert");
@import url("components/badge");
@import url("components/breadcrumb");
@import url("components/button");
@import url("components/card");
@import url("components/checkbox");
@import url("components/code-tags");
@import url("components/code-view");
@import url("components/dropdown");
@import url("components/datepicker");
@import url("components/dialog");
@import url("components/expandable");
@import url("components/footer");
@import url("components/form");
@import url("components/input-group");
@import url("components/links");
@import url("components/lists");
@import url("components/loader");
@import url("components/media-object");
@import url("components/nav");
@import url("components/pagination");
@import url("components/progress-steps");
@import url("components/panel");
@import url("components/radio");
@import url("components/rangeslider");
@import url("components/sheet");
@import url("components/sidebar");
@import url("components/slab");
@import url("components/status");
@import url("components/skip-link");
@import url("components/tables");
@import url("components/tabs");
@import url("components/toast");
@import url("components/togglebox");
@import url("components/tooltip");
@import url("components/topbar");
@import url("components/validation");
@import "components/accordion";
@import "components/action-list";
@import "components/alert";
@import "components/badge";
@import "components/breadcrumb";
@import "components/button";
@import "components/card";
@import "components/checkbox";
@import "components/code-tags";
@import "components/code-view";
@import "components/dropdown";
@import "components/datepicker";
@import "components/dialog";
@import "components/expandable";
@import "components/footer";
@import "components/form";
@import "components/input-group";
@import "components/links";
@import "components/lists";
@import "components/loader";
@import "components/media-object";
@import "components/nav";
@import "components/pagination";
@import "components/progress-steps";
@import "components/panel";
@import "components/radio";
@import "components/rangeslider";
@import "components/sheet";
@import "components/sidebar";
@import "components/slab";
@import "components/status";
@import "components/skip-link";
@import "components/tables";
@import "components/tabs";
@import "components/toast";
@import "components/togglebox";
@import "components/tooltip";
@import "components/topbar";
@import "components/validation";

0 comments on commit ef2ba3a

Please sign in to comment.