From c70edfd3f7190a45322eef8875c42fa570be7f83 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 11 Apr 2024 14:45:30 +0200 Subject: [PATCH] [Changed] structure ( paths ) --- Application/Model/Constants.php | 11 +++ assets/out/src/css/d3_fonts.css | 85 ++++++++++++++++++ .../out/src/fonts/raleway-v27-latin-200.woff | Bin .../out/src/fonts/raleway-v27-latin-200.woff2 | Bin .../fonts/raleway-v27-latin-200italic.woff | Bin .../fonts/raleway-v27-latin-200italic.woff2 | Bin .../out/src/fonts/raleway-v27-latin-600.woff | Bin .../out/src/fonts/raleway-v27-latin-600.woff2 | Bin .../fonts/raleway-v27-latin-600italic.woff | Bin .../fonts/raleway-v27-latin-600italic.woff2 | Bin .../out/src/fonts/raleway-v27-latin-700.woff | Bin .../out/src/fonts/raleway-v27-latin-700.woff2 | Bin .../fonts/raleway-v27-latin-700italic.woff | Bin .../fonts/raleway-v27-latin-700italic.woff2 | Bin .../src/fonts/raleway-v27-latin-italic.woff | Bin .../src/fonts/raleway-v27-latin-italic.woff2 | Bin .../src/fonts/raleway-v27-latin-regular.woff | Bin .../src/fonts/raleway-v27-latin-regular.woff2 | Bin .../views/blocks/layout/d3_base_style.tpl | 2 - src/out/src/css/d3_fonts.css | 85 ------------------ .../smarty}/blocks/layout/d3_base_fonts.tpl | 0 views/smarty/blocks/layout/d3_base_style.tpl | 3 + 22 files changed, 99 insertions(+), 87 deletions(-) create mode 100644 Application/Model/Constants.php create mode 100644 assets/out/src/css/d3_fonts.css rename {src => assets}/out/src/fonts/raleway-v27-latin-200.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-200.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-200italic.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-200italic.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-600.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-600.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-600italic.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-600italic.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-700.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-700.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-700italic.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-700italic.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-italic.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-italic.woff2 (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-regular.woff (100%) rename {src => assets}/out/src/fonts/raleway-v27-latin-regular.woff2 (100%) delete mode 100644 src/Application/views/blocks/layout/d3_base_style.tpl delete mode 100644 src/out/src/css/d3_fonts.css rename {src/Application/views => views/smarty}/blocks/layout/d3_base_fonts.tpl (100%) create mode 100644 views/smarty/blocks/layout/d3_base_style.tpl diff --git a/Application/Model/Constants.php b/Application/Model/Constants.php new file mode 100644 index 0000000..198a1a2 --- /dev/null +++ b/Application/Model/Constants.php @@ -0,0 +1,11 @@ +getModuleUrl('removegooglefonts', 'out/src/css/d3_fonts.css')}] \ No newline at end of file diff --git a/src/out/src/css/d3_fonts.css b/src/out/src/css/d3_fonts.css deleted file mode 100644 index 494aa28..0000000 --- a/src/out/src/css/d3_fonts.css +++ /dev/null @@ -1,85 +0,0 @@ -/* raleway-200 - latin */ -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 200; - src: local(''), - url('../fonts/raleway-v27-latin-200.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-200.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-regular - latin */ -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 400; - src: local(''), - url('../fonts/raleway-v27-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-600 - latin */ -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 600; - src: local(''), - url('../fonts/raleway-v27-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-700 - latin */ -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 700; - src: local(''), - url('../fonts/raleway-v27-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-200italic - latin */ -@font-face { - font-family: 'Raleway'; - font-style: italic; - font-weight: 200; - src: local(''), - url('../fonts/raleway-v27-latin-200italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-200italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-italic - latin */ -@font-face { - font-family: 'Raleway'; - font-style: italic; - font-weight: 400; - src: local(''), - url('../fonts/raleway-v27-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-600italic - latin */ -@font-face { - font-family: 'Raleway'; - font-style: italic; - font-weight: 600; - src: local(''), - url('../fonts/raleway-v27-latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* raleway-700italic - latin */ -@font-face { - font-family: 'Raleway'; - font-style: italic; - font-weight: 700; - src: local(''), - url('../fonts/raleway-v27-latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/raleway-v27-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -body { - font-family:Raleway,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size:14px; - line-height:1.42857143; -} \ No newline at end of file diff --git a/src/Application/views/blocks/layout/d3_base_fonts.tpl b/views/smarty/blocks/layout/d3_base_fonts.tpl similarity index 100% rename from src/Application/views/blocks/layout/d3_base_fonts.tpl rename to views/smarty/blocks/layout/d3_base_fonts.tpl diff --git a/views/smarty/blocks/layout/d3_base_style.tpl b/views/smarty/blocks/layout/d3_base_style.tpl new file mode 100644 index 0000000..ab873a3 --- /dev/null +++ b/views/smarty/blocks/layout/d3_base_style.tpl @@ -0,0 +1,3 @@ +[{$smarty.block.parent}] +[{assign var="d3ViewConfObject" value=$oView->getViewConfig()}] +[{oxstyle include=$d3ViewConfObject->getModuleUrl('removegooglefonts', 'assets/out/src/css/d3_fonts.css')}] \ No newline at end of file