diff options
| author | silverwind <me@silverwind.io> | 2024-03-23 00:54:09 +0100 |
|---|---|---|
| committer | Gusted <postmaster@gusted.xyz> | 2024-03-28 16:43:09 +0100 |
| commit | 1ee494a045f496eec71ed200fc1c7368be91dc4d (patch) | |
| tree | 5556a825b10befcf10b8fc2f592f6ab02e14ffa7 /templates/repo/header.tmpl | |
| parent | [PORT] gitea#29831: Prevent layout shift in `<overflow-menu>` items (diff) | |
| download | forgejo-1ee494a045f496eec71ed200fc1c7368be91dc4d.tar.xz forgejo-1ee494a045f496eec71ed200fc1c7368be91dc4d.zip | |
[Port] gitea#29982 Introduce `.secondary-nav` and handle `.page-content` spacing universally
Fixes: https://github.com/go-gitea/gitea/issues/29981. Introduce
`.secondary-nav` as a universal way for styling and margin adjustments
inside `.page-content`.
If the first child of `.page-content` is `.secondary-nav`, we add margin
below it, otherwise we add padding to the first child. Notable changes:
- `--color-header-wrapper` is replaced with `--color-secondary-nav-bg`.
- `navbar` class is removed.
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
Conflict resolution: Trivial conflict & changed selector to reflect new
classes.
Ref: https://codeberg.org/forgejo/forgejo/issues/2776
(cherry picked from commit 3ccda41a539b8ba7841919ee12dc2877ddc03818)
Diffstat (limited to 'templates/repo/header.tmpl')
| -rw-r--r-- | templates/repo/header.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 6f2bf42297..f10efa1e3d 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -1,4 +1,4 @@ -<div class="header-wrapper"> +<div class="secondary-nav"> {{with .Repository}} <div class="ui container"> <div class="repo-header"> @@ -81,7 +81,7 @@ {{if .IsGenerated}}<div class="fork-flag">{{ctx.Locale.Tr "repo.generated_from"}} <a href="{{(.TemplateRepo ctx).Link}}">{{(.TemplateRepo ctx).FullName}}</a></div>{{end}} </div> {{end}} - <overflow-menu class="ui container secondary pointing tabular top attached borderless menu navbar tw-pt-0 tw-my-0"> + <overflow-menu class="ui container secondary pointing tabular top attached borderless menu tw-pt-0 tw-my-0"> {{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}} <div class="overflow-menu-items"> {{if .Permission.CanRead $.UnitTypeCode}} |