diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 2b14bf220..d4e22623b 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -150,14 +150,6 @@ const config = { theme: { customCss: require.resolve('./src/styles/custom.css'), }, - googleAnalytics: { - trackingID: 'G-133LHD3B3N', - anonymizeIP: true, - }, - gtag: { - trackingID: 'G-133LHD3B3N', - anonymizeIP: true, - }, }), ], ], diff --git a/docs/package.json b/docs/package.json index ec897610f..09857414f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -21,7 +21,6 @@ "@docsearch/react": "^3.6.0", "@docusaurus/core": "^2.4.1", "@docusaurus/plugin-client-redirects": "^2.4.3", - "@docusaurus/plugin-google-gtag": "^2.4.1", "@docusaurus/preset-classic": "^2.4.3", "@emotion/core": "^10.1.1", "@emotion/styled": "^10.0.27", diff --git a/docs/src/fonts/Roboto-Bold.woff b/docs/src/fonts/Roboto-Bold.woff new file mode 100644 index 000000000..db61e57d5 Binary files /dev/null and b/docs/src/fonts/Roboto-Bold.woff differ diff --git a/docs/src/fonts/Roboto-Bold.woff2 b/docs/src/fonts/Roboto-Bold.woff2 new file mode 100644 index 000000000..b102004e8 Binary files /dev/null and b/docs/src/fonts/Roboto-Bold.woff2 differ diff --git a/docs/src/fonts/Roboto-Regular.woff b/docs/src/fonts/Roboto-Regular.woff new file mode 100644 index 000000000..3880f0414 Binary files /dev/null and b/docs/src/fonts/Roboto-Regular.woff differ diff --git a/docs/src/fonts/Roboto-Regular.woff2 b/docs/src/fonts/Roboto-Regular.woff2 new file mode 100644 index 000000000..0aa90fc17 Binary files /dev/null and b/docs/src/fonts/Roboto-Regular.woff2 differ diff --git a/docs/src/styles/custom.css b/docs/src/styles/custom.css index f13af3dbe..37be9402b 100644 --- a/docs/src/styles/custom.css +++ b/docs/src/styles/custom.css @@ -24,8 +24,21 @@ */ /* You can override the default Infima variables here. */ -@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap'); +@font-face { + font-family: 'Roboto'; + src: url('../fonts/Roboto-Regular.woff2') format('woff2'), + url('../fonts/Roboto-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} +@font-face { + font-family: 'Roboto'; + src: url('../fonts/Roboto-Bold.woff2') format('woff2'), + url('../fonts/Roboto-Bold.woff') format('woff'); + font-weight: 700; + font-style: bold; +} :root { --ifm-color-primary: #20a7c9; --ifm-color-primary-dark: #1985a0; diff --git a/docs/static/.htaccess b/docs/static/.htaccess index 4ef3ebb52..9a23e6873 100644 --- a/docs/static/.htaccess +++ b/docs/static/.htaccess @@ -22,4 +22,4 @@ RewriteRule ^(.*)$ https://superset.apache.org/$1 [R,L] RewriteCond %{HTTP_HOST} ^superset.incubator.apache.org$ [NC] RewriteRule ^(.*)$ https://superset.apache.org/$1 [R=301,L] -Header set Content-Security-Policy "default-src data: blob: 'self' *.apache.org *.bugherd.com *.scarf.sh *.googleapis.com *.googletagmanager.com *.google-analytics.com *.github.com *.bugsnag.com *.algolia.net *.algolianet.com 'unsafe-inline' 'unsafe-eval'; frame-src *; frame-ancestors 'self' *.preset.io *.google.com https://sidebar.bugherd.com https://unpkg.com; form-action 'self'; worker-src blob:; img-src 'self' blob: data: https:; font-src 'self' https://fonts.gstatic.com; object-src 'none'" +Header set Content-Security-Policy "default-src data: blob: 'self' *.apache.org *.bugherd.com *.scarf.sh *.googleapis.com *.github.com *.bugsnag.com *.algolia.net *.algolianet.com 'unsafe-inline' 'unsafe-eval'; frame-src *; frame-ancestors 'self' *.preset.io *.google.com https://sidebar.bugherd.com https://unpkg.com; form-action 'self'; worker-src blob:; img-src 'self' blob: data: https:; font-src 'self'; object-src 'none'" diff --git a/docs/yarn.lock b/docs/yarn.lock index 8a24ef479..0c8a5f445 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -1940,7 +1940,7 @@ "@docusaurus/utils-validation" "2.4.3" tslib "^2.4.0" -"@docusaurus/plugin-google-gtag@2.4.3", "@docusaurus/plugin-google-gtag@^2.4.1": +"@docusaurus/plugin-google-gtag@2.4.3": version "2.4.3" resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.4.3.tgz#e1a80b0696771b488562e5b60eff21c9932d9e1c" integrity sha512-5FMg0rT7sDy4i9AGsvJC71MQrqQZwgLNdDetLEGDHLfSHLvJhQbTCUGbGXknUgWXQJckcV/AILYeJy+HhxeIFA== @@ -8933,7 +8933,7 @@ react-syntax-highlighter@^15.4.5: "@babel/runtime" "^7.3.1" highlight.js "^10.4.1" lowlight "^1.17.0" - prismjs "^1.28.0" + prismjs "^1.25.0" refractor "^3.2.0" react-textarea-autosize@^8.3.2: @@ -9020,7 +9020,7 @@ refractor@^3.2.0: dependencies: hastscript "^6.0.0" parse-entities "^2.0.0" - prismjs "~1.28.0" + prismjs "~1.25.0" regenerate-unicode-properties@^10.1.0: version "10.1.0"