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

Jump to bottom

fix(forms): misc style fix #942

Merged
merged 1 commit into from
Nov 23, 2023
Merged

fix(forms): misc style fix #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/core/forms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"extends": "../../../package.json"
},
"dependencies": {
"@kong/icons": "^1.8.0",
"fecha": "^4.2.3",
"lodash": "^4.17.21"
},
Expand Down
1 change: 0 additions & 1 deletion packages/core/forms/src/generator/FormGenerator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,6 @@ export default {

&:hover {
background-color: #e6e6e6;
border-color: #adadad;
color: #333;
}

Expand Down
17 changes: 11 additions & 6 deletions packages/core/forms/src/generator/fields/advanced/FieldArrayCardContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
</KCard>

<KButton
appearance="tertiary"
class="array-card-remove-button"
@click="$emit('remove-item')"
>
<template #icon>
<KIcon
icon="trash"
size="18"
/>
</template>
<TrashIcon />
</KButton>
</div>
</template>

<script>
import { TrashIcon } from '@kong/icons'
export default {
name: 'FieldArrayCardContainer',

components: { TrashIcon },

props: {
model: {
type: Object,
Expand Down Expand Up @@ -50,10 +50,15 @@ export default {

<style lang="scss" scoped>
.array-card-container {
align-items: center;
display: flex;

.card {
margin-bottom: 8px;
}

.array-card-remove-button {
margin-left: 12px;
}
}
</style>
10 changes: 4 additions & 6 deletions packages/core/forms/src/generator/fields/advanced/FieldArrayItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@
type="button"
@click="$emit('remove-item')"
>
<template #icon>
<KIcon
icon="trash"
size="18"
/>
</template>
<TrashIcon />
</KButton>
</div>
</template>

<script>
import { TrashIcon } from '@kong/icons'

export default {
name: 'FieldArrayItem',
components: { TrashIcon },
props: {
model: {
type: String,
Expand Down
25 changes: 14 additions & 11 deletions packages/core/forms/src/generator/fields/advanced/FieldMetric.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,33 @@
@click="contentVisible = !contentVisible"
>
{{ model.name ? model.name : 'New Item' }}
<i class="material-icons">add</i>
<AddIcon class="metric-add-icon" />
</div>
<transition name="slide-fade">
<div
v-if="contentVisible"
class="content"
>
<slot />
<i
class="material-icons"
<KButton
appearance="tertiary"
class="metric-remove-button"
@click="$emit('remove-item')"
>
delete
</i>
<TrashIcon />
</KButton>
</div>
</transition>
</div>
</template>

<script>
import { AddIcon, TrashIcon } from '@kong/icons'
import abstractField from '../abstractField'

export default {
name: 'FieldMetric',
components: { AddIcon, TrashIcon },
mixins: [abstractField],
emits: ['remove-item'],

Expand Down Expand Up @@ -76,7 +79,7 @@ export default {
width: 100%;
&:hover { background-color: #f5f5f5; }
}
i {
.metric-add-icon {
margin-left: auto;
transition: all .7s;
user-select: none;
Expand All @@ -87,10 +90,8 @@ export default {
height: auto;
overflow: hidden;
transition: all .5s;
i:hover {
color: #c9302c;
}
.material-icons {

.metric-remove-button {
float: right;
margin-bottom: 16px;
margin-right: 16px;
Expand All @@ -99,6 +100,8 @@ export default {
padding: 16px;
}
}
&.active .title i { transform: rotate(135deg); }
&.active .title .metric-add-icon {
transform: rotate(45deg);
}
}
</style>
11 changes: 0 additions & 11 deletions packages/core/forms/src/generator/fields/advanced/FieldObjectAdvanced.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,17 +211,6 @@ export default {
},
}
</script>
<style lang="scss">
.vue-form-generator .field-wrap {
.k-button {
&,
&:hover {
background: none;
border: none;
}
}
}
</style>

<style lang="scss" scoped>
.object-advanced-wrapper {
Expand Down
1 change: 1 addition & 0 deletions packages/entities/entities-shared/src/components/entity-filter/EntityFilter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<template #actionButton>
<div class="filter-clear-button-container">
<KButton
appearance="tertiary"
size="small"
@click="clearFields"
>
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading