From 93842f84a76d78b6facfa531d5169cc0d8dfc9c5 Mon Sep 17 00:00:00 2001 From: philc Date: Tue, 26 Aug 2025 10:54:37 +0200 Subject: [PATCH] set tailwindcss to work with apxtri for any tribes appname --- wwws/admin/src/static/css/input.css | 13 +- wwws/admin/src/static/css/output.css | 474 +++++++++++++++--- wwws/admin/src/static/css/sourcetw copy.css | 4 + wwws/admin/src/static/css/sourcetw.css | 9 +- ...ri.json => privatri_main_privatri_fr.json} | 0 5 files changed, 422 insertions(+), 78 deletions(-) create mode 100644 wwws/admin/src/static/css/sourcetw copy.css rename wwws/admin/src/tpldata/{privatri_main_privatri.json => privatri_main_privatri_fr.json} (100%) diff --git a/wwws/admin/src/static/css/input.css b/wwws/admin/src/static/css/input.css index 2af92c3..8dc463b 100644 --- a/wwws/admin/src/static/css/input.css +++ b/wwws/admin/src/static/css/input.css @@ -19,10 +19,13 @@ /*@import "tailwindcss" source("../../.{html,js,mustache}"); */ -@import "tailwindcss" source("/media/phil/usbfarm/apxtowns/data/apxtri/objects/wwws/admin/src/**/*.{html,js,mustache}"); +/* +@import "tailwindcss" source("/var/lib/apxtowns/data/apxtri/objects/wwws/admin/src / * * / *.{html,js,mustache}"); +@import "./sourcetw.css"; +*/ +@import "/opt/apxtowns/farm-test/apxtri/node_modules/tailwindcss"; +@plugin "/opt/apxtowns/farm-test/apxtri/node_modules/daisyui"; @import "./sourcetw.css"; - -@plugin "daisyui"; @theme { --font-display: "Questrial", "sans-serif"; @@ -43,7 +46,7 @@ } } -@plugin "daisyui/theme" { +@plugin "/opt/apxtowns/farm-test/apxtri/node_modules/daisyui/theme" { name: "apxtridark"; default: true; prefersdark: true; @@ -79,7 +82,7 @@ } -@plugin "daisyui/theme" { +@plugin "/opt/apxtowns/farm-test/apxtri/node_modules/daisyui/theme" { name: "apxtrilight"; default: false; prefersdark: false; diff --git a/wwws/admin/src/static/css/output.css b/wwws/admin/src/static/css/output.css index 98627a9..6225efc 100644 --- a/wwws/admin/src/static/css/output.css +++ b/wwws/admin/src/static/css/output.css @@ -1,4 +1,4 @@ -/*! tailwindcss v4.1.10 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v4.1.12 | MIT License | https://tailwindcss.com */ @layer properties; @font-face { font-family: 'Questrial'; @@ -36,6 +36,7 @@ --color-white: #fff; --spacing: 0.25rem; --breakpoint-lg: 64rem; + --container-xs: 20rem; --container-sm: 24rem; --text-xs: 0.75rem; --text-xs--line-height: calc(1 / 0.75); @@ -49,6 +50,8 @@ --text-xl--line-height: calc(1.75 / 1.25); --text-2xl: 1.5rem; --text-2xl--line-height: calc(2 / 1.5); + --text-4xl: 2.25rem; + --text-4xl--line-height: calc(2.5 / 2.25); --font-weight-medium: 500; --font-weight-semibold: 600; --font-weight-bold: 700; @@ -200,6 +203,9 @@ ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month-field, ::-webkit-datetime-edit-day-field, ::-webkit-datetime-edit-hour-field, ::-webkit-datetime-edit-minute-field, ::-webkit-datetime-edit-second-field, ::-webkit-datetime-edit-millisecond-field, ::-webkit-datetime-edit-meridiem-field { padding-block: 0; } + ::-webkit-calendar-picker-indicator { + line-height: 1; + } :-moz-ui-invalid { box-shadow: none; } @@ -1749,6 +1755,32 @@ } } } + .chat-bubble { + position: relative; + display: block; + width: fit-content; + border-radius: var(--radius-field); + background-color: var(--color-base-300); + padding-inline: calc(0.25rem * 4); + padding-block: calc(0.25rem * 2); + color: var(--color-base-content); + grid-row-end: 3; + min-height: 2rem; + min-width: 2.5rem; + max-width: 90%; + &:before { + position: absolute; + bottom: calc(0.25rem * 0); + height: calc(0.25rem * 3); + width: calc(0.25rem * 3); + background-color: inherit; + content: ""; + mask-repeat: no-repeat; + mask-image: var(--mask-chat); + mask-position: 0px -1px; + mask-size: 13px; + } + } .select { border: var(--border) solid #0000; position: relative; @@ -1841,6 +1873,38 @@ cursor: not-allowed; } } + .swap { + position: relative; + display: inline-grid; + cursor: pointer; + place-content: center; + vertical-align: middle; + webkit-user-select: none; + user-select: none; + input { + appearance: none; + border: none; + } + > * { + grid-column-start: 1; + grid-row-start: 1; + transition-property: transform, rotate, opacity; + transition-duration: 0.2s; + transition-timing-function: cubic-bezier(0, 0, 0.2, 1); + } + .swap-on, .swap-indeterminate, input:indeterminate ~ .swap-on { + opacity: 0%; + } + input:is(:checked, :indeterminate) { + & ~ .swap-off { + opacity: 0%; + } + } + input:checked ~ .swap-on, input:indeterminate ~ .swap-indeterminate { + opacity: 100%; + backface-visibility: visible; + } + } .checkbox { border: var(--border) solid var(--input-color, var(--color-base-content)); @supports (color: color-mix(in lab, red, red)) { @@ -1883,7 +1947,10 @@ outline-offset: 2px; } &:checked, &[aria-checked="true"] { - background-color: var(--input-color, #0000); + background-color: var(--input-color, var(--color-base-content)); + @supports (color: color-mix(in lab, red, red)) { + background-color: var(--input-color, color-mix(in oklab, var(--color-base-content) 20%, #0000)); + } box-shadow: 0 0 #0000 inset, 0 8px 0 -4px oklch(100% 0 0 / calc(var(--depth) * 0.1)) inset, 0 1px oklch(0% 0 0 / calc(var(--depth) * 0.1)); &:before { clip-path: polygon(20% 100%, 20% 80%, 50% 80%, 50% 0%, 70% 0%, 70% 100%); @@ -1907,6 +1974,10 @@ } } &:indeterminate { + background-color: var(--input-color, var(--color-base-content)); + @supports (color: color-mix(in lab, red, red)) { + background-color: var(--input-color, color-mix(in oklab, var(--color-base-content) 20%, #0000)); + } &:before { rotate: 0deg; opacity: 100%; @@ -2046,6 +2117,30 @@ .inset-0 { inset: calc(var(--spacing) * 0); } + .chat-start { + place-items: start; + grid-template-columns: auto 1fr; + .chat-header { + grid-column-start: 2; + } + .chat-footer { + grid-column-start: 2; + } + .chat-image { + grid-column-start: 1; + } + .chat-bubble { + grid-column-start: 2; + border-end-start-radius: 0; + &:before { + transform: rotateY(0deg); + inset-inline-start: -0.75rem; + } + [dir="rtl"] &:before { + transform: rotateY(180deg); + } + } + } .dropdown-center { --anchor-h: center; :where(.dropdown-content) { @@ -2074,6 +2169,32 @@ } } } + .dropdown-end { + --anchor-h: span-left; + :where(.dropdown-content) { + inset-inline-end: calc(0.25rem * 0); + translate: 0 0; + [dir="rtl"] & { + translate: 0 0; + } + } + &.dropdown-left { + --anchor-h: left; + --anchor-v: span-top; + .dropdown-content { + top: auto; + bottom: calc(0.25rem * 0); + } + } + &.dropdown-right { + --anchor-h: right; + --anchor-v: span-top; + .dropdown-content { + top: auto; + bottom: calc(0.25rem * 0); + } + } + } .top-4 { top: calc(var(--spacing) * 4); } @@ -2083,6 +2204,12 @@ .right-4 { right: calc(var(--spacing) * 4); } + .right-8 { + right: calc(var(--spacing) * 8); + } + .bottom-8 { + bottom: calc(var(--spacing) * 8); + } .left-4 { left: calc(var(--spacing) * 4); } @@ -2241,6 +2368,9 @@ cursor: pointer; } } + .z-1 { + z-index: 1; + } .z-10 { z-index: 10; } @@ -2306,6 +2436,9 @@ max-width: 96rem; } } + .m-1 { + margin: calc(var(--spacing) * 1); + } .m-4 { margin: calc(var(--spacing) * 4); } @@ -2412,9 +2545,15 @@ .mt-5 { margin-top: calc(var(--spacing) * 5); } + .mt-8 { + margin-top: calc(var(--spacing) * 8); + } .mt-10 { margin-top: calc(var(--spacing) * 10); } + .mt-16 { + margin-top: calc(var(--spacing) * 16); + } .mr-3 { margin-right: calc(var(--spacing) * 3); } @@ -2433,6 +2572,12 @@ .ml-2 { margin-left: calc(var(--spacing) * 2); } + .ml-4 { + margin-left: calc(var(--spacing) * 4); + } + .ml-auto { + margin-left: auto; + } .carousel-item { box-sizing: content-box; display: flex; @@ -2723,6 +2868,12 @@ } } } + .chat { + display: grid; + column-gap: calc(0.25rem * 3); + padding-block: calc(0.25rem * 1); + --mask-chat: url("data:image/svg+xml,%3csvg width='13' height='13' xmlns='http://www.w3.org/2000/svg'%3e%3cpath fill='black' d='M0 11.5004C0 13.0004 2 13.0004 2 13.0004H12H13V0.00036329L12.5 0C12.5 0 11.977 2.09572 11.8581 2.50033C11.6075 3.35237 10.9149 4.22374 9 5.50036C6 7.50036 0 10.0004 0 11.5004Z'/%3e%3c/svg%3e"); + } .mask { display: inline-block; vertical-align: middle; @@ -2796,15 +2947,31 @@ width: var(--size); height: var(--size); } + .size-12 { + width: calc(var(--spacing) * 12); + height: calc(var(--spacing) * 12); + } + .h-4 { + height: calc(var(--spacing) * 4); + } .h-5 { height: calc(var(--spacing) * 5); } .h-6 { height: calc(var(--spacing) * 6); } + .h-8 { + height: calc(var(--spacing) * 8); + } .h-9 { height: calc(var(--spacing) * 9); } + .h-10 { + height: calc(var(--spacing) * 10); + } + .h-12 { + height: calc(var(--spacing) * 12); + } .h-16 { height: calc(var(--spacing) * 16); } @@ -2820,12 +2987,24 @@ .h-auto { height: auto; } + .h-fit { + height: fit-content; + } .h-full { height: 100%; } .h-screen { height: 100vh; } + .max-h-12 { + max-height: calc(var(--spacing) * 12); + } + .max-h-screen { + max-height: 100vh; + } + .min-h-0 { + min-height: calc(var(--spacing) * 0); + } .min-h-full { min-height: 100%; } @@ -2838,6 +3017,9 @@ .w-0 { width: calc(var(--spacing) * 0); } + .w-4 { + width: calc(var(--spacing) * 4); + } .w-5 { width: calc(var(--spacing) * 5); } @@ -2856,18 +3038,39 @@ .w-20 { width: calc(var(--spacing) * 20); } + .w-52 { + width: calc(var(--spacing) * 52); + } .w-64 { width: calc(var(--spacing) * 64); } + .w-100 { + width: calc(var(--spacing) * 100); + } .w-auto { width: auto; } + .w-fit { + width: fit-content; + } .w-full { width: 100%; } + .w-screen { + width: 100vw; + } + .max-w-\[20rem\] { + max-width: 20rem; + } .max-w-screen-lg { max-width: var(--breakpoint-lg); } + .min-w-110 { + min-width: calc(var(--spacing) * 110); + } + .min-w-xs { + min-width: var(--container-xs); + } .flex-1 { flex: 1; } @@ -2877,6 +3080,9 @@ .flex-shrink { flex-shrink: 1; } + .flex-shrink-0 { + flex-shrink: 0; + } .flex-grow { flex-grow: 1; } @@ -2936,23 +3142,15 @@ border-block-end: none; } } - .stats-vertical { - grid-auto-flow: row; - overflow-y: auto; - .stat:not(:last-child) { - border-inline-end: none; - border-block-end: var(--border) dashed currentColor; - @supports (color: color-mix(in lab, red, red)) { - border-block-end: var(--border) dashed color-mix(in oklab, currentColor 10%, #0000); - } - } - } .grid-cols-1 { grid-template-columns: repeat(1, minmax(0, 1fr)); } .grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } + .grid-cols-\[repeat\(auto-fit\,minmax\(5rem\,1fr\)\)\] { + grid-template-columns: repeat(auto-fit,minmax(5rem,1fr)); + } .flex-col { flex-direction: column; } @@ -2974,12 +3172,18 @@ .justify-center { justify-content: center; } + .justify-evenly { + justify-content: space-evenly; + } .justify-start { justify-content: flex-start; } .justify-items-center { justify-items: center; } + .gap-0 { + gap: calc(var(--spacing) * 0); + } .gap-1 { gap: calc(var(--spacing) * 1); } @@ -3013,6 +3217,12 @@ margin-block-end: calc(calc(var(--spacing) * 6) * calc(1 - var(--tw-space-y-reverse))); } } + .gap-x-2 { + column-gap: calc(var(--spacing) * 2); + } + .gap-x-4 { + column-gap: calc(var(--spacing) * 4); + } .space-x-2 { :where(& > :not(:last-child)) { --tw-space-x-reverse: 0; @@ -3027,6 +3237,12 @@ margin-inline-end: calc(calc(var(--spacing) * 8) * calc(1 - var(--tw-space-x-reverse))); } } + .gap-y-6 { + row-gap: calc(var(--spacing) * 6); + } + .gap-y-8 { + row-gap: calc(var(--spacing) * 8); + } .self-end { align-self: flex-end; } @@ -3036,22 +3252,66 @@ .overflow-hidden { overflow: hidden; } + .overflow-y-auto { + overflow-y: auto; + } .rounded { border-radius: 0.25rem; } + .rounded-box { + border-radius: var(--radius-box); + } + .rounded-box { + border-radius: var(--radius-box); + } .rounded-full { border-radius: calc(infinity * 1px); } .rounded-lg { border-radius: var(--radius-lg); } + .rounded-tl-lg { + border-top-left-radius: var(--radius-lg); + } + .rounded-tr-lg { + border-top-right-radius: var(--radius-lg); + } + .rounded-br-lg { + border-bottom-right-radius: var(--radius-lg); + } + .rounded-bl-lg { + border-bottom-left-radius: var(--radius-lg); + } .border { border-style: var(--tw-border-style); border-width: 1px; } + .border-r { + border-right-style: var(--tw-border-style); + border-right-width: 1px; + } + .border-none { + --tw-border-style: none; + border-style: none; + } + .border-solid { + --tw-border-style: solid; + border-style: solid; + } + .alert-info { + border-color: var(--color-info); + color: var(--color-info-content); + --alert-color: var(--color-info); + } .border-gray-200 { border-color: var(--color-gray-200); } + .border-transparent { + border-color: transparent; + } + .border-r-base-300 { + border-right-color: var(--color-base-300); + } .glass { border: none; backdrop-filter: blur(var(--glass-blur, 40px)); @@ -3066,6 +3326,12 @@ .bg-base-200 { background-color: var(--color-base-200); } + .bg-base-300 { + background-color: var(--color-base-300); + } + .bg-base-content { + background-color: var(--color-base-content); + } .bg-black { background-color: var(--color-black); } @@ -3081,12 +3347,18 @@ .bg-green-50 { background-color: var(--color-green-50); } + .bg-info { + background-color: var(--color-info); + } .bg-neutral { background-color: var(--color-neutral); } .bg-neutral-800 { background-color: var(--color-neutral-800); } + .bg-transparent { + background-color: transparent; + } .bg-white { background-color: var(--color-white); } @@ -3102,9 +3374,15 @@ .mask-repeat { mask-repeat: repeat; } + .fill-current { + fill: currentcolor; + } .object-cover { object-fit: cover; } + .p-0 { + padding: calc(var(--spacing) * 0); + } .p-2 { padding: calc(var(--spacing) * 2); } @@ -3138,9 +3416,30 @@ .py-12 { padding-block: calc(var(--spacing) * 12); } + .pt-1 { + padding-top: calc(var(--spacing) * 1); + } + .pt-4 { + padding-top: calc(var(--spacing) * 4); + } + .pr-0 { + padding-right: calc(var(--spacing) * 0); + } .pr-3 { padding-right: calc(var(--spacing) * 3); } + .pr-8 { + padding-right: calc(var(--spacing) * 8); + } + .pb-1 { + padding-bottom: calc(var(--spacing) * 1); + } + .pb-4 { + padding-bottom: calc(var(--spacing) * 4); + } + .pl-8 { + padding-left: calc(var(--spacing) * 8); + } .text-center { text-align: center; } @@ -3159,6 +3458,10 @@ font-size: var(--text-2xl); line-height: var(--tw-leading, var(--text-2xl--line-height)); } + .text-4xl { + font-size: var(--text-4xl); + line-height: var(--tw-leading, var(--text-4xl--line-height)); + } .text-base { font-size: var(--text-base); line-height: var(--tw-leading, var(--text-base--line-height)); @@ -3217,6 +3520,9 @@ color: var(--color-secondary-content); --input-color: var(--color-secondary); } + .text-base-100 { + color: var(--color-base-100); + } .text-base-content { color: var(--color-base-content); } @@ -3247,6 +3553,9 @@ .text-info { color: var(--color-info); } + .text-info-content { + color: var(--color-info-content); + } .text-neutral-content { color: var(--color-neutral-content); } @@ -3315,6 +3624,10 @@ --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1)); box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow); } + .shadow-none { + --tw-shadow: 0 0 #0000; + box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow); + } .shadow-sm { --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)); box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow); @@ -3434,10 +3747,18 @@ --btn-color: var(--color-accent); --btn-fg: var(--color-accent-content); } + .btn-neutral { + --btn-color: var(--color-neutral); + --btn-fg: var(--color-neutral-content); + } .btn-primary { --btn-color: var(--color-primary); --btn-fg: var(--color-primary-content); } + .outline-none { + --tw-outline-style: none; + outline-style: none; + } .select-all { -webkit-user-select: all; user-select: all; @@ -3452,6 +3773,47 @@ --input-color: var(--color-success); } } + .group-hover\:flex { + &:is(:where(.group):hover *) { + @media (hover: hover) { + display: flex; + } + } + } + .placeholder\:text-base-content { + &::placeholder { + color: var(--color-base-content); + } + } + .placeholder\:opacity-75 { + &::placeholder { + opacity: 75%; + } + } + .focus-within\:outline { + &:focus-within { + outline-style: var(--tw-outline-style); + outline-width: 1px; + } + } + .focus-within\:outline-2 { + &:focus-within { + outline-style: var(--tw-outline-style); + outline-width: 2px; + } + } + .focus-within\:outline-primary { + &:focus-within { + outline-color: var(--color-primary); + } + } + .hover\:bg-base-200 { + &:hover { + @media (hover: hover) { + background-color: var(--color-base-200); + } + } + } .hover\:bg-base-300 { &:hover { @media (hover: hover) { @@ -3552,19 +3914,6 @@ translate: var(--tw-translate-x) var(--tw-translate-y); } } - .sm\:stats-vertical { - @media (width >= 40rem) { - grid-auto-flow: row; - overflow-y: auto; - .stat:not(:last-child) { - border-inline-end: none; - border-block-end: var(--border) dashed currentColor; - @supports (color: color-mix(in lab, red, red)) { - border-block-end: var(--border) dashed color-mix(in oklab, currentColor 10%, #0000); - } - } - } - } .md\:grid-cols-2 { @media (width >= 48rem) { grid-template-columns: repeat(2, minmax(0, 1fr)); @@ -3575,19 +3924,6 @@ grid-template-columns: repeat(3, minmax(0, 1fr)); } } - .lg\:stats-horizontal { - @media (width >= 64rem) { - grid-auto-flow: column; - overflow-x: auto; - .stat:not(:last-child) { - border-inline-end: var(--border) dashed currentColor; - @supports (color: color-mix(in lab, red, red)) { - border-inline-end: var(--border) dashed color-mix(in oklab, currentColor 10%, #0000); - } - border-block-end: none; - } - } - } .lg\:grid-cols-3 { @media (width >= 64rem) { grid-template-columns: repeat(3, minmax(0, 1fr)); @@ -3772,18 +4108,9 @@ } } @layer base { - @property --radialprogress { - syntax: ""; - inherits: true; - initial-value: 0%; - } -} -@layer base { - :root { - scrollbar-color: currentColor #0000; - @supports (color: color-mix(in lab, red, red)) { - scrollbar-color: color-mix(in oklch, currentColor 35%, #0000) #0000; - } + :root, [data-theme] { + background-color: var(--root-bg, var(--color-base-100)); + color: var(--color-base-content); } } @layer base { @@ -3792,8 +4119,10 @@ } } @layer base { - :root:has( .modal-open, .modal[open], .modal:target, .modal-toggle:checked, .drawer:not([class*="drawer-open"]) > .drawer-toggle:checked ) { - overflow: hidden; + @property --radialprogress { + syntax: ""; + inherits: true; + initial-value: 0%; } } @layer base { @@ -3810,9 +4139,21 @@ } } @layer base { - :root, [data-theme] { - background-color: var(--root-bg, var(--color-base-100)); - color: var(--color-base-content); + :root { + scrollbar-color: currentColor #0000; + @supports (color: color-mix(in lab, red, red)) { + scrollbar-color: color-mix(in oklch, currentColor 35%, #0000) #0000; + } + } +} +@layer base { + :root:has( .modal-open, .modal[open], .modal:target, .modal-toggle:checked, .drawer:not([class*="drawer-open"]) > .drawer-toggle:checked ) { + overflow: hidden; + } +} +@keyframes progress { + 50% { + background-position-x: -115%; } } @keyframes radio { @@ -3823,19 +4164,6 @@ padding: 3px; } } -@keyframes skeleton { - 0% { - background-position: 150%; - } - 100% { - background-position: -50%; - } -} -@keyframes progress { - 50% { - background-position-x: -115%; - } -} @keyframes toast { 0% { scale: 0.9; @@ -3857,6 +4185,14 @@ filter: brightness(1.05) contrast(1.05); } } +@keyframes skeleton { + 0% { + background-position: 150%; + } + 100% { + background-position: -50%; + } +} @layer base { @media (prefers-color-scheme: dark) { :root { diff --git a/wwws/admin/src/static/css/sourcetw copy.css b/wwws/admin/src/static/css/sourcetw copy.css new file mode 100644 index 0000000..a6b3ea7 --- /dev/null +++ b/wwws/admin/src/static/css/sourcetw copy.css @@ -0,0 +1,4 @@ +@source "/var/lib/apxtowns/data/apxtri/objects/wco/apx/*.{html,js,mustache}"; +@source "/var/lib/apxtowns/data/apxtri/objects/wwws/admin/src/**/*.{html,js,mustache}"; +@source "/var/lib/apxtowns/data/apxtri/objects/wco/simplemobnav/*.{html,js,mustache}"; +@source "/var/lib/apxtowns/data/apxtri/objects/wco/apxauth/*.{html,js,mustache}"; diff --git a/wwws/admin/src/static/css/sourcetw.css b/wwws/admin/src/static/css/sourcetw.css index 97be250..9610654 100644 --- a/wwws/admin/src/static/css/sourcetw.css +++ b/wwws/admin/src/static/css/sourcetw.css @@ -1,4 +1,5 @@ -@source "/media/phil/usbfarm/apxtowns/data/apxtri/objects/wco/apx/*.{html,js,mustache}"; -@source "/media/phil/usbfarm/apxtowns/data/apxtri/objects/wwws/admin/src/**/*.{html,js,mustache}"; -@source "/media/phil/usbfarm/apxtowns/data/apxtri/objects/wco/simplemobnav/*.{html,js,mustache}"; -@source "/media/phil/usbfarm/apxtowns/data/apxtri/objects/wco/apxauth/*.{html,js,mustache}"; +@source "../../**/*.{html,js,mustache}"; +@source "../../../../../wco/apx/*.{html,js,mustache}"; +@source "../../../../../wco/simplemobnav/*.{html,js,mustache}"; +@source "../../../../../wco/apxauth/*.{html,js,mustache}"; +@source "../../../../../wco/privatri/*.{html,js,mustache}"; \ No newline at end of file diff --git a/wwws/admin/src/tpldata/privatri_main_privatri.json b/wwws/admin/src/tpldata/privatri_main_privatri_fr.json similarity index 100% rename from wwws/admin/src/tpldata/privatri_main_privatri.json rename to wwws/admin/src/tpldata/privatri_main_privatri_fr.json