From 997cbca4b51faa91c91fa6d36474975b0328aab1 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 3 Jan 2022 01:48:09 +0200 Subject: [PATCH] rebase fonts and images folder into the specified template directory --- src/public/css/template/default/common.css | 8 ++++---- src/public/css/template/default/font.css | 16 ++++++++-------- .../{ => css/template/default}/font/bi/set.woff | Bin .../template/default}/font/bi/set.woff2 | Bin .../template/default}/font/roboto/LICENSE | 0 .../template/default}/font/roboto/regular.eot | Bin .../template/default}/font/roboto/regular.svg | 0 .../template/default}/font/roboto/regular.ttf | Bin .../template/default}/font/roboto/regular.woff | Bin .../{ => css/template/default}/image/bg-1.png | Bin .../{ => css/template/default}/image/bg-2.png | Bin 11 files changed, 12 insertions(+), 12 deletions(-) rename src/public/{ => css/template/default}/font/bi/set.woff (100%) rename src/public/{ => css/template/default}/font/bi/set.woff2 (100%) rename src/public/{ => css/template/default}/font/roboto/LICENSE (100%) rename src/public/{ => css/template/default}/font/roboto/regular.eot (100%) rename src/public/{ => css/template/default}/font/roboto/regular.svg (100%) rename src/public/{ => css/template/default}/font/roboto/regular.ttf (100%) rename src/public/{ => css/template/default}/font/roboto/regular.woff (100%) rename src/public/{ => css/template/default}/image/bg-1.png (100%) rename src/public/{ => css/template/default}/image/bg-2.png (100%) diff --git a/src/public/css/template/default/common.css b/src/public/css/template/default/common.css index b40c7ae..c126d83 100644 --- a/src/public/css/template/default/common.css +++ b/src/public/css/template/default/common.css @@ -29,14 +29,14 @@ textarea { /* backgrounds */ .bg-logo-1 { - background-image: url('/image/logo-1.png'); + background-image: url('/css/template/default/image/logo-1.png'); background-repeat: no-repeat; background-position: left 2px; background-size: 24px } .bg-logo-1:hover { - background-image: url('/image/logo-0.png'); + background-image: url('/css/template/default/image/logo-0.png'); } .bg-c-0 { @@ -68,11 +68,11 @@ textarea { } .bg-img-1 { - background-image: url('/image/bg-1.png') + background-image: url('/css/template/default/image/bg-1.png') } .bg-img-2 { - background-image: url('/image/bg-2.png') + background-image: url('/css/template/default/image/bg-2.png') } /* fonts */ diff --git a/src/public/css/template/default/font.css b/src/public/css/template/default/font.css index aae28d0..09e138e 100644 --- a/src/public/css/template/default/font.css +++ b/src/public/css/template/default/font.css @@ -1,17 +1,17 @@ @font-face { font-family: 'Roboto-Regular'; - src: url('/font/roboto/regular.eot'); - src: url('/font/roboto/regular.eot?#iefix') format('embedded-opentype'), - /*url('/font/roboto/regular.woff2') format('woff2'), @TODO */ - url('/font/roboto/regular.woff') format('woff'), - url('/font/roboto/regular.ttf') format('truetype'), - url('/font/roboto/regular.svg#robotolight') format('svg'); + src: url('/css/template/default/font/roboto/regular.eot'); + src: url('/css/template/default/font/roboto/regular.eot?#iefix') format('embedded-opentype'), + /*url('/css/template/default/font/roboto/regular.woff2') format('woff2'), @TODO */ + url('/css/template/default/font/roboto/regular.woff') format('woff'), + url('/css/template/default/font/roboto/regular.ttf') format('truetype'), + url('/css/template/default/font/roboto/regular.svg#robotolight') format('svg'); font-weight: normal; font-style: normal } @font-face { font-family: "bootstrap-icons"; - src: url('/font/bi/set.woff2') format('woff2'), - url('/font/bi/set.woff') format('woff'); + src: url('/css/template/default/font/bi/set.woff2') format('woff2'), + url('/css/template/default/font/bi/set.woff') format('woff'); } diff --git a/src/public/font/bi/set.woff b/src/public/css/template/default/font/bi/set.woff similarity index 100% rename from src/public/font/bi/set.woff rename to src/public/css/template/default/font/bi/set.woff diff --git a/src/public/font/bi/set.woff2 b/src/public/css/template/default/font/bi/set.woff2 similarity index 100% rename from src/public/font/bi/set.woff2 rename to src/public/css/template/default/font/bi/set.woff2 diff --git a/src/public/font/roboto/LICENSE b/src/public/css/template/default/font/roboto/LICENSE similarity index 100% rename from src/public/font/roboto/LICENSE rename to src/public/css/template/default/font/roboto/LICENSE diff --git a/src/public/font/roboto/regular.eot b/src/public/css/template/default/font/roboto/regular.eot similarity index 100% rename from src/public/font/roboto/regular.eot rename to src/public/css/template/default/font/roboto/regular.eot diff --git a/src/public/font/roboto/regular.svg b/src/public/css/template/default/font/roboto/regular.svg similarity index 100% rename from src/public/font/roboto/regular.svg rename to src/public/css/template/default/font/roboto/regular.svg diff --git a/src/public/font/roboto/regular.ttf b/src/public/css/template/default/font/roboto/regular.ttf similarity index 100% rename from src/public/font/roboto/regular.ttf rename to src/public/css/template/default/font/roboto/regular.ttf diff --git a/src/public/font/roboto/regular.woff b/src/public/css/template/default/font/roboto/regular.woff similarity index 100% rename from src/public/font/roboto/regular.woff rename to src/public/css/template/default/font/roboto/regular.woff diff --git a/src/public/image/bg-1.png b/src/public/css/template/default/image/bg-1.png similarity index 100% rename from src/public/image/bg-1.png rename to src/public/css/template/default/image/bg-1.png diff --git a/src/public/image/bg-2.png b/src/public/css/template/default/image/bg-2.png similarity index 100% rename from src/public/image/bg-2.png rename to src/public/css/template/default/image/bg-2.png