Skip to content

Fix flash message for flex-container #30657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Fix flash message for flex-container #30657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7caede
fix
wxiaoguang Apr 23, 2024
672f46f
Merge branch 'main' into fix-msg
wxiaoguang Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions templates/admin/layout_head.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
{{template "base/head" .ctxData}}
<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">
{{template "admin/navbar" .ctxData}}
<div class="flex-container-main">
{{template "base/alert" .ctxData}}
{{/* block: admin-setting-content */}}

{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
Expand Down
2 changes: 1 addition & 1 deletion templates/user/dashboard/dashboard.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds">
{{template "user/dashboard/navbar" .}}
{{template "base/alert" .}}
<div class="ui container flex-container">
<div class="flex-container-main">
{{template "base/alert" .}}
{{template "user/heatmap" .}}
{{template "user/dashboard/feeds" .}}
</div>
Expand Down
6 changes: 0 additions & 6 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,12 +495,6 @@ img.ui.avatar,
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 select,
.ui.form .fields.error .field input:not([type]),
Expand Down