diff --git a/Configuration/TypoScript/Setup/C01-Page.typoscript b/Configuration/TypoScript/Setup/C01-Page.typoscript new file mode 100644 index 0000000..40c97da --- /dev/null +++ b/Configuration/TypoScript/Setup/C01-Page.typoscript @@ -0,0 +1,8 @@ +page { + includeCSS { + zcpmk = EXT:cpkm/Resources/Public/Css/cpmkLayout.css + } +# includeCSS { +# globalcss = EXT:cpdevsite/Resources/Public/Css/Layout.css +# } +} diff --git a/Configuration/TypoScript/Setup/C02-Pageview.typoscript b/Configuration/TypoScript/Setup/C02-Pageview.typoscript index eb1c7a6..1030421 100644 --- a/Configuration/TypoScript/Setup/C02-Pageview.typoscript +++ b/Configuration/TypoScript/Setup/C02-Pageview.typoscript @@ -1,7 +1,2 @@ # page.10 = PAGEVIEW -page.10 { - # Pfad zu den Fluid-Templates, kann überschrieben werden von anderer Extension - paths { - 20 = EXT:cpkm/Resources/Private/Templates/ - } -} + diff --git a/Configuration/TypoScript/Setup/licensdoglist.typoscript b/Configuration/TypoScript/Setup/licensdoglist.typoscript index d4da4a8..4833b62 100644 --- a/Configuration/TypoScript/Setup/licensdoglist.typoscript +++ b/Configuration/TypoScript/Setup/licensdoglist.typoscript @@ -1,5 +1,3 @@ - - tt_content.licensdoglist { dataProcessing { 200 = database-query diff --git a/ContentBlocks/ContentElements/Licensdoglist/language/fr.labels.xlf b/ContentBlocks/ContentElements/Licensdoglist/language/fr.labels.xlf new file mode 100644 index 0000000..f150c2d --- /dev/null +++ b/ContentBlocks/ContentElements/Licensdoglist/language/fr.labels.xlf @@ -0,0 +1,23 @@ + + + + + + List of active licensed Dogs + List des chien mâles d'élevage + + + List Title + Titre de la liste + + + Dogs from page + Chiens de la page + + + Licensed Dog List + Chiens mâles d'élevage + + + + diff --git a/ContentBlocks/ContentElements/Licensdoglist/language/it.labels.xlf b/ContentBlocks/ContentElements/Licensdoglist/language/it.labels.xlf new file mode 100644 index 0000000..f2d125d --- /dev/null +++ b/ContentBlocks/ContentElements/Licensdoglist/language/it.labels.xlf @@ -0,0 +1,23 @@ + + + + + + List of active licensed Dogs + Lista dei cervi in riproduzione + + + List Title + Titolo della lista + + + Dogs from page + Cani della pagina + + + Licensed Dog List + Cervi in riproduzione + + + + diff --git a/ContentBlocks/ContentElements/Licensdoglist/templates/frontend.html b/ContentBlocks/ContentElements/Licensdoglist/templates/frontend.html index 3d1080d..b44373c 100644 --- a/ContentBlocks/ContentElements/Licensdoglist/templates/frontend.html +++ b/ContentBlocks/ContentElements/Licensdoglist/templates/frontend.html @@ -4,7 +4,6 @@ -{_all}

Museau Normale

 -

Face Rase

{dog.data.p_variety} -
+

Face Rase

+ {dog.data.p_variety} + +

{dog.data.p_name}

+

{dog.data.p_birth_date}

diff --git a/Resources/Private/Sass/_settings.scss b/Resources/Private/Sass/_settings.scss index 3ecf063..2b5e781 100644 --- a/Resources/Private/Sass/_settings.scss +++ b/Resources/Private/Sass/_settings.scss @@ -1,5 +1,41 @@ /* settings */ +@layer cpmk { + + @font-face { + font-family: 'Oxygen'; + src: url('../Fonts/Oxygen/Oxygen-Light.woff2') format('woff2'); + font-weight: 300; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: 'Oxygen'; + src: url('../Fonts/Oxygen/Oxygen-Bold.woff2') format('woff2'); + font-weight: 700; + font-style: normal; + font-display: swap; + } + + @font-face { + font-family: 'Oxygen'; + src: url('../Fonts/Oxygen/Oxygen-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; + font-display: swap; + } + + :root { + // --clr-brand--primary: green; + --card-border-radius: 1rem !important; + + --ff: 'Oxygen'; + --ff-condensed: 'UbuntuCondensed'; + --ff-serif: 'Oxygen'; + --ff-h: 'Oxygen'; + --ff-nav: 'Oxygen'; + --ff-mono: 'UbuntuMono'; + --ff-symbol: 'Symbols'; + } -:root { - --clr-brand--primary: green; } diff --git a/Resources/Private/Sass/Layout.scss b/Resources/Private/Sass/cpmkLayout.scss similarity index 95% rename from Resources/Private/Sass/Layout.scss rename to Resources/Private/Sass/cpmkLayout.scss index 1502ba3..f5c3e69 100644 --- a/Resources/Private/Sass/Layout.scss +++ b/Resources/Private/Sass/cpmkLayout.scss @@ -1,2 +1,3 @@ @use 'settings' as *; + diff --git a/Resources/Private/Templates/Layouts/Layout-0.html b/Resources/Private/Templates/Layouts/Layout-0.html deleted file mode 100644 index 1d30b92..0000000 --- a/Resources/Private/Templates/Layouts/Layout-0.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - -
- -
- -
- - - -
- - - - - diff --git a/Resources/Public/Css/cpmkLayout.css b/Resources/Public/Css/cpmkLayout.css new file mode 100644 index 0000000..d4820af --- /dev/null +++ b/Resources/Public/Css/cpmkLayout.css @@ -0,0 +1,36 @@ +/* settings */ +@layer cpmk { + @font-face { + font-family: "Oxygen"; + src: url("../Fonts/Oxygen/Oxygen-Light.woff2") format("woff2"); + font-weight: 300; + font-style: normal; + font-display: swap; + } + @font-face { + font-family: "Oxygen"; + src: url("../Fonts/Oxygen/Oxygen-Bold.woff2") format("woff2"); + font-weight: 700; + font-style: normal; + font-display: swap; + } + @font-face { + font-family: "Oxygen"; + src: url("../Fonts/Oxygen/Oxygen-Regular.woff2") format("woff2"); + font-weight: 400; + font-style: normal; + font-display: swap; + } + :root { + --card-border-radius: 1rem !important; + --ff: "Oxygen"; + --ff-condensed: "UbuntuCondensed"; + --ff-serif: "Oxygen"; + --ff-h: "Oxygen"; + --ff-nav: "Oxygen"; + --ff-mono: "UbuntuMono"; + --ff-symbol: "Symbols"; + } +} + +/*# sourceMappingURL=cpmkLayout.css.map */ diff --git a/Resources/Public/Css/cpmkLayout.css.map b/Resources/Public/Css/cpmkLayout.css.map new file mode 100644 index 0000000..15cd623 --- /dev/null +++ b/Resources/Public/Css/cpmkLayout.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["../../Private/Sass/_settings.scss"],"names":[],"mappings":"AAAA;AACA;EAEE;IACE;IACA;IACA;IACA;IACA;;EAGF;IACE;IACA;IACA;IACA;IACA;;EAGF;IACE;IACA;IACA;IACA;IACA;;EAGF;IAEE;IAEA;IACA;IACA;IACA;IACA;IACA;IACA","file":"cpmkLayout.css"} \ No newline at end of file diff --git a/Resources/Public/Fonts/Oxygen/Oxygen-Bold.woff2 b/Resources/Public/Fonts/Oxygen/Oxygen-Bold.woff2 new file mode 100644 index 0000000..2a5445b Binary files /dev/null and b/Resources/Public/Fonts/Oxygen/Oxygen-Bold.woff2 differ diff --git a/Resources/Public/Fonts/Oxygen/Oxygen-Light.woff2 b/Resources/Public/Fonts/Oxygen/Oxygen-Light.woff2 new file mode 100644 index 0000000..6276734 Binary files /dev/null and b/Resources/Public/Fonts/Oxygen/Oxygen-Light.woff2 differ diff --git a/Resources/Public/Fonts/Oxygen/Oxygen-Regular.woff2 b/Resources/Public/Fonts/Oxygen/Oxygen-Regular.woff2 new file mode 100644 index 0000000..fb27213 Binary files /dev/null and b/Resources/Public/Fonts/Oxygen/Oxygen-Regular.woff2 differ diff --git a/composer.json b/composer.json index 04bf36d..4ea9235 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,9 @@ "minimum-stability": "dev", "prefer-stable" : true, "require": { - "conpassione/cpdevsite": "^0.9", + "conpassione/cpdevsite": "dev-main#v1.0.0", "typo3/cms-core": "^13" }, - "require-dev": { - }, "autoload": { "psr-4": { "Conpassione\\cpkm\\": "Classes"