Skip to content

Commit 24b377d

Browse files
suryav9724Gunnar Mills
authored andcommitted
style: add Sass configuration for Vue 3
Configure sass in the vue.config.js file and remove the import of the scss file from each page. The styles are handled by the css loaderOptions in the config file. Every component and page has the appropriate style applied. The appearance adjusts to the openBmc webui in Vue 2. Change-Id: I3773c063646185b80b7bd61d05aa80a993cbd121 Signed-off-by: Surya Venkatesan <[email protected]>
1 parent 730c0ce commit 24b377d

33 files changed

+50
-140
lines changed

src/App.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,5 @@ export default {
3535
</script>
3636

3737
<style lang="scss">
38-
//@import '@/assets/styles/_obmc-custom';
39-
//@import './assets/styles/bootstrap/_helpers.scss';
38+
@import '@/assets/styles/_obmc-custom';
4039
</style>

src/assets/styles/bmc/custom/_buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
position: absolute;
7474
right: 0;
7575
top: 0;
76-
//z-index: $zindex-dropdown + 1;
76+
z-index: $zindex-dropdown + 1;
7777
}
7878

7979
// Contain input buttons within input

src/assets/styles/bmc/custom/_dropdown.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
@import 'bootstrap/dist/css/bootstrap.css';
2-
31
// Make calendar visible over the table
42
.dropdown-menu {
5-
//z-index: $zindex-dropdown + 1;
3+
z-index: $zindex-dropdown + 1;
64
padding: 0;
75
}
86
.dropdown-item {
@@ -30,4 +28,4 @@
3028
box-shadow: inset 0 0 0 2px theme-color("primary");
3129
}
3230
}
33-
}
31+
}

src/assets/styles/bmc/custom/_tables.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
@import 'bootstrap/dist/css/bootstrap.css'
2-
31
.table {
42
position: relative;
5-
//z-index: $zindex-dropdown;
3+
z-index: $zindex-dropdown;
64

75
td {
86
border-top: 1px solid gray("300");

src/components/AppHeader/AppHeader.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@ export default {
249249
</script>
250250
251251
<style lang="scss">
252-
@import '@/assets/styles/bmc/helpers/_index.scss';
253-
@import '@/assets/styles/bootstrap/_helpers.scss';
254-
255252
@mixin focus-box-shadow($padding-color: $navbar-color, $outline-color: $white) {
256253
box-shadow:
257254
inset 0 0 0 3px $padding-color,
@@ -262,11 +259,11 @@ export default {
262259
position: absolute;
263260
top: -60px;
264261
left: 0.5rem;
265-
//z-index: $zindex-popover;
266-
//transition: $duration--moderate-01 $exit-easing--expressive;
262+
z-index: $zindex-popover;
263+
transition: $duration--moderate-01 $exit-easing--expressive;
267264
&:focus {
268265
top: 0.5rem;
269-
//transition-timing-function: $entrance-easing--expressive;
266+
transition-timing-function: $entrance-easing--expressive;
270267
}
271268
}
272269
.navbar-text,
@@ -295,7 +292,6 @@ export default {
295292
.navbar {
296293
padding: 0;
297294
background-color: $navbar-color;
298-
299295
@include media-breakpoint-up($responsive-layout-bp) {
300296
height: $header-height;
301297
}

src/components/AppNavigation/AppNavigation.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ export default {
103103
};
104104
</script>
105105
106-
<style lang="scss" scoped>
107-
@import '@/assets/styles/bmc/helpers/_index.scss';
108-
@import '@/assets/styles/bootstrap/_helpers.scss';
109-
106+
<style scoped lang="scss">
110107
svg {
111108
fill: currentColor;
112109
height: 1.2rem;

src/components/Global/ButtonBackToTop.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ export default {
4747
</script>
4848

4949
<style lang="scss" scoped>
50-
@import '@/assets/styles/bmc/helpers/_index.scss';
51-
@import '@/assets/styles/bootstrap/_helpers.scss';
52-
5350
.btn-top {
5451
position: fixed;
5552
bottom: 24px;

src/components/Global/FormFile.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ export default {
8484
</script>
8585

8686
<style lang="scss" scoped>
87-
@import '@/assets/styles/bmc/helpers/_index.scss';
88-
@import '@/assets/styles/bootstrap/_helpers.scss';
89-
9087
.form-control-file {
9188
opacity: 0;
9289
height: 0;

src/components/Global/InfoTooltip.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ export default {
3131
</script>
3232

3333
<style lang="scss" scoped>
34-
@import '@/assets/styles/bmc/helpers/_index.scss';
35-
@import '@/assets/styles/bootstrap/_helpers.scss';
36-
3734
.btn-tooltip {
3835
padding: 0;
3936
line-height: 1em;

src/components/Global/InputPasswordToggle.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ export default {
5353
</script>
5454

5555
<style lang="scss" scoped>
56-
@import '@/assets/styles/bmc/helpers/_index.scss';
57-
@import '@/assets/styles/bootstrap/_helpers.scss';
58-
5956
.input-password-toggle-container {
6057
position: relative;
6158
}

0 commit comments

Comments
 (0)