Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: increase custom CSS priority (#706)

Guilherme Oenningd294f3f4fc91
diff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.html
index 4f1619b6c..6b04f6add 100755
--- a/app/pkg/web/testdata/basic.html
+++ b/app/pkg/web/testdata/basic.html
@@ -21,7 +21,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="https://demo.test.fider.io:3000/" />
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
-
</head>
<body>
<noscript class="container">
@@ -51,5 +50,6 @@
+
</body>
</html>
diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.html
index 3e38c18a3..e24d95839 100755
--- a/app/pkg/web/testdata/canonical.html
+++ b/app/pkg/web/testdata/canonical.html
@@ -23,7 +23,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="https://demo.test.fider.io:3000/" />
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
-
</head>
<body>
<noscript class="container">
@@ -53,5 +52,6 @@
+
</body>
</html>
diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.html
index 6ddd3b0a2..c859221e1 100644
--- a/app/pkg/web/testdata/chunk.html
+++ b/app/pkg/web/testdata/chunk.html
@@ -28,7 +28,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="https://demo.test.fider.io:3000/" />
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
-
</head>
<body>
<noscript class="container">
@@ -58,5 +57,6 @@
+
</body>
</html>
diff --git a/app/pkg/web/testdata/props.html b/app/pkg/web/testdata/props.html
index fc01ae669..b25f8d859 100755
--- a/app/pkg/web/testdata/props.html
+++ b/app/pkg/web/testdata/props.html
@@ -21,7 +21,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="https://demo.test.fider.io:3000/" />
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
-
</head>
<body>
<noscript class="container">
@@ -51,5 +50,6 @@
+
</body>
</html>
diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.html
index 18534cf11..2ff3a62ae 100755
--- a/app/pkg/web/testdata/tenant.html
+++ b/app/pkg/web/testdata/tenant.html
@@ -21,9 +21,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="https://demo.test.fider.io:3000/" />
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
-
-
-
</head>
<body>
<noscript class="container">
@@ -53,5 +50,8 @@
+
+
+
</body>
</html>
diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.html
index afb4de2d4..3bb558857 100755
--- a/app/pkg/web/testdata/user.html
+++ b/app/pkg/web/testdata/user.html
@@ -21,7 +21,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="https://demo.test.fider.io:3000/" />
<meta property="og:image" content="https://getfider.com/images/logo-100x100.png">
-
</head>
<body>
<noscript class="container">
@@ -51,5 +50,6 @@
+
</body>
</html>
diff --git a/views/base.html b/views/base.html
index 03c52b90a..abd61d03e 100644
--- a/views/base.html
+++ b/views/base.html
@@ -30,11 +30,6 @@
<meta property="og:type" content="website" />
<meta property="og:url" content="{{ .__currentURL }}" />
<meta property="og:image" content="{{ .__logo }}">
- {{ if .__tenant }}
- {{ if .__tenant.CustomCSS }}
- <link rel="stylesheet" href="{{ .__settings.tenantAssetsURL }}/custom/{{ .__tenant.CustomCSS | md5 }}.css" />
- {{ end }}
- {{ end }}
</head>
<body>
<noscript class="container">
@@ -65,5 +60,10 @@
</script>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch" crossorigin="anonymous"></script>
{{template "end-of-body" .}}
+ {{ if .__tenant }}
+ {{ if .__tenant.CustomCSS }}
+ <link rel="stylesheet" href="{{ .__settings.tenantAssetsURL }}/custom/{{ .__tenant.CustomCSS | md5 }}.css" />
+ {{ end }}
+ {{ end }}
</body>
</html>