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.

Sign up for GitHub

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

Beam SCSS to CSS Styling Updated - Beam #104

Merged
merged 13 commits into from
Apr 22, 2024
+418 −394
Merged

Beam SCSS to CSS Styling Updated - Beam #104

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
27d422d
Converted theme.scss and variables.scss to theme.css
crabinak Apr 10, 2024
d2627ef
updated variable usage
crabinak Apr 10, 2024
b298053
added/refactored styling for navbar and footer
crabinak Apr 11, 2024
f0ff758
updated list item styling
crabinak Apr 11, 2024
fb4e539
removed scoped styling. Removed hardcoded colors from ItemCount
crabinak Apr 12, 2024
3205d04
Added modal styling and pared down variables for easier theming
crabinak Apr 12, 2024
d38af21
updated Itemcheck scoped style
crabinak Apr 12, 2024
6c278aa
fix: update dependencies
Apr 16, 2024
0b95179
refactored variable names to match default and added gray theme
crabinak Apr 18, 2024
2f52871
corrected file path in theme.css
crabinak Apr 18, 2024
4c57fde
cleaned up beam.css
crabinak Apr 19, 2024
76c102f
Added common styles to default.css to avoid repetition
crabinak Apr 20, 2024
d747e3c
Merge remote-tracking branch 'upstream/development' into beam-scss-to…
Apr 22, 2024
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
5 changes: 2 additions & 3 deletions beam/dev/Dev.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ConfirmDialog @closemodal="closeModal" @confirmmodal="confirmModal" />
</BeamModal>
<Navbar @click="handlePrimaryAction">
<template v-slot:title><h1>ITEMS TO RECEIVE</h1></template>
<template v-slot:title><h1 class="nav-title">Items to Receive</h1></template>
<template v-slot:navbaraction>DONE</template>
</Navbar>
<ListView :items="items" @scrollbottom="loadMoreItems" />
Expand Down Expand Up @@ -222,6 +222,7 @@ export default {
}
</script>
<style>
@import './theme.css';
body {
margin: 0;
padding: 0;
Expand All @@ -230,6 +231,4 @@ body {
flex: 1 0 auto;
height: 100%;
}

@import './theme.scss';
</style>
6 changes: 0 additions & 6 deletions beam/dev/_variables.scss
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions beam/dev/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import url('./../themes/_beam-variables.css');
@import url('./../themes/_beam-primary.css');
2 changes: 0 additions & 2 deletions beam/dev/theme.scss
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions beam/dev/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
import { defineConfig } from 'vite'
import { resolve } from 'path'
import vue from '@vitejs/plugin-vue'

const resolveSCSSPath = () => {
if (__dirname.endsWith('dev')) {
return resolve(__dirname, 'variables.scss')
} else if (__dirname.endsWith('src')) {
return resolve(__dirname, './../dev/variables.scss')
}
}

module.exports = {
css: {
preprocessorOptions: {
scss: { additionalData: `@import "${resolveSCSSPath()}";` },
},
},
build: {
lib: {
entry: resolve(__dirname, '../src/index.js'),
Expand Down
Loading
Loading