Skip to content

Commit

Permalink
Use tailwind in aerie. Integrate with pre-release svelte stellar.
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronPlave committed Oct 30, 2024
1 parent e8fc7b9 commit e05db3f
Show file tree
Hide file tree
Showing 8 changed files with 214 additions and 77 deletions.
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"GraphQL.vscode-graphql",
"christian-kohler.path-intellisense",
"streetsidesoftware.code-spell-checker",
"spmeesseman.vscode-taskexplorer"
"spmeesseman.vscode-taskexplorer",
"bradlc.vscode-tailwindcss"
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@
},
"[svelte]": {
"editor.defaultFormatter": "svelte.svelte-vscode"
},
"files.associations": {
"*.css": "tailwindcss"
}
}
249 changes: 183 additions & 66 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"@fontsource/jetbrains-mono": "^5.0.19",
"@nasa-jpl/aerie-ampcs": "^1.0.5",
"@nasa-jpl/seq-json-schema": "^1.0.20",
"@nasa-jpl/stellar": "^2.0.0-alpha.24",
"@nasa-jpl/stellar-svelte": "^2.0.0-alpha.24",
"@nasa-jpl/stellar": "^2.0.0-alpha.27",
"@nasa-jpl/stellar-svelte": "^2.0.0-alpha.27",
"@streamparser/json": "^0.0.17",
"@sveltejs/adapter-node": "5.0.1",
"@sveltejs/kit": "^2.5.4",
Expand Down Expand Up @@ -110,6 +110,7 @@
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitest/coverage-v8": "^1.4.0",
"@vitest/ui": "^1.4.0",
"autoprefixer": "^10.4.20",
"cloc": "2.0.0-cloc",
"codemirror": "^6.0.1",
"d3-format": "^3.1.0",
Expand All @@ -121,6 +122,7 @@
"jsdom": "^24.0.0",
"picocolors": "^1.0.0",
"picomatch": "^4.0.1",
"postcss": "^8.4.47",
"postcss-html": "^1.5.0",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.2.2",
Expand All @@ -129,6 +131,7 @@
"stylelint-config-html": "^1.1.0",
"stylelint-order": "^6.0.4",
"svelte-check": "^3.4.4",
"tailwindcss": "^3.4.14",
"tslib": "^2.6.0",
"typescript": "5.0.4",
"unique-names-generator": "^4.7.1",
Expand Down
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default {
plugins: {
autoprefixer: {},
tailwindcss: {},
},
};
7 changes: 0 additions & 7 deletions src/components/app/Nav.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script lang="ts">
import { Button, Popover } from '@nasa-jpl/stellar-svelte';
import AppMenu from '../../components/menus/AppMenu.svelte';
import type { User, UserRole } from '../../types/app';
import { getTarget } from '../../utilities/generic';
Expand All @@ -24,11 +22,6 @@
<div class="nav">
<div class="left">
<AppMenu {user} />
<Button>Help</Button>
<Popover.Root>
<Popover.Trigger><Button on:click={() => console.log(1)}>Popover</Button></Popover.Trigger>
<Popover.Content>Place content for the popover here.</Popover.Content>
</Popover.Root>
<div class="divider" />
<div class="title st-typography-medium">
<slot name="title" />
Expand Down
6 changes: 5 additions & 1 deletion src/css/app.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'tippy.js/dist/tippy.css';
@import 'toastify-js/src/toastify.css';
@import 'ag-grid-community/styles/ag-grid.min.css';
@import '@nasa-jpl/stellar-svelte/styles';
@import '@nasa-jpl/stellar-svelte/theme';

@import '@fontsource/jetbrains-mono/index.css';

Expand All @@ -20,6 +20,10 @@
@import './tooltip.css';
@import './icon.css';

@tailwind base;
@tailwind components;
@tailwind utilities;

/* Inherit fonts for inputs and buttons */
input,
button,
Expand Down
10 changes: 10 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/* eslint-disable sort-keys */
/** @type {import('tailwindcss').Config} */
export default {
content: ['./node_modules/@nasa-jpl/stellar-svelte/dist/**/*.{html,js,svelte,ts}', './src/**/*.{html,js,svelte,ts}'],
theme: {
extend: {},
},
plugins: [],
presets: [require('@nasa-jpl/stellar-svelte/tailwindConfig')],
};

0 comments on commit e05db3f

Please sign in to comment.