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

fix(*): replace kicon instances [KHCP-11982] #1413

Merged
merged 2 commits into from
May 16, 2024
Merged

fix(*): replace kicon instances [KHCP-11982] #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c866b9d
fix(*): replace kicon instances [KHCP-11982]
portikM May 16, 2024
1d26001
fix(*): misc fixes [KHCP-11982]
portikM May 16, 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
15 changes: 4 additions & 11 deletions packages/core/app-layout/sandbox/pages/PageHeaderPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@
<KongIcon :color="KUI_COLOR_TEXT_DECORATIVE_AQUA" />
</template>
<template #title-before>
<KIcon
class="title-icon"
color="#169fcc"
icon="graduationHat"
size="20"
/>
<TeamIcon class="title-icon" />
</template>
<template #title-after>
<KBadge appearance="neutral">
Expand All @@ -29,10 +24,8 @@
:label="enabled ? 'Enabled' : 'Disabled'"
label-before
/>
<KButton
appearance="primary"
icon="plus"
>
<KButton appearance="primary">
<AddIcon />
Do Things
</KButton>
</div>
Expand Down Expand Up @@ -111,7 +104,7 @@
import { computed, ref } from 'vue'
import type { BadgeMethodAppearance } from '@kong/kongponents'
import { AppAboutSection, AppPageHeader } from '../../src'
import { EditIcon, KongIcon } from '@kong/icons'
import { EditIcon, KongIcon, TeamIcon, AddIcon } from '@kong/icons'
import { KUI_COLOR_TEXT_DECORATIVE_AQUA } from '@kong/design-tokens'

const breadcrumbs = computed(() => {
Expand Down
11 changes: 7 additions & 4 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 @@ -20,10 +20,9 @@
type="button"
@click="removeElement(index)"
>
<KIcon
icon="trash"
size="18"
/>
<template #icon>
<TrashIcon />
</template>
</KButton>
</div>
</div>
Expand Down Expand Up @@ -87,8 +86,12 @@
</template>

<script>
import { TrashIcon } from '@kong/icons'
import abstractField from '../abstractField'
export default {
components: {
TrashIcon,
},
mixins: [abstractField],
emits: ['model-updated'],
data() {
Expand Down
4 changes: 3 additions & 1 deletion packages/entities/entities-routes/src/components/RouteFormMethodsFields.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@click="$emit('remove')"
>
<template #icon>
<KIcon icon="trash" />
<TrashIcon :color="KUI_COLOR_TEXT_DANGER" />
</template>
</KButton>
</div>
Expand Down Expand Up @@ -74,6 +74,8 @@ import composables from '../composables'
import RoutingRulesEntitiesControls from './RoutingRulesEntitiesControls.vue'
import { BadgeMethodAppearances } from '@kong/kongponents'
import type { BadgeMethodAppearance } from '@kong/kongponents'
import { TrashIcon } from '@kong/icons'
import { KUI_COLOR_TEXT_DANGER } from '@kong/design-tokens'

/** Local types, not exported
* Same pattern used other fields components
Expand Down
38 changes: 9 additions & 29 deletions packages/entities/entities-routes/src/components/RoutingRulesEntitiesControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@
:data-testid="`remove-${routingRulesEntity}`"
@click="$emit('remove')"
>
<KIcon icon="trash" />
<template #icon>
<TrashIcon :color="KUI_COLOR_TEXT_DANGER" />
</template>
</KButton>
<KButton
appearance="tertiary"
:data-testid="`add-${routingRulesEntity}`"
:disabled="isAddDisabled"
@click="$emit('add')"
>
<KIcon
:color="KUI_COLOR_TEXT_PRIMARY_STRONG"
icon="plus"
size="22"
/>
<template #icon>
<AddIcon />
</template>
</KButton>
</div>
</template>

<script setup lang="ts">
import { KUI_COLOR_TEXT_PRIMARY_STRONG } from '@kong/design-tokens'
import { KUI_COLOR_TEXT_DANGER } from '@kong/design-tokens'
import { TrashIcon, AddIcon } from '@kong/icons'

defineProps({
routingRulesEntity: {
Expand All @@ -43,27 +44,6 @@ defineEmits(['remove', 'add'])
<style lang="scss" scoped>
.routing-rules-entities-controls-container {
display: flex;

:deep(.k-button) {
&.remove-button {
svg path {
fill: $kui_color_border_neutral_weak !important;
}

&:hover {
svg path {
fill: $kui_color_border_danger_weak !important;
}
}
}

&[disabled] {
pointer-events: none !important;

.kong-icon {
opacity: 0 !important;
}
}
}
gap: $kui-space-20;
}
</style>
3 changes: 2 additions & 1 deletion packages/entities/entities-shared/sandbox/pages/EntityFormSectionPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<template #footer>
<div class="footer">
<span class="footer-title">Footer slot</span>
<KIcon icon="kong" />
<KongIcon />
</div>
</template>
</EntityFormSection>
Expand All @@ -30,6 +30,7 @@

<script setup lang="ts">
import { EntityFormSection } from '../../src'
import { KongIcon } from '@kong/icons'
</script>

<style lang="scss" scoped>
Expand Down
17 changes: 3 additions & 14 deletions packages/entities/entities-shared/src/components/entity-base-table/EntityBaseTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,13 @@
:width="dropdownMenuWidth"
>
<KButton
appearance="tertiary"
class="actions-trigger"
data-testid="overflow-actions-button"
size="small"
>
<template #icon>
<KIcon
:color="KUI_COLOR_TEXT_NEUTRAL_STRONGER"
icon="more"
size="16"
/>
<MoreIcon />
</template>
</KButton>
<template #items>
Expand Down Expand Up @@ -120,7 +117,6 @@ import { computed, ref } from 'vue'
import composables from '../../composables'
import { useTablePreferences } from '@kong-ui-public/core'
import type { SwrvStateData, HeaderTag, TablePreferences } from '@kong/kongponents'
import { KUI_COLOR_TEXT_NEUTRAL_STRONGER } from '@kong/design-tokens'
import EntityBaseTableCell from './EntityBaseTableCell.vue'

import type {
Expand All @@ -132,7 +128,7 @@ import type {
TableSortParams,
TableErrorMessage,
} from '../../types'
import { AddIcon } from '@kong/icons'
import { AddIcon, MoreIcon } from '@kong/icons'

const props = defineProps({
// table header configuration
Expand Down Expand Up @@ -405,13 +401,6 @@ const handleUpdateTablePreferences = (newTablePreferences: TablePreferences): vo
margin-top: 0;
}
}

.actions-trigger {
background-color: $kui-color-background-transparent!important;
border: none!important;
cursor: pointer!important;
font-weight: $kui-font-weight-regular!important;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

}
</style>

Expand Down
13 changes: 6 additions & 7 deletions ...ges/entities/entities-upstreams-targets/src/components/UpstreamsFormActiveHealthCheck.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,13 @@
appearance="tertiary"
class="btn-remove"
data-testid="btn-remove-header"
:disabled="localHeaders.length === 1"
@click="removeHeader(i)"
>
<template #icon>
<KIcon
<TrashIcon
class="delete-item"
icon="trash"
:color="localHeaders.length > 1 ? KUI_COLOR_TEXT_DANGER : undefined"
/>
</template>
</KButton>
Expand All @@ -133,11 +134,7 @@
@click="addHeader"
>
<template #icon>
<KIcon
color="$kui-color-text-primary-strong"
icon="plus"
size="22"
/>
<AddIcon />
</template>
</KButton>
</div>
Expand Down Expand Up @@ -306,6 +303,8 @@ import {
import type { MultiselectItem, SelectItem } from '@kong/kongponents'
import useHelpers from '../composables/useHelpers'
import links from '../links'
import { AddIcon, TrashIcon } from '@kong/icons'
import { KUI_COLOR_TEXT_DANGER } from '@kong/design-tokens'

const { i18n: { t } } = composables.useI18n()
const { objectsAreEqual } = useHelpers()
Expand Down
7 changes: 4 additions & 3 deletions packages/entities/entities-vaults/src/components/VaultForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@
:label="t('form.config.kong.label')"
:selected-value="VaultProviders.KONG"
>
<KIcon
icon="kong"
size="46"
<KongIcon
:size="KUI_ICON_SIZE_80"
/>
</KRadio>
<KTooltip
Expand Down Expand Up @@ -562,6 +561,8 @@ import {
import { useRouter } from 'vue-router'
import type { AxiosError, AxiosResponse } from 'axios'
import endpoints from '../vaults-endpoints'
import { KongIcon } from '@kong/icons'
import { KUI_ICON_SIZE_80 } from '@kong/design-tokens'

interface ConfigFields {
[VaultProviders.KONG]: KongVaultConfig
Expand Down
1 change: 0 additions & 1 deletion packages/portal/spec-renderer/src/components/operations-list/OperationsListSectionHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<ChevronDownIcon
v-else
:color="`var(--kong-ui-spec-renderer-operations-list-section-icon-color-expanded, ${KUI_COLOR_TEXT_NEUTRAL_STRONGER})`"
icon="chevronDown"
:size="KUI_ICON_SIZE_40"
/>
</div>
Expand Down
Loading