Merge version_8 into main

Merge version_8 into main
This commit was merged in pull request #21.
This commit is contained in:
2026-02-20 23:40:54 +00:00
2 changed files with 21 additions and 20 deletions

View File

@@ -1,12 +1,12 @@
import type { Metadata } from "next";
import { Manrope } from "next/font/google";
import { Inter } from "next/font/google";
import { DM_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const dmSans = DM_Sans({
@@ -35,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${manrope.variable} ${dmSans.variable} antialiased`}
className={`${inter.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{children}
@@ -184,7 +184,7 @@ export default function RootLayout({
const buttonClasses = ['btn', 'button', 'cta', 'action-button'];
const hasButtonClass = buttonClasses.some(cls =>
element.classList.contains(cls) || element.classList.contains(\`btn-\${cls}\`)
element.classList.contains(cls) || element.classList.contains(`btn-${cls}`)
);
if (hasButtonClass && element.textContent && element.textContent.trim().length > 0) {
@@ -293,7 +293,8 @@ export default function RootLayout({
className = element.className.baseVal;
}
}
} catch (e) {}
}
catch (e) {}
const info = {
tagName: tagName,
@@ -676,17 +677,17 @@ export default function RootLayout({
const rect = element.getBoundingClientRect();
const overlay = document.createElement('div');
overlay.className = 'webild-hover-overlay';
overlay.style.cssText = \`
overlay.style.cssText = `
position: fixed !important;
top: \${rect.top - 2}px !important;
left: \${rect.left - 2}px !important;
width: \${rect.width + 4}px !important;
height: \${rect.height + 4}px !important;
top: ${rect.top - 2}px !important;
left: ${rect.left - 2}px !important;
width: ${rect.width + 4}px !important;
height: ${rect.height + 4}px !important;
background-color: rgba(90, 113, 230, 0.15) !important;
pointer-events: none !important;
z-index: 999998 !important;
transition: all 0.15s ease !important;
\`;
`;
document.body.appendChild(overlay);
return overlay;
};
@@ -749,11 +750,11 @@ export default function RootLayout({
elementTypeLabel.classList.add('label-bottom');
}
elementTypeLabel.style.cssText = \`
left: \${labelLeft}px !important;
top: \${labelTop}px !important;
elementTypeLabel.style.cssText = `
left: ${labelLeft}px !important;
top: ${labelTop}px !important;
transform: none !important;
\`;
`;
};
const removeElementTypeLabel = () => {
@@ -1007,7 +1008,7 @@ export default function RootLayout({
const getStorageKey = () => {
const url = new URL(window.location.href);
const pathParts = url.pathname.split('/').filter(Boolean);
return \`webild-changes-\${pathParts.join('-')}\`;
return `webild-changes-${pathParts.join('-')}`;
};
const saveChangeToStorage = (change) => {
@@ -1243,7 +1244,7 @@ export default function RootLayout({
if (isBackground) {
oldValue = window.getComputedStyle(element).backgroundImage;
element.style.backgroundImage = \`url('\${newSrc}')\`;
element.style.backgroundImage = `url('${newSrc}')`;
replaced = true;
} else if (element.tagName.toLowerCase() === 'img') {
oldValue = element.src;
@@ -1278,7 +1279,7 @@ export default function RootLayout({
const hasBackgroundImage = window.getComputedStyle(element).backgroundImage !== 'none';
if (hasBackgroundImage) {
oldValue = window.getComputedStyle(element).backgroundImage;
element.style.backgroundImage = \`url('\${newSrc}')\`;
element.style.backgroundImage = `url('${newSrc}')`;
replaced = true;
}
}

View File

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-manrope), sans-serif;
font-family: var(--font-inter), sans-serif;
}