Skip to content

Commit

Permalink
fix: Update frappe-ui and rename text-icons to text-ink
Browse files Browse the repository at this point in the history
  • Loading branch information
surajshetty3416 committed Nov 22, 2024
1 parent f7da69e commit 14a1a29
Show file tree
Hide file tree
Showing 29 changed files with 136 additions and 361 deletions.
83 changes: 0 additions & 83 deletions frontend/espresso_colors.js

This file was deleted.

8 changes: 4 additions & 4 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const isDark = useDark({
[id^="headlessui-dialog-panel"] > div > div > div > div.mb-6.flex.items-center.justify-between > button {
@apply bg-surface-gray-1;
@apply hover:bg-surface-gray-3;
@apply stroke-text-icons-gray-8;
@apply hover:stroke-text-icons-gray-9;
@apply stroke-ink-gray-8;
@apply hover:stroke-ink-gray-9;
> svg {
@apply stroke-[0.2px];
@apply h-[14px];
Expand All @@ -63,7 +63,7 @@ const isDark = useDark({
[id^="headlessui-dialog-panel"] > div,
[id^="headlessui-dialog-panel"] .space-y-4 > p {
@apply bg-surface-white;
@apply text-text-icons-gray-8;
@apply text-ink-gray-8;
}
[id^="headlessui-dialog-panel"] header h3 {
Expand All @@ -82,7 +82,7 @@ const isDark = useDark({
[id^="headlessui-combobox-options"] {
@apply bg-surface-white;
@apply dark:bg-surface-gray-1;
@apply text-text-icons-gray-7;
@apply text-ink-gray-7;
@apply overflow-y-auto;
-ms-overflow-style: none; /* IE and Edge */
Expand Down
152 changes: 0 additions & 152 deletions frontend/src/colors.css

This file was deleted.

6 changes: 3 additions & 3 deletions frontend/src/components/BlockLayers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
:data-block-layer-id="element.blockId"
:title="element.blockId"
@contextmenu.prevent.stop="onContextMenu"
class="min-w-24 cursor-pointer overflow-hidden rounded border border-transparent bg-surface-white bg-opacity-50 text-base text-text-icons-gray-7"
class="min-w-24 cursor-pointer overflow-hidden rounded border border-transparent bg-surface-white bg-opacity-50 text-base text-ink-gray-7"
@click.stop="
store.activeCanvas?.history.pause();
store.selectBlock(element, $event, false, true);
Expand All @@ -30,7 +30,7 @@
}">
<FeatherIcon
:name="isExpanded(element) ? 'chevron-down' : 'chevron-right'"
class="ml-[-18px] h-3 w-3 text-text-icons-gray-4"
class="ml-[-18px] h-3 w-3 text-ink-gray-4"
v-if="element.children && element.children.length && !element.isRoot()"
@click.stop="toggleExpanded(element)" />
<FeatherIcon
Expand Down Expand Up @@ -67,7 +67,7 @@
:name="element.isVisible() ? 'eye' : 'eye-off'"
class="ml-auto mr-2 hidden h-3 w-3 group-hover:block"
@click.stop="element.toggleVisibility()" />
<span v-if="element.isRoot()" class="ml-auto mr-2 text-sm capitalize text-text-icons-gray-5">
<span v-if="element.isRoot()" class="ml-auto mr-2 text-sm capitalize text-ink-gray-5">
{{ store.activeBreakpoint }}
</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/BuilderBlockTemplates.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}">
<img :src="blockTemplate.preview" />
</div>
<p class="text-sm text-text-icons-gray-6">
<p class="text-sm text-ink-gray-6">
{{ blockTemplate.template_name }}
</p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/BuilderCanvas.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="overlay absolute" id="overlay" ref="overlay" />
<Transition name="fade">
<div
class="absolute bottom-0 left-0 right-0 top-0 z-[19] grid w-full place-items-center bg-surface-gray-1 p-10 text-text-icons-gray-5"
class="absolute bottom-0 left-0 right-0 top-0 z-[19] grid w-full place-items-center bg-surface-gray-1 p-10 text-ink-gray-5"
v-show="store.settingPage">
<LoadingIcon></LoadingIcon>
</div>
Expand All @@ -31,8 +31,8 @@
:name="breakpoint.icon"
class="h-8 w-6"
:class="{
'text-text-icons-gray-8': breakpoint.visible,
'text-text-icons-gray-3': !breakpoint.visible,
'text-ink-gray-8': breakpoint.visible,
'text-ink-gray-3': !breakpoint.visible,
}" />
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/BuilderLeftPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<button
v-for="option of leftPanelOptions"
:key="option.value"
class="flex size-8 items-center justify-center rounded text-text-icons-gray-7 hover:bg-surface-gray-2 focus:!bg-surface-gray-3"
class="flex size-8 items-center justify-center rounded text-ink-gray-7 hover:bg-surface-gray-2 focus:!bg-surface-gray-3"
:class="{
'bg-surface-gray-3 text-text-icons-gray-9': store.leftPanelActiveTab === option.value,
'bg-surface-gray-3 text-ink-gray-9': store.leftPanelActiveTab === option.value,
}"
@click.stop="setActiveTab(option.value as LeftSidebarTabOption)"
:title="option.label">
Expand Down Expand Up @@ -71,6 +71,7 @@
import ComponentIcon from "@/components/Icons/Component.vue";
import LayersIcon from "@/components/Icons/Layers.vue";
import PlusIcon from "@/components/Icons/Plus.vue";
import PageScript from "@/components/PageScript.vue";
import Block from "@/utils/block";
import convertHTMLToBlocks from "@/utils/convertHTMLToBlocks";
import { createResource } from "frappe-ui";
Expand All @@ -81,7 +82,6 @@ import BuilderAssets from "./BuilderAssets.vue";
import BuilderBlockTemplates from "./BuilderBlockTemplates.vue";
import BuilderCanvas from "./BuilderCanvas.vue";
import PanelResizer from "./PanelResizer.vue";
import PageScript from "@/components/PageScript.vue";
const pageCanvas = inject("pageCanvas") as Ref<InstanceType<typeof BuilderCanvas> | null>;
const fragmentCanvas = inject("fragmentCanvas") as Ref<InstanceType<typeof BuilderCanvas> | null>;
Expand Down
Loading

0 comments on commit 14a1a29

Please sign in to comment.