Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NeoLoading to tailwindcss and added icons to historie #8412

Merged
merged 2 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libs/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
"vite": "^4.5.0"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/vue-fontawesome": "^3.0.5",
"@google/model-viewer": "^3.3.0",
"@vueuse/core": "^9.13.0",
"bulma": "0.9.4",
Expand Down
7 changes: 1 addition & 6 deletions libs/ui/src/components/NeoLoading/NeoLoading.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
@import '../../scss/theme';
@import '@oruga-ui/oruga-next/src/scss/utilities/expressions.scss';
@import '@oruga-ui/oruga-next/src/scss/utilities/variables.scss';
@import '@oruga-ui/oruga-next/src/scss/utilities/animations.scss';
@import '@oruga-ui/oruga-next/src/scss/utilities/helpers.scss';
@import '../../scss/variable.scss';

$loading-overlay: rgb(0 0 0 / 0.5);

@import '@oruga-ui/oruga-next/src/scss/components/loading.scss';

.o-load__overlay {
background-color: rgba(0, 0, 0, 0.5);
}
2 changes: 1 addition & 1 deletion libs/ui/src/components/NeoLoading/NeoLoading.story.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<Story title="NeoLoading" :layout="{ type: 'grid', width: '200px' }">
<Variant title="Loading">
<NeoLoading> Neo Loader</NeoLoading>
<NeoLoading :active="true" />
</Variant>
</Story>
</template>
Expand Down
2 changes: 1 addition & 1 deletion libs/ui/src/components/NeoLoading/NeoLoading.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<OLoading v-bind="$attrs">
<slot>
<NeoIcon icon="spinner-third" spin size="large" class="has-text-white" />
<NeoIcon icon="spinner-third" spin size="large" class="text-white" />
</slot>
</OLoading>
</template>
Expand Down
27 changes: 27 additions & 0 deletions libs/ui/src/histoire.setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,28 @@
import './histoire.scss'

import { defineSetupVue3 } from '@histoire/plugin-vue'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
import { Neo } from './'

export const setupVue3 = defineSetupVue3(({ app }) => {
const script = document.createElement('script')
script.src = 'https://kit.fontawesome.com/54f29b7997.js'
roiLeo marked this conversation as resolved.
Show resolved Hide resolved
script.crossOrigin = 'anonymous'
script.async = true

document.body.appendChild(script)

app.component('FontAwesomeIcon', FontAwesomeIcon).use(Neo, {
customIconPacks: {
fass: {
iconPrefix: 'fa-fw fa-',
},
fasr: {
iconPrefix: 'fa-fw fa-',
},
fab: {
iconPrefix: 'fa-fw fa-',
},
},
})
})
8 changes: 7 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.