Skip to content

Commit

Permalink
Merge pull request #286 from qor5/feat-ui-reborn
Browse files Browse the repository at this point in the history
chore: adjusting of app config
  • Loading branch information
danni-cool authored Sep 18, 2024
2 parents 0ec721d + c9e7b86 commit 1ee668d
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 196 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea
*.DS_Store
__*
!__tests__
!__tests__
vite.config.ts.timestamp-*.mjs
1 change: 1 addition & 0 deletions ui/vuetifyx/vuetifyxjs/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ declare module 'vue' {
StringItem: typeof import('./src/lib/Filter/components/StringItem.vue')['default']
TextDatepicker: typeof import('./src/lib/TextDatepicker.vue')['default']
TiptapEditor: typeof import('./src/lib/TiptapEditor/TiptapEditor.vue')['default']
VXDialog: typeof import('./src/lib/Common/VXDialog.vue')['default']
VXField: typeof import('./src/lib/Form/VXField.vue')['default']
VXLabel: typeof import('./src/lib/Common/VXLabel.vue')['default']
VXSelect: typeof import('./src/lib/Form/VXSelect.vue')['default']
Expand Down
2 changes: 1 addition & 1 deletion ui/vuetifyx/vuetifyxjs/dist/assets/vuetifyx.min.css

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions ui/vuetifyx/vuetifyxjs/src/lib/Common/VXDialog.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<template>
<div class="vx-dialog-wrap">

</div>
</template>

<script setup lang='ts'>
</script>

<style lang="sass" scoped>
</style>
48 changes: 30 additions & 18 deletions ui/vuetifyx/vuetifyxjs/src/lib/scss/page/_Detailing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
}
}

&.can-edit {
.section-body:hover>.v-card {
box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12), 0px 6px 10px 0px rgba(0, 0, 0, 0.14);
}
}

// &:not(.edit-view) {
// .section-body .v-card-text {
// padding-bottom: 0;
Expand All @@ -61,6 +67,28 @@
}
}

.value-type-media-wrap .media-box-wrap,
.timeline-block .media-box-wrap,
.section-content .media-box-wrap {
padding-left: 12px;
padding-top:0;
padding-bottom:0;
margin-bottom:16px;
margin-top: 16px;
.v-card {
overflow: hidden;
box-shadow: none;
width: 194px;
height: 80px;
}
}

.section-wrap:not(.edit-view) .value-type-media-wrap .media-box-wrap,
.section-wrap:not(.edit-view) .timeline-block .media-box-wrap,
.section-wrap:not(.edit-view) .section-content .media-box-wrap {
margin-top: 0;
}

.section-title-wrap {
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -183,23 +211,7 @@
.section-content {
position: relative;
}
.value-type-media-wrap .media-box-wrap,
.timeline-block .media-box-wrap,
.section-content .media-box-wrap {
padding-left: 12px;
padding-top:0;
padding-bottom:0;
margin-bottom:16px;
margin-top: 16px;
.v-card {
overflow: hidden;
box-shadow: none;
width: 194px;
height: 80px;
}
}



.section-edit-area {
text-align: right;
&.top-area {
Expand Down Expand Up @@ -237,7 +249,7 @@
}

.amount-detail-wrap {
margin: -16px 0 40px 0;
margin: 24px 0 40px 0;
padding: 16px;
border-radius: 4px;
background: rgb(var(--v-theme-grey-lighten-5));
Expand Down
4 changes: 4 additions & 0 deletions ui/vuetifyx/vuetifyxjs/src/lib/scss/sites/k-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
}
}
}

.detailing-page-wrap .section-body .v-card {
margin-bottom: 40px!important;
}
}

%menu-background-pink {
Expand Down

This file was deleted.

Loading

0 comments on commit 1ee668d

Please sign in to comment.