diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-19 16:07:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 16:07:21 +0100 |
| commit | f064cd4fb8057af04f0f1db6a98fc45935811e25 (patch) | |
| tree | 33375e965ba16e3491f3bc3cd733ff2331a48220 /app/views/layouts | |
| parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
| parent | dace054c0680b3ac6e0da31f3ffa501cd8840fbf (diff) | |
Merge pull request #1255 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/admin.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index fc690409c..9fceb54eb 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -18,7 +18,12 @@ .content-wrapper .content - %h2= yield :page_title + .content-heading + %h2= yield :page_title + + - if :page_heading_actions + .content-heading-actions + = yield :page_heading_actions = render 'application/flashes' |