Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d89e8c2

Browse files
authoredMar 7, 2025
Merge pull request #1484 from ASU/uds-1964
uds-1964: assets should not have absolute path
2 parents a789a9d + 949367c commit d89e8c2

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed
 

‎packages/static-site/src/App.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
import '@asu/unity-bootstrap-theme';
1+
import "@asu/unity-bootstrap-theme";
2+
// The above import statement is equivalent to the following:
3+
// import "@asu/unity-bootstrap-theme/dist/unity-bootstrap-theme.bundle.css";
24
import "~/App.css";
3-
import Page from '~/components/Page';
5+
import Page from "~/components/Page";
46
import { Outlet, ScrollRestoration } from "react-router-dom";
57

68
function App(): JSX.Element {

‎packages/static-site/src/pages/Home.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import { Divider } from "@asu/unity-react-core";
88
const Home = () => {
99
return (
1010
<>
11-
<div className="uds-hero-sm">
12-
<img className="hero" src="./assets/img/grey-bg.jpg" />
11+
<div className="uds-hero-sm bg morse-code-black">
1312
<h1>
14-
<span className="highlight-black">Unity Component Explorer</span>
13+
<span className="highlight-gold">Unity Component Explorer</span>
1514
</h1>
1615
</div>
1716
<div className="container">

‎packages/unity-bootstrap-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"default": "./src/js/data-layer.js"
8787
},
8888
"./*": "./*",
89-
".": "./dist/unity-bootstrap-theme.css"
89+
".": "./dist/css/unity-bootstrap-theme.css"
9090
},
9191
"peerDependencies": {
9292
"@fortawesome/fontawesome-free": "^5.15.3"

‎packages/unity-bootstrap-theme/src/scss/_shared.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// load brand rules (former design tokens)
22
@import "custom-asu-variables";
33
// default path for image assets (assuming the images will be hosted from the web root). Storybook and themes override this for their particular path needs
4-
$image-assets-path: "/img" !default;
4+
$image-assets-path: "../img" !default;
55

66
/*
77
TODO: all imports below belong to the previous bootstrap 4 package, you have to check each import and be careful when removing it.

‎packages/unity-bootstrap-theme/vite.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ const c = {
6161
chunkFileNames: "js/[name].[format]",
6262
assetFileNames: (assetInfo) => {
6363
if (assetInfo.originalFileNames && assetInfo.originalFileNames[0].includes("bundle")) {
64-
return "unity-bootstrap-theme.bundle.[ext]";
64+
return "css/unity-bootstrap-theme.bundle.[ext]";
6565
}
66-
return "[name].[ext]";
66+
return "css/[name].[ext]";
6767
},
6868
format: "es",
6969
},

0 commit comments

Comments
 (0)