From b1cf7f4df11dfac879d65125880d18a03fef22c0 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 1 Dec 2020 05:00:14 +0100
Subject: [PATCH] Add class to page content to unify top margin (#13766)

* Add class to page content to unify top margin

Previously pages would individually set this margin but some didn't so
content would stick to the header without any space. Resolve this by
adding a new class that is added on all pages. The only place where we
remove this margin again is on the pages with menu or wrapper in the
header.

* fix admin notices

* fix team pages

* fix loading segment on gitgraph for arc-green

* fix last missing case

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
 templates/admin/auth/edit.tmpl                   |  2 +-
 templates/admin/auth/list.tmpl                   |  2 +-
 templates/admin/auth/new.tmpl                    |  2 +-
 templates/admin/config.tmpl                      |  2 +-
 templates/admin/dashboard.tmpl                   |  2 +-
 templates/admin/emails/list.tmpl                 |  2 +-
 templates/admin/hook_new.tmpl                    |  2 +-
 templates/admin/hooks.tmpl                       |  2 +-
 templates/admin/monitor.tmpl                     |  2 +-
 templates/admin/notice.tmpl                      |  2 +-
 templates/admin/org/list.tmpl                    |  2 +-
 templates/admin/queue.tmpl                       |  2 +-
 templates/admin/repo/list.tmpl                   |  2 +-
 templates/admin/repo/unadopted.tmpl              |  2 +-
 templates/admin/user/edit.tmpl                   |  2 +-
 templates/admin/user/list.tmpl                   |  2 +-
 templates/admin/user/new.tmpl                    |  2 +-
 templates/explore/code.tmpl                      |  2 +-
 templates/explore/navbar.tmpl                    |  2 +-
 templates/explore/organizations.tmpl             |  2 +-
 templates/explore/repos.tmpl                     |  2 +-
 templates/explore/users.tmpl                     |  2 +-
 templates/home.tmpl                              |  2 +-
 templates/install.tmpl                           |  2 +-
 templates/org/create.tmpl                        |  2 +-
 templates/org/home.tmpl                          |  2 +-
 templates/org/member/members.tmpl                |  2 +-
 templates/org/settings/delete.tmpl               |  2 +-
 templates/org/settings/hook_new.tmpl             |  2 +-
 templates/org/settings/hooks.tmpl                |  2 +-
 templates/org/settings/labels.tmpl               |  2 +-
 templates/org/settings/options.tmpl              |  2 +-
 templates/org/team/members.tmpl                  |  2 +-
 templates/org/team/new.tmpl                      |  2 +-
 templates/org/team/repositories.tmpl             |  2 +-
 templates/org/team/teams.tmpl                    |  2 +-
 templates/post-install.tmpl                      |  2 +-
 templates/repo/activity.tmpl                     |  2 +-
 templates/repo/branch/list.tmpl                  |  2 +-
 templates/repo/commit_page.tmpl                  |  2 +-
 templates/repo/commits.tmpl                      |  2 +-
 templates/repo/create.tmpl                       |  2 +-
 templates/repo/diff/compare.tmpl                 |  2 +-
 templates/repo/editor/delete.tmpl                |  2 +-
 templates/repo/editor/edit.tmpl                  |  2 +-
 templates/repo/editor/upload.tmpl                |  2 +-
 templates/repo/empty.tmpl                        |  2 +-
 templates/repo/forks.tmpl                        |  2 +-
 templates/repo/graph.tmpl                        |  2 +-
 templates/repo/home.tmpl                         |  2 +-
 templates/repo/issue/choose.tmpl                 |  2 +-
 templates/repo/issue/labels.tmpl                 |  2 +-
 templates/repo/issue/list.tmpl                   |  2 +-
 templates/repo/issue/milestone_issues.tmpl       |  2 +-
 templates/repo/issue/milestone_new.tmpl          |  2 +-
 templates/repo/issue/milestones.tmpl             |  2 +-
 templates/repo/issue/new.tmpl                    |  2 +-
 templates/repo/issue/view.tmpl                   |  2 +-
 templates/repo/migrate/git.tmpl                  |  2 +-
 templates/repo/migrate/gitea.tmpl                |  2 +-
 templates/repo/migrate/github.tmpl               |  2 +-
 templates/repo/migrate/gitlab.tmpl               |  2 +-
 templates/repo/migrate/migrate.tmpl              |  2 +-
 templates/repo/migrate/migrating.tmpl            |  2 +-
 templates/repo/projects/list.tmpl                |  2 +-
 templates/repo/projects/new.tmpl                 |  2 +-
 templates/repo/projects/view.tmpl                |  2 +-
 templates/repo/pulls/commits.tmpl                |  2 +-
 templates/repo/pulls/files.tmpl                  |  2 +-
 templates/repo/pulls/fork.tmpl                   |  2 +-
 templates/repo/release/list.tmpl                 |  2 +-
 templates/repo/release/new.tmpl                  |  2 +-
 templates/repo/search.tmpl                       |  2 +-
 templates/repo/settings/branches.tmpl            |  2 +-
 templates/repo/settings/collaboration.tmpl       |  2 +-
 templates/repo/settings/deploy_keys.tmpl         |  2 +-
 templates/repo/settings/githook_edit.tmpl        |  2 +-
 templates/repo/settings/githooks.tmpl            |  2 +-
 templates/repo/settings/lfs.tmpl                 |  2 +-
 templates/repo/settings/lfs_file.tmpl            |  2 +-
 templates/repo/settings/lfs_file_find.tmpl       |  2 +-
 templates/repo/settings/lfs_locks.tmpl           |  2 +-
 templates/repo/settings/lfs_pointers.tmpl        |  2 +-
 templates/repo/settings/options.tmpl             |  2 +-
 templates/repo/settings/protected_branch.tmpl    |  2 +-
 templates/repo/settings/webhook/base.tmpl        |  2 +-
 templates/repo/settings/webhook/new.tmpl         |  2 +-
 templates/repo/watchers.tmpl                     |  2 +-
 templates/repo/wiki/new.tmpl                     |  2 +-
 templates/repo/wiki/pages.tmpl                   |  2 +-
 templates/repo/wiki/revision.tmpl                |  2 +-
 templates/repo/wiki/start.tmpl                   |  2 +-
 templates/repo/wiki/view.tmpl                    |  2 +-
 templates/status/404.tmpl                        | 16 +++++++++-------
 templates/status/500.tmpl                        |  2 +-
 templates/user/auth/activate.tmpl                |  2 +-
 templates/user/auth/change_passwd.tmpl           |  2 +-
 templates/user/auth/finalize_openid.tmpl         |  2 +-
 templates/user/auth/forgot_passwd.tmpl           |  2 +-
 templates/user/auth/grant.tmpl                   |  2 +-
 templates/user/auth/grant_error.tmpl             |  4 ++--
 templates/user/auth/link_account.tmpl            |  3 +--
 templates/user/auth/prohibit_login.tmpl          |  2 +-
 templates/user/auth/reset_passwd.tmpl            |  2 +-
 templates/user/auth/signin.tmpl                  |  2 +-
 templates/user/auth/signin_navbar.tmpl           |  2 --
 templates/user/auth/signin_openid.tmpl           |  2 +-
 templates/user/auth/signup.tmpl                  |  2 +-
 templates/user/auth/signup_openid_connect.tmpl   |  2 +-
 templates/user/auth/signup_openid_register.tmpl  |  2 +-
 templates/user/auth/twofa.tmpl                   |  2 +-
 templates/user/auth/twofa_scratch.tmpl           |  2 +-
 templates/user/auth/u2f.tmpl                     |  2 +-
 templates/user/dashboard/dashboard.tmpl          |  2 +-
 templates/user/dashboard/issues.tmpl             |  2 +-
 templates/user/dashboard/milestones.tmpl         |  2 +-
 .../user/notification/notification_div.tmpl      |  2 +-
 templates/user/profile.tmpl                      |  2 +-
 templates/user/project.tmpl                      |  2 +-
 templates/user/settings/account.tmpl             |  2 +-
 templates/user/settings/applications.tmpl        |  2 +-
 .../user/settings/applications_oauth2_edit.tmpl  |  2 +-
 templates/user/settings/keys.tmpl                |  2 +-
 templates/user/settings/organization.tmpl        |  2 +-
 templates/user/settings/profile.tmpl             |  2 +-
 templates/user/settings/repos.tmpl               |  2 +-
 templates/user/settings/security.tmpl            |  2 +-
 templates/user/settings/twofa_enroll.tmpl        |  2 +-
 web_src/less/_admin.less                         |  4 ----
 web_src/less/_base.less                          | 15 ++++++++++++++-
 web_src/less/_dashboard.less                     |  1 -
 web_src/less/_explore.less                       |  1 -
 web_src/less/_repository.less                    |  1 -
 133 files changed, 150 insertions(+), 145 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 24f6b37c8..3347a91bf 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin edit authentication">
+<div class="page-content admin edit authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 60b8f6fbe..851254c09 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin authentication">
+<div class="page-content admin authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index e72a82cbb..c252f7d3f 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin new authentication">
+<div class="page-content admin new authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 4d88c59fe..00ad7a9a0 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin config">
+<div class="page-content admin config">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 911cdb9fe..e6d9f57c2 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin dashboard">
+<div class="page-content admin dashboard">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 8a60088f0..752c01044 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index 26169acaa..8eeb0e526 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin new webhook">
+<div class="page-content admin new webhook">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index 3265a1d69..c09c6fcaf 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin hooks">
+<div class="page-content admin hooks">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "repo/settings/webhook/list" .}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index c3600fa99..5a38b92ee 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin monitor">
+<div class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index d1d264c8c..3320f5884 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin notice">
+<div class="page-content admin notice">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 4a0fd1611..92b119d65 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 567e72e03..6524c9839 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin monitor">
+<div class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index df38831b6..fbadfeea7 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 7a046c602..26c91c315 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index e29b18f5b..7f1706e55 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin edit user">
+<div class="page-content admin edit user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index d6dd7d5c0..dafeadaf9 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index b05f81717..885045dd0 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin new user">
+<div class="page-content admin new user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl
index bf7f85c5a..9c880e59f 100644
--- a/templates/explore/code.tmpl
+++ b/templates/explore/code.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore users">
+<div class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		<form class="ui form ignore-dirty" style="max-width: 100%">
diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl
index ce86c0a8c..93810dcf4 100644
--- a/templates/explore/navbar.tmpl
+++ b/templates/explore/navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="ui secondary pointing tabular top attached borderless stackable menu navbar">
+<div class="ui secondary pointing tabular top attached borderless stackable menu new-menu navbar">
 	<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
 		{{svg "octicon-repo"}} {{.i18n.Tr "explore.repos"}}
 	</a>
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index a83998543..a2d62f3db 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore users">
+<div class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index c728219d3..457ad7411 100644
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore repositories">
+<div class="page-content explore repositories">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/repo_search" .}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index a305e0db2..64fa93d6e 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore users">
+<div class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 721bb50db..fe3954d0e 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="home">
+<div class="page-content home">
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<div>
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 94fb851a4..62aaeaed9 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="install">
+<div class="page-content install">
 	<div class="ui middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<h3 class="ui top attached header">
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 82c8766a9..24a641a73 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization new org">
+<div class="page-content organization new org">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 12630b70d..54474965b 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization profile mt-5">
+<div class="page-content organization profile">
 	{{/* overflow: auto is the clearfix - this avoids the image going beyond
 	the container where it is supposed to stay inside. */}}
 	<div class="ui container" style="overflow: auto">
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index f33f9be92..1a168da13 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization members">
+<div class="page-content organization members">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index a8d42b547..9743d71cb 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings delete">
+<div class="page-content organization settings delete">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 35bb1610a..96769c744 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings new webhook">
+<div class="page-content organization settings new webhook">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index 825b1e941..cb0243bb1 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings webhooks">
+<div class="page-content organization settings webhooks">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl
index ed31890df..61302c731 100644
--- a/templates/org/settings/labels.tmpl
+++ b/templates/org/settings/labels.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings labels">
+<div class="page-content organization settings labels">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index d58c77ad1..348f8cb53 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings options">
+<div class="page-content organization settings options">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index ef595f841..51abf4ec4 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization teams">
+<div class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index eeb9b1186..85f945c83 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization new team">
+<div class="page-content organization new team">
 	{{template "org/header" .}}
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 16418b474..3b5f1b33f 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization teams">
+<div class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index e4be11ee5..0fae4eb6c 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization teams">
+<div class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl
index c7886a326..62abf5ef8 100644
--- a/templates/post-install.tmpl
+++ b/templates/post-install.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="install">
+<div class="page-content install">
     <div class="ui container">
 		<div class="ui grid">
 			<div class="sixteen wide column content">
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index ba2750983..b6d77f5ee 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository commits">
+<div class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui header">{{.DateFrom}} - {{.DateUntil}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 27b974787..85a95739a 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="ui repository branches">
+<div class="page-content ui repository branches">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index fb60967e3..4bc96ae45 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository diff">
+<div class="page-content repository diff">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 		{{$class := ""}}
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index dc729d935..5a8a89fe1 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository commits">
+<div class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "repo/sub_menu" .}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 39759bcc4..4593e7752 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new repo">
+<div class="page-content repository new repo">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index 7daafa3e2..245bdaa54 100644
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository diff {{if .PageIsComparePull}}compare pull{{end}}">
+<div class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 
diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl
index 10eca8f52..08493944b 100644
--- a/templates/repo/editor/delete.tmpl
+++ b/templates/repo/editor/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file editor delete">
+<div class="page-content repository file editor delete">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index b991d2424..695574cd9 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file editor edit">
+<div class="page-content repository file editor edit">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl
index 6ad7c7445..488465120 100644
--- a/templates/repo/editor/upload.tmpl
+++ b/templates/repo/editor/upload.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file editor upload">
+<div class="page-content repository file editor upload">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index 3da769053..b5a39d0a9 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository quickstart">
+<div class="page-content repository quickstart">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl
index 461ac89c8..28547f1af 100644
--- a/templates/repo/forks.tmpl
+++ b/templates/repo/forks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository forks">
+<div class="page-content repository forks">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui dividing header">
diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl
index fa027adc0..e3b5cd387 100644
--- a/templates/repo/graph.tmpl
+++ b/templates/repo/graph.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository commits">
+<div class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div id="git-graph-container" class="ui segment{{if eq .Mode "monochrome"}} monochrome{{end}}">
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 0922bd738..80187a2fb 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file list {{if .IsBlame}}blame{{end}}">
+<div class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl
index 759c5437c..0cec1ef63 100644
--- a/templates/repo/issue/choose.tmpl
+++ b/templates/repo/issue/choose.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new issue">
+<div class="page-content repository new issue">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl
index d3df3b594..373083814 100644
--- a/templates/repo/issue/labels.tmpl
+++ b/templates/repo/issue/labels.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository labels">
+<div class="page-content repository labels">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 95aea0c13..6125c01b7 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository">
+<div class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column stackable grid">
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index a78b20893..9f0a2f99a 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository">
+<div class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column stackable grid">
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 215d4f3c7..94d31d627 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new milestone">
+<div class="page-content repository new milestone">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 22daf66b3..4d16b0d01 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository milestones">
+<div class="page-content repository milestones">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl
index 3c6bc05b1..f8929b375 100644
--- a/templates/repo/issue/new.tmpl
+++ b/templates/repo/issue/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new issue">
+<div class="page-content repository new issue">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index c23bac3c6..bf253291f 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository view issue pull">
+<div class="page-content repository view issue pull">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui two column stackable grid">
diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl
index 880faab88..d767de63f 100644
--- a/templates/repo/migrate/git.tmpl
+++ b/templates/repo/migrate/git.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 3ca7527ce..feab91a9e 100644
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
index c2679e820..54d7dc97e 100644
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
index 41f5f3c3b..4f6ac8118 100644
--- a/templates/repo/migrate/gitlab.tmpl
+++ b/templates/repo/migrate/gitlab.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl
index a8b124452..8ada46e1d 100644
--- a/templates/repo/migrate/migrate.tmpl
+++ b/templates/repo/migrate/migrate.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<div class="ui three stackable cards">
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index fdda33a2c..a4ec15fa9 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository quickstart">
+<div class="page-content repository quickstart">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 838bbdf1c..080137f70 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository milestones">
+<div class="page-content repository milestones">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index aabc09c80..f668ab601 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new milestone">
+<div class="page-content repository new milestone">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index ee82f2401..d90a0d38a 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository">
+<div class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column stackable grid">
diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl
index 422295f55..ecfe09c1e 100644
--- a/templates/repo/pulls/commits.tmpl
+++ b/templates/repo/pulls/commits.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository view issue pull commits">
+<div class="page-content repository view issue pull commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl
index 4caebf0b5..60f47408c 100644
--- a/templates/repo/pulls/files.tmpl
+++ b/templates/repo/pulls/files.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository view issue pull files diff">
+<div class="page-content repository view issue pull files diff">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 		<div class="navbar">
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
index fb690e831..360fe7372 100644
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new fork">
+<div class="page-content repository new fork">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index a05d671b1..cab054224 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository release">
+<div class="page-content repository release">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 7c38f5401..98b6a2095 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new release">
+<div class="page-content repository new release">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui dividing header">
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl
index 6aa556773..ca39c9a2f 100644
--- a/templates/repo/search.tmpl
+++ b/templates/repo/search.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file list">
+<div class="page-content repository file list">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui repo-search">
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index be68e9bcb..81e80215c 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings edit">
+<div class="page-content repository settings edit">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 1d49fc54d..b6e659d59 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings collaboration">
+<div class="page-content repository settings collaboration">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index d6fb87bb8..8a75903bc 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings">
+<div class="page-content repository settings">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index 4d68d9bfb..70a67554d 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings edit githook">
+<div class="page-content repository settings edit githook">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index 522ec75e8..40bc787c8 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings githooks">
+<div class="page-content repository settings githooks">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 38dd54746..b6a058158 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index e5736a059..09eeb3f27 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index cfef51b3c..83a2e317d 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index c895896bc..674c2b645 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 1bd48de15..8a50c1bdf 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 96414731b..0894ecbec 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings options">
+<div class="page-content repository settings options">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index 1fbd28d8b..35d6d4ab1 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings branches">
+<div class="page-content repository settings branches">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index 6f486131f..a9404790d 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings webhooks">
+<div class="page-content repository settings webhooks">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index cf4c541bb..fc78db864 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings new webhook">
+<div class="page-content repository settings new webhook">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl
index 235ebf23b..6afb89b26 100644
--- a/templates/repo/watchers.tmpl
+++ b/templates/repo/watchers.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository watchers">
+<div class="page-content repository watchers">
 	{{template "repo/header" .}}
 	{{template "repo/user_cards" .}}
 </div>
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index 002a36de9..06450a6ec 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki new">
+<div class="page-content repository wiki new">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index c3fb412c5..3afa7772d 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki pages">
+<div class="page-content repository wiki pages">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui header df ac sb">
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 5f1fa08a5..cd1adfb54 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki revisions">
+<div class="page-content repository wiki revisions">
 	{{template "repo/header" .}}
 	{{ $title := .title}}
 	<div class="ui container">
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl
index d8de0fcb7..e9b7ecb6c 100644
--- a/templates/repo/wiki/start.tmpl
+++ b/templates/repo/wiki/start.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki start">
+<div class="page-content repository wiki start">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui center segment">
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 05a85a516..255fe5250 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki view">
+<div class="page-content repository wiki view">
 	{{template "repo/header" .}}
 	{{ $title := .title}}
 	<div class="ui container">
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index bd739280d..c5f549bf5 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,10 +1,12 @@
 {{template "base/head" .}}
-{{if .IsRepo}}<div class="repository">{{template "repo/header" .}}</div>{{end}}
-<div class="ui container center">
-	<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p>
-	<div class="ui divider"></div>
-	<br>
-	<p>{{.i18n.Tr "error404" | Safe}}
-	{{if .ShowFooterVersion}}<p>{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
+<div class="page-content ui container center {{if .IsRepo}}repository{{end}}">
+	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
+	<div class="ui container center">
+		<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p>
+		<div class="ui divider"></div>
+		<br>
+		<p>{{.i18n.Tr "error404" | Safe}}
+		{{if .ShowFooterVersion}}<p>{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
+	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index c66897822..d20b06b10 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="ui container center">
+<div class="page-content ui container center">
 	<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/500.png" alt="500"/></p>
 	<div class="ui divider"></div>
 	<br>
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index c3f136add..7f9021ae4 100644
--- a/templates/user/auth/activate.tmpl
+++ b/templates/user/auth/activate.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user activate">
+<div class="page-content user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/activate" method="post">
diff --git a/templates/user/auth/change_passwd.tmpl b/templates/user/auth/change_passwd.tmpl
index d84796348..b1d8c9db2 100644
--- a/templates/user/auth/change_passwd.tmpl
+++ b/templates/user/auth/change_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin{{if .LinkAccountMode}} icon{{end}}">
+<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	<div class="ui container">
 		{{template "user/auth/change_passwd_inner" .}}
 	</div>
diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl
index 386b4ed8f..57e9d14ed 100644
--- a/templates/user/auth/finalize_openid.tmpl
+++ b/templates/user/auth/finalize_openid.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "user/auth/finalize_openid_navbar" .}}
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index 111e42a3d..241deeed4 100644
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user forgot password">
+<div class="page-content user forgot password">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl
index b67bfa110..4c637a46f 100644
--- a/templates/user/auth/grant.tmpl
+++ b/templates/user/auth/grant.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="ui one column stackable center aligned page grid oauth2-authorize-application-box">
+<div class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box">
 	<div class="column seven wide">
 		<div class="ui middle centered raised segments">
 			<h3 class="ui top attached header">
diff --git a/templates/user/auth/grant_error.tmpl b/templates/user/auth/grant_error.tmpl
index 0eb175fbe..83bd88217 100644
--- a/templates/user/auth/grant_error.tmpl
+++ b/templates/user/auth/grant_error.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
-{{if .IsRepo}}<div class="repository">{{template "repo/header" .}}</div>{{end}}
-<div class="ui one column stackable center aligned page grid oauth2-authorize-application-box">
+<div class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box {{if .IsRepo}}repository{{end}}">
+	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	<div class="column seven wide">
 		<div class="ui middle centered raised segments">
 			<h1 class="ui top attached header">
diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl
index 8e1509b8c..183c16aa1 100644
--- a/templates/user/auth/link_account.tmpl
+++ b/templates/user/auth/link_account.tmpl
@@ -1,6 +1,5 @@
 {{template "base/head" .}}
-
-<div class="user link-account">
+<div class="page-content user link-account">
 	<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
 		<div class="new-menu-inner">
 			<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
diff --git a/templates/user/auth/prohibit_login.tmpl b/templates/user/auth/prohibit_login.tmpl
index eec0f08e7..b773ef16e 100644
--- a/templates/user/auth/prohibit_login.tmpl
+++ b/templates/user/auth/prohibit_login.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user activate">
+<div class="page-content user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form">
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index 7d60fe4a8..927cf6f5c 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user reset password">
+<div class="page-content user reset password">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl
index cee40acfc..4785b3094 100644
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin{{if .LinkAccountMode}} icon{{end}}">
+<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	{{template "user/auth/signin_navbar" .}}
 	<div class="ui middle very relaxed page grid">
 		<div class="ui container column">
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
index 6df235ffc..85ebcd90f 100644
--- a/templates/user/auth/signin_navbar.tmpl
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -18,6 +18,4 @@
 		{{end}}
 	</div>
 </div>
-{{else}}
-	<div class="mt-4"></div>
 {{end}}
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index a9c0067ba..d7fb641e0 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin openid">
+<div class="page-content user signin openid">
 	{{template "user/auth/signin_navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index 693198647..7b11731c8 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin{{if .LinkAccountMode}} icon{{end}}">
+<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	<div class="ui middle very relaxed page grid">
 		{{template "user/auth/signup_inner" .}}
 	</div>
diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl
index 9fce212c5..de9787619 100644
--- a/templates/user/auth/signup_openid_connect.tmpl
+++ b/templates/user/auth/signup_openid_connect.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signup">
+<div class="page-content user signup">
 	{{template "user/auth/signup_openid_navbar" .}}
 	<div class="ui container">
 				{{template "base/alert" .}}
diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl
index 80e98dcc6..3138cfe13 100644
--- a/templates/user/auth/signup_openid_register.tmpl
+++ b/templates/user/auth/signup_openid_register.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signup">
+<div class="page-content user signup">
 	{{template "user/auth/signup_openid_navbar" .}}
 	<div class="ui container">
 				{{template "base/alert" .}}
diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl
index 56f910150..b8b489242 100644
--- a/templates/user/auth/twofa.tmpl
+++ b/templates/user/auth/twofa.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index 78aab3e57..44022300c 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/u2f.tmpl b/templates/user/auth/u2f.tmpl
index 1d1be09cb..2013d1493 100644
--- a/templates/user/auth/u2f.tmpl
+++ b/templates/user/auth/u2f.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui middle centered very relaxed page grid">
 		<div class="column">
 			<h3 class="ui top attached header">
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index dc04d6565..3eb8294e7 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="dashboard feeds">
+<div class="page-content dashboard feeds">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 131ca40b3..d4e7cb38b 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="dashboard issues">
+<div class="page-content dashboard issues">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		<div class="ui stackable grid">
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 16b5cf728..92624fb24 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="dashboard issues repository milestones">
+<div class="page-content dashboard issues repository milestones">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		<div class="ui stackable grid">
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
index d35009107..2f25e7338 100644
--- a/templates/user/notification/notification_div.tmpl
+++ b/templates/user/notification/notification_div.tmpl
@@ -1,4 +1,4 @@
-<div class="user notification" id="notification_div" data-params="{{.Page.GetParams}}">
+<div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}">
 	<div class="ui container">
 		<h1 class="ui dividing header">{{.i18n.Tr "notification.notifications"}}</h1>
         <div class="ui top attached tabular menu">
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 1076efec0..12498868f 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user profile mt-5">
+<div class="page-content user profile">
 	<div class="ui container">
 		<div class="ui stackable grid">
 			<div class="ui five wide column">
diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl
index 64f671ae4..d4db08a77 100644
--- a/templates/user/project.tmpl
+++ b/templates/user/project.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new repo">
+<div class="page-content repository new repo">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 8467d5b45..d753f9082 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings account">
+<div class="page-content user settings account">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 56f78d8e6..21ea14d5d 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings applications">
+<div class="page-content user settings applications">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index 495f8ec16..209b2a7c6 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings applications">
+<div class="page-content user settings applications">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index 3653761ac..c88868d00 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings sshkeys">
+<div class="page-content user settings sshkeys">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 00b73f94d..8d03ddead 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings organization">
+<div class="page-content user settings organization">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 141be2d72..7ec8d2a15 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings profile">
+<div class="page-content user settings profile">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 68ed8392f..312b19349 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings repos">
+<div class="page-content user settings repos">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/security.tmpl b/templates/user/settings/security.tmpl
index c2c99c797..891f7b953 100644
--- a/templates/user/settings/security.tmpl
+++ b/templates/user/settings/security.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings security">
+<div class="page-content user settings security">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/twofa_enroll.tmpl b/templates/user/settings/twofa_enroll.tmpl
index 0205532ac..c8ed0b776 100644
--- a/templates/user/settings/twofa_enroll.tmpl
+++ b/templates/user/settings/twofa_enroll.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings twofa">
+<div class="page-content user settings twofa">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/web_src/less/_admin.less b/web_src/less/_admin.less
index 09e3ef7b7..a3f223e0f 100644
--- a/web_src/less/_admin.less
+++ b/web_src/less/_admin.less
@@ -1,8 +1,4 @@
 .admin {
-  &.notice {
-    padding-top: 15px;
-  }
-
   .table.segment {
     padding: 0;
     font-size: 13px;
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index d2dd9dcb3..cb91fa118 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -238,6 +238,16 @@ a.muted:hover,
   color: var(--color-text-light-2);
 }
 
+.page-content {
+  margin-top: 15px;
+}
+
+.page-content .header-wrapper,
+.page-content .new-menu {
+  margin-top: -15px !important;
+  padding-top: 15px !important;
+}
+
 .ui.input.focus > input,
 .ui.input > input:focus {
   border-color: var(--color-primary);
@@ -515,6 +525,10 @@ a.muted:hover,
   height: auto;
 }
 
+.ui.loading.segment::before {
+  background: none;
+}
+
 .ui.loading.loading.input > i.icon svg {
   visibility: hidden;
 }
@@ -1101,7 +1115,6 @@ footer {
 }
 
 .ui.menu.new-menu {
-  padding-top: 15px;
   margin-bottom: 15px;
   background: var(--color-navbar);
   border-bottom: 1px solid var(--color-secondary) !important;
diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less
index 923026fcd..d340f2855 100644
--- a/web_src/less/_dashboard.less
+++ b/web_src/less/_dashboard.less
@@ -71,7 +71,6 @@
     width: 100vw;
     padding-left: .5rem;
     padding-right: .5rem;
-    padding-top: 15px;
     .org-visibility .label {
       margin-left: 5px;
     }
diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less
index 90853d246..5962d411e 100644
--- a/web_src/less/_explore.less
+++ b/web_src/less/_explore.less
@@ -1,7 +1,6 @@
 .explore {
   .navbar {
     justify-content: center;
-    padding-top: 15px !important;
     margin-bottom: 15px !important;
     background-color: var(--color-navbar) !important;
     border-width: 1px !important;
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 55cc4f78b..a830e14c1 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -143,7 +143,6 @@
 
   .header-wrapper {
     background-color: var(--color-navbar);
-    padding-top: 15px;
 
     .ui.tabs.divider {
       border-bottom: 0;