Skip to content

Commit

Permalink
merge: #4043
Browse files Browse the repository at this point in the history
4043: ui improvements and bug fixes pt 4 r=wendybujalski a=wendybujalski

- Improve UI for the Test tab on the CustomizeAsset screen, disable the panel expanding
- finish improvements to the Properties tab on the CustomizeAsset screen, better icons
- make the functions panel section collapse when you select multiple assets
- fix search filter padding issues on Customize screen
- IconButton improvements, new ErrorMessage variant

Co-authored-by: wendybujalski <wendydbujalski@gmail.com>
  • Loading branch information
si-bors-ng[bot] and wendybujalski authored Jun 25, 2024
2 parents b0ba249 + c1558e7 commit a6acbd6
Show file tree
Hide file tree
Showing 11 changed files with 319 additions and 262 deletions.
7 changes: 1 addition & 6 deletions app/web/src/components/AssetCard.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<template>
<div
v-if="asset"
:class="
clsx(
'p-xs border-l-4 border relative',
titleCard ? 'mb-xs' : 'rounded-md',
)
"
:class="clsx('p-xs border-l-4 border relative', !titleCard && 'rounded-md')"
:style="{
borderColor: asset.color,
backgroundColor: `#${bodyBg.toHex()}`,
Expand Down
4 changes: 2 additions & 2 deletions app/web/src/components/AssetFuncListPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<EmptyStateCard
v-if="assetStore.selectedAssets.length > 1"
iconName="funcs"
primaryText=""
secondaryText="You have selected multiple assets above"
primaryText="Cannot Select Functions"
secondaryText="You have selected multiple assets above. To select a function, select one asset."
/>
<EmptyStateCard
v-else
Expand Down
2 changes: 1 addition & 1 deletion app/web/src/components/AssetListPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@click="() => newAssetModalRef?.modal?.open()"
/>
<IconButton
v-if="canContribute || true"
v-if="canContribute"
class="hover:scale-125"
icon="cloud-upload"
size="sm"
Expand Down
12 changes: 11 additions & 1 deletion app/web/src/components/FilterPill.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
v-if="filter.iconName"
:name="filter.iconName"
size="sm"
:class="clsx(iconClasses, filter.iconName.includes('logo') && 'mx-2xs')"
:class="clsx(iconClasses, extraPadding && 'mx-2xs')"
:style="filter.iconColor && !selected ? { color: filter.iconColor } : {}"
/>
<div class="pr-2xs">
Expand Down Expand Up @@ -41,4 +41,14 @@ const iconClasses = computed(() => {
return getToneTextColorClass(props.filter.iconTone);
} else return "";
});
// Add an icon to this list if it needs to have additional X padding to look right
const extraPaddingIcons = ["cloud-upload", "code-deployed"];
const extraPadding = computed(
() =>
props.filter.iconName &&
(props.filter.iconName.includes("logo") ||
extraPaddingIcons.includes(props.filter.iconName)),
);
</script>
Loading

0 comments on commit a6acbd6

Please sign in to comment.