diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index 8ba47f2f1..7cc6624d5 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .ctxData}}
-
+
{{template "admin/navbar" .ctxData}}
{{template "base/alert" .ctxData}} diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 415423d43..5dc46dc0a 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}}
{{template "user/dashboard/navbar" .}} - {{template "base/alert" .}}
+ {{template "base/alert" .}} {{template "user/heatmap" .}} {{template "user/dashboard/feeds" .}}
diff --git a/web_src/css/base.css b/web_src/css/base.css index 4f62dd103..3d9158693 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -636,12 +636,6 @@ img.ui.avatar, background: var(--color-active); } -/* add horizontal margin to elements that are outside top-level of .flex-container or .ui.container */ -.page-content > .flash-message { - margin-left: var(--page-margin-x); - margin-right: var(--page-margin-x); -} - .ui.form .fields.error .field textarea, .ui.form .fields.error .field select, .ui.form .fields.error .field input:not([type]),