From a2af374fa37eb491f7dcdc7cfb0f70a177820b08 Mon Sep 17 00:00:00 2001 From: bender Date: Thu, 5 Mar 2026 04:37:37 +0000 Subject: [PATCH] Update theme fonts --- src/app/layout.tsx | 103 +++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 70 deletions(-) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 476f9c6..d880c4b 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -5,20 +5,10 @@ import { Roboto } from "next/font/google"; import "./globals.css"; import { ServiceWrapper } from "@/components/ServiceWrapper"; import Tag from "@/tag/Tag"; +import { Nunito } from "next/font/google"; -const halant = Halant({ - variable: "--font-halant", subsets: ["latin"], - weight: ["300", "400", "500", "600", "700"], -}); -const inter = Inter({ - variable: "--font-inter", subsets: ["latin"], -}); -const roboto = Roboto({ - variable: "--font-roboto", subsets: ["latin"], - weight: ["100", "300", "400", "500", "700", "900"], -}); export const metadata: Metadata = { title: "Liberty Landscaping | Southern Gardens & Authentic Landscape Design", description: "Handcrafted Southern landscapes rooted in tradition. Liberty Landscaping transforms outdoor spaces into cherished gathering places. Three generations of expertise serving the Southeast.", keywords: "landscaping, Southern gardens, landscape design, garden maintenance, hardscape, heritage plants, outdoor design, Southeast landscaping", metadataBase: new URL("https://libertyland.com"), @@ -41,6 +31,11 @@ export const metadata: Metadata = { } }; +const nunito = Nunito({ + variable: "--font-nunito", + subsets: ["latin"], +}); + export default function RootLayout({ children, }: Readonly<{ @@ -49,9 +44,7 @@ export default function RootLayout({ return ( - + {children} @@ -1663,9 +1656,7 @@ export default function RootLayout({ const getElementInfo = (element, assignId = false) => { const rect = element.getBoundingClientRect(); const tagName = element.tagName.toLowerCase(); - const selector = getUniqueSelector(element, assignId); - const sectionId = getSectionId(element); - + let className = undefined; try { if (element.className) { @@ -1693,8 +1684,7 @@ export default function RootLayout({ }; if (tagName === 'img') { - const originalSrc = extractOriginalUrl(element.src); - info.imageData = { + info.imageData = { src: originalSrc, alt: element.alt || undefined, naturalWidth: element.naturalWidth, @@ -1705,8 +1695,7 @@ export default function RootLayout({ if (tagName === 'video') { const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || ''; - const resolvedSrc = extractOriginalUrl(rawSrc); - info.imageData = { + info.imageData = { src: resolvedSrc, alt: element.getAttribute('aria-label') || undefined, isBackground: false, @@ -1719,8 +1708,7 @@ export default function RootLayout({ if (backgroundImage && backgroundImage !== 'none') { const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/); if (urlMatch) { - const originalBgSrc = extractOriginalUrl(urlMatch[1]); - if (tagName !== 'img') { + if (tagName !== 'img') { info.imageData = { src: originalBgSrc, isBackground: true @@ -1732,8 +1720,7 @@ export default function RootLayout({ } } - const elementType = getElementType(element); - info.elementType = elementType; + info.elementType = elementType; if (elementType === 'Button') { const buttonText = element.textContent?.trim() || element.value || element.getAttribute('aria-label') || ''; @@ -1826,13 +1813,11 @@ export default function RootLayout({ }; const isTextElement = (element) => { - const elementType = getElementType(element); - return elementType === 'Text'; + return elementType === 'Text'; }; const isButtonElement = (element) => { - const elementType = getElementType(element); - return elementType === 'Button'; + return elementType === 'Button'; }; const updateButtonText = (element, newText) => { @@ -1907,8 +1892,7 @@ export default function RootLayout({ }; const handleInput = () => { - const elementInfo = getElementInfo(element); - let currentText = element.textContent; + let currentText = element.textContent; // Ensure there's always at least a space to keep the element editable if (currentText === '' || currentText === null || currentText.length === 0) { @@ -2021,8 +2005,7 @@ export default function RootLayout({ }, '*'); if (save && originalContent !== element.textContent) { - const elementInfo = getElementInfo(element); - let finalText = element.textContent; + let finalText = element.textContent; // Trim the final text and convert space-only to empty string for saving if (finalText === ' ' || finalText.trim() === '') { @@ -2151,7 +2134,7 @@ export default function RootLayout({ lastMouseX = e.clientX; lastMouseY = e.clientY; - const target = getMostSpecificElement(e.clientX, e.clientY) || e.target; + || e.target; if (!isValidElement(target) || target === hoveredElement || target === selectedElement) { return; @@ -2183,8 +2166,7 @@ export default function RootLayout({ hoverOverlay = createHoverOverlay(target); } - const elementType = getElementType(target); - showElementTypeLabel(target, elementType); + showElementTypeLabel(target, elementType); window.parent.postMessage({ type: 'webild-element-hover', @@ -2226,7 +2208,7 @@ export default function RootLayout({ e.preventDefault(); e.stopPropagation(); - const target = getMostSpecificElement(e.clientX, e.clientY) || e.target; + || e.target; if (!isValidElement(target)) return; if (selectedElement && selectedElement !== target) { @@ -2271,8 +2253,7 @@ export default function RootLayout({ hoveredElement = null; } - const elementInfo = getElementInfo(target, true); - selectedElement.dataset.webildSelector = elementInfo.selector; + selectedElement.dataset.webildSelector = elementInfo.selector; showElementTypeLabel(target, elementInfo.elementType); window.parent.postMessage({ @@ -2355,8 +2336,7 @@ export default function RootLayout({ isScrolling = false; if (lastMouseX > 0 && lastMouseY > 0) { - const target = getMostSpecificElement(lastMouseX, lastMouseY); - if (target && isValidElement(target) && target !== selectedElement) { + if (target && isValidElement(target) && target !== selectedElement) { hoveredElement = target; const computedStyle = window.getComputedStyle(target); @@ -2370,8 +2350,7 @@ export default function RootLayout({ hoveredElement.classList.add(hoverClass); hoverOverlay = createHoverOverlay(target); - const elementType = getElementType(target); - showElementTypeLabel(target, elementType); + showElementTypeLabel(target, elementType); window.parent.postMessage({ type: 'webild-element-hover', @@ -2394,8 +2373,7 @@ export default function RootLayout({ const saveChangeToStorage = (change) => { try { - const storageKey = getStorageKey(); - const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]'); + const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]'); const filteredChanges = existingChanges.filter(c => { return !(c.oldValue === change.oldValue && c.sectionId === change.sectionId); @@ -2415,8 +2393,7 @@ export default function RootLayout({ const clearLocalChanges = () => { try { - const storageKey = getStorageKey(); - localStorage.removeItem(storageKey); + localStorage.removeItem(storageKey); window.parent.postMessage({ type: 'webild-local-changes-cleared', data: {} @@ -2465,8 +2442,7 @@ export default function RootLayout({ if (e.data.type === 'webild-cancel-changes') { try { - const storageKey = getStorageKey(); - const savedChanges = localStorage.getItem(storageKey); + const savedChanges = localStorage.getItem(storageKey); if (savedChanges) { const changes = JSON.parse(savedChanges); changes.forEach(change => { @@ -2488,8 +2464,7 @@ export default function RootLayout({ if (isBackground) { element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : ''; } else { - const oldMediaType = getMediaTypeFromUrl(change.oldValue); - if (revertTag === 'video' && oldMediaType === 'image') { + if (revertTag === 'video' && oldMediaType === 'image') { swapMediaElement(element, 'img', change.oldValue); } else if (revertTag === 'img' && oldMediaType === 'video') { swapMediaElement(element, 'video', change.oldValue); @@ -2537,8 +2512,7 @@ export default function RootLayout({ const el = textElements[i]; if (isTextElement(el) && el.textContent.trim() === (oldValue || '').trim()) { element = el; - const newSelector = getUniqueSelector(element, true); - if (newSelector) { + if (newSelector) { element.dataset.webildSelector = newSelector; } break; @@ -2629,10 +2603,8 @@ export default function RootLayout({ replaced = true; } else if (element.tagName.toLowerCase() === 'img') { oldValue = element.src; - const newMediaType = getMediaTypeFromUrl(newSrc); - if (newMediaType === 'video' && allowMediaTypeSwap) { - const swapped = swapMediaElement(element, 'video', newSrc); - if (selectedElement === element) selectedElement = swapped; + if (newMediaType === 'video' && allowMediaTypeSwap) { + if (selectedElement === element) selectedElement = swapped; element = swapped; } else { element.src = newSrc; @@ -2640,11 +2612,9 @@ export default function RootLayout({ replaced = true; } else if (element.tagName.toLowerCase() === 'video') { oldValue = element.src || element.currentSrc || ''; - const newMediaType = getMediaTypeFromUrl(newSrc); - const sources = element.querySelectorAll('source'); + const sources = element.querySelectorAll('source'); if (newMediaType === 'image' && allowMediaTypeSwap) { - const swapped = swapMediaElement(element, 'img', newSrc); - if (selectedElement === element) selectedElement = swapped; + if (selectedElement === element) selectedElement = swapped; element = swapped; } else { if (sources.length > 0) { @@ -2666,8 +2636,7 @@ export default function RootLayout({ } if (replaced) { - const elementInfo = getElementInfo(element); - + let cleanOldValue = oldValue; if (oldValue.includes('url(')) { const urlMatch = oldValue.match(/url(['"]?([^'")]+)['"]?)/); @@ -2738,13 +2707,7 @@ export default function RootLayout({ } }, true); - const urlCheckInterval = setInterval(() => { - if (lastPathname !== window.location.pathname) { - lastPathname = window.location.pathname; - notifyPageChange(); - } - }, 500); - + notifyPageChange(); window.webildCleanup = () => {