diff options
Diffstat (limited to 'plugins/Morpheus')
| -rw-r--r-- | plugins/Morpheus/stylesheets/base.less | 5 | ||||
| -rw-r--r-- | plugins/Morpheus/stylesheets/main.less | 1 | ||||
| -rw-r--r-- | plugins/Morpheus/templates/_jsGlobalVariables.twig | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/plugins/Morpheus/stylesheets/base.less b/plugins/Morpheus/stylesheets/base.less index e2deb1c633..523ace40f4 100644 --- a/plugins/Morpheus/stylesheets/base.less +++ b/plugins/Morpheus/stylesheets/base.less @@ -3,7 +3,6 @@ @import "base/colors"; @import "base/mixins"; - /* General styles */ @import "general/_default.less"; @import "general/_utils.less"; @@ -14,8 +13,8 @@ /* Component styles */ @import "uibase/_header.less"; @import "uibase/_headerMessage.less"; -@import "../../CoreHome/angularjs/siteselector/siteselector.directive.less"; -@import "../../CoreHome/vue/src/Menudropdown/Menudropdown.less"; +@import "../../CoreHome/vue/src/SiteSelector/SiteSelector.less"; +@import "../../CoreHome/vue/src/MenuDropdown/MenuDropdown.less"; @import "../../CoreHome/vue/src/Alert/alert.less"; @import "../../CoreHome/stylesheets/dataTable/_entityTable.less"; @import "uibase/_periodSelect.less"; diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less index 31b02f7c17..647c27c28f 100644 --- a/plugins/Morpheus/stylesheets/main.less +++ b/plugins/Morpheus/stylesheets/main.less @@ -8,6 +8,7 @@ @import "ui/_charts"; @import "ui/_map"; + body { background: @theme-color-background-base; font-family: @theme-fontFamily-base; diff --git a/plugins/Morpheus/templates/_jsGlobalVariables.twig b/plugins/Morpheus/templates/_jsGlobalVariables.twig index 70f7710936..f623687cec 100644 --- a/plugins/Morpheus/templates/_jsGlobalVariables.twig +++ b/plugins/Morpheus/templates/_jsGlobalVariables.twig @@ -56,6 +56,7 @@ {% if clientSideConfig is defined %} piwik.config = {{ clientSideConfig|json_encode|raw }}; {% endif %} + Object.freeze(piwik.config); // disallow accidental changes piwik.shouldPropagateTokenAuth = {{ shouldPropagateTokenAuth|json_encode|raw }}; {{ postEvent("Template.jsGlobalVariables") }} </script> |