Skip to content

Commit 0df5d6a

Browse files
Merge pull request #16 from CornellCustomDev/flux-overrides
splitting out the flux elements and renaming them
2 parents f6658a7 + 2bf9bed commit 0df5d6a

File tree

9 files changed

+928
-12
lines changed

9 files changed

+928
-12
lines changed

package-lock.json

Lines changed: 902 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"@rollup/rollup-linux-x64-gnu": "4.9.5",
2020
"@tailwindcss/oxide-linux-x64-gnu": "^4.0.1",
2121
"lightningcss-linux-x64-gnu": "^1.29.1"
22+
},
23+
"devDependencies": {
24+
"sass-embedded": "^1.97.0"
2225
}
2326
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
div{background-color:#0ff}

public/build/manifest.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
{
2-
"resources/css/app.css": {
3-
"file": "assets/app-BcYKR7z0.css",
4-
"src": "resources/css/app.css",
2+
"resources/css/app.scss": {
3+
"file": "assets/app-ppwW4VC5.css",
4+
"src": "resources/css/app.scss",
55
"isEntry": true,
66
"name": "app",
77
"names": [
88
"app.css"
99
]
1010
},
11+
"resources/css/flux-cds.css": {
12+
"file": "assets/flux-cds-BcYKR7z0.css",
13+
"src": "resources/css/flux-cds.css",
14+
"isEntry": true,
15+
"name": "flux-cds",
16+
"names": [
17+
"flux-cds.css"
18+
]
19+
},
1120
"resources/js/app.js": {
1221
"file": "assets/app-l0sNRNKZ.js",
1322
"name": "app",

resources/css/app.scss

Whitespace-only changes.

resources/views/components/layouts/app.blade.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99

1010
<link rel="icon" href="{{ asset('cds/favicon.ico') }}" type="image/vnd.microsoft.icon"/>
1111

12-
@vite('resources/css/app.css')
12+
@vite('resources/css/flux-cds.css')
1313
<style>
1414
@import "{{ asset('cds/css/base.css') }}" layer(base);
1515
</style>
16+
@vite('resources/css/app.scss')
1617

1718
<!-- Cornell.edu Typography -->
1819
<link rel="stylesheet" href="https://use.typekit.net/nwp2wku.css">

vite.config.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
import {
2-
defineConfig
3-
} from 'vite';
4-
import laravel from 'laravel-vite-plugin';
1+
import { defineConfig } from "vite";
2+
import laravel from "laravel-vite-plugin";
53
import tailwindcss from "@tailwindcss/vite";
64

75
export default defineConfig({
86
plugins: [
97
laravel({
10-
input: ['resources/css/app.css', 'resources/js/app.js'],
8+
input: [
9+
"resources/css/flux-cds.css",
10+
"resources/css/app.scss",
11+
"resources/js/app.js",
12+
],
1113
refresh: true,
1214
}),
1315
tailwindcss(),
1416
],
1517
server: {
1618
cors: true,
1719
},
18-
});
20+
});

0 commit comments

Comments
 (0)