Fix flash message for flex-container (#30657)

pull/30625/head^2
wxiaoguang 7 months ago committed by GitHub
parent 9b7af4340c
commit dd2aaadce3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      templates/admin/layout_head.tmpl
  2. 2
      templates/user/dashboard/dashboard.tmpl
  3. 6
      web_src/css/base.css

@ -1,11 +1,9 @@
{{template "base/head" .ctxData}} {{template "base/head" .ctxData}}
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
<div class="ui container">
{{template "base/alert" .ctxData}}
</div>
<div class="ui container fluid padded flex-container"> <div class="ui container fluid padded flex-container">
{{template "admin/navbar" .ctxData}} {{template "admin/navbar" .ctxData}}
<div class="flex-container-main"> <div class="flex-container-main">
{{template "base/alert" .ctxData}}
{{/* block: admin-setting-content */}} {{/* block: admin-setting-content */}}
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}

@ -1,9 +1,9 @@
{{template "base/head" .}} {{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds"> <div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds">
{{template "user/dashboard/navbar" .}} {{template "user/dashboard/navbar" .}}
{{template "base/alert" .}}
<div class="ui container flex-container"> <div class="ui container flex-container">
<div class="flex-container-main"> <div class="flex-container-main">
{{template "base/alert" .}}
{{template "user/heatmap" .}} {{template "user/heatmap" .}}
{{template "user/dashboard/feeds" .}} {{template "user/dashboard/feeds" .}}
</div> </div>

@ -495,12 +495,6 @@ img.ui.avatar,
margin-top: calc(var(--page-spacing) - 1rem); margin-top: calc(var(--page-spacing) - 1rem);
} }
/* 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 textarea,
.ui.form .fields.error .field select, .ui.form .fields.error .field select,
.ui.form .fields.error .field input:not([type]), .ui.form .fields.error .field input:not([type]),

Loading…
Cancel
Save