Skip to content

Commit df33d98

Browse files
silverwindsilverwind
committed
Introduce .secondary-nav and handle margin universally
Fixes: #29981
1 parent f8ab9da commit df33d98

18 files changed

+38
-46
lines changed

‎templates/admin/layout_head.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{template "base/head" .ctxData}}
22
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
3-
<div class="ui container gt-mb-4">
3+
<div class="ui container">
44
{{template "base/alert" .ctxData}}
55
</div>
66
<div class="ui container fluid padded flex-container">

‎templates/explore/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar">
1+
<overflow-menu class="ui secondary pointing tabular top attached borderless menu secondary-nav">
22
<div class="overflow-menu-items tw-justify-center">
33
<a class="{{if .PageIsExploreRepositories}}active {{end}}item" href="{{AppSubUrl}}/explore/repos">
44
{{svg "octicon-repo"}} {{ctx.Locale.Tr "explore.repos"}}

‎templates/repo/header.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="header-wrapper">
1+
<div class="secondary-nav">
22
{{with .Repository}}
33
<div class="ui container">
44
<div class="repo-header">
@@ -128,7 +128,7 @@
128128
{{if .IsGenerated}}<div class="fork-flag">{{ctx.Locale.Tr "repo.generated_from"}} <a href="{{(.TemplateRepo ctx).Link}}">{{(.TemplateRepo ctx).FullName}}</a></div>{{end}}
129129
</div>
130130
{{end}}
131-
<overflow-menu class="ui container secondary pointing tabular top attached borderless menu navbar tw-pt-0 tw-my-0">
131+
<overflow-menu class="ui container secondary pointing tabular top attached borderless menu tw-pt-0 tw-my-0">
132132
{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
133133
<div class="overflow-menu-items">
134134
{{if .Permission.CanRead $.UnitTypeCode}}

‎templates/user/auth/link_account.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{template "base/head" .}}
22
<div role="main" aria-label="{{.Title}}" class="page-content user link-account">
3-
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar tw-bg-header-wrapper">
3+
<overflow-menu class="ui secondary pointing tabular top attached borderless menu secondary-nav">
44
<div class="overflow-menu-items tw-justify-center">
55
<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
66
{{if not .AllowOnlyInternalRegistration}}

‎templates/user/auth/signin_navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if or .EnableOpenIDSignIn .EnableSSPI}}
2-
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar tw-bg-header-wrapper">
2+
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar secondary-nav">
33
<div class="overflow-menu-items tw-justify-center">
44
<a class="{{if .PageIsLogin}}active {{end}}item" rel="nofollow" href="{{AppSubUrl}}/user/login">
55
{{ctx.Locale.Tr "auth.login_userpass"}}

‎templates/user/auth/signup_openid_navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar tw-bg-header-wrapper">
1+
<overflow-menu class="ui secondary pointing tabular top attached borderless menu secondary-nav">
22
<div class="overflow-menu-items tw-justify-center">
33
<a class="{{if .PageIsOpenIDConnect}}active {{end}}item" href="{{AppSubUrl}}/user/openid/connect">
44
{{ctx.Locale.Tr "auth.openid_connect_title"}}

‎templates/user/dashboard/navbar.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="dashboard-navbar">
1+
<div class="secondary-nav tw-border-b tw-border-b-secondary">
22
<div class="ui secondary stackable menu">
33
<div class="item">
44
<div class="ui floating dropdown jump">
@@ -105,4 +105,3 @@
105105
{{end}}
106106
</div>
107107
</div>
108-
<div class="divider tw-mt-0"></div>

‎tests/e2e/example.test.e2e.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test('Test Register Form', async ({page}, workerInfo) => {
2323
await page.click('form button.ui.primary.button:visible');
2424
// Make sure we routed to the home page. Else login failed.
2525
await expect(page.url()).toBe(`${workerInfo.project.use.baseURL}/`);
26-
await expect(page.locator('.dashboard-navbar span>img.ui.avatar')).toBeVisible();
26+
await expect(page.locator('.secondary-nav span>img.ui.avatar')).toBeVisible();
2727
await expect(page.locator('.ui.positive.message.flash-success')).toHaveText('Account was successfully created. Welcome!');
2828

2929
save_visual(page);

‎tests/e2e/utils_e2e.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export async function save_visual(page) {
5252
fullPage: true,
5353
timeout: 20000,
5454
mask: [
55-
page.locator('.dashboard-navbar span>img.ui.avatar'),
55+
page.locator('.secondary-nav span>img.ui.avatar'),
5656
page.locator('.ui.dropdown.jump.item span>img.ui.avatar'),
5757
],
5858
});

‎web_src/css/base.css

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,10 +738,14 @@ img.ui.avatar,
738738
padding-bottom: 80px;
739739
}
740740

741-
.page-content.new:is(.repo,.migrate,.org),
742-
.page-content.profile:is(.user,.organization),
743-
.page-content.user:is(.settings,.notification) {
744-
padding-top: 15px;
741+
/* add margin below .secondary nav when it is the first child */
742+
.page-content > :first-child.secondary-nav {
743+
margin-bottom: 14px;
744+
}
745+
746+
/* this uses padding instead of margin because of negative margin on .ui.grid */
747+
.page-content > :first-child:not(.secondary-nav) {
748+
padding-top: 14px;
745749
}
746750

747751
/* overwrite semantic width of containers inside the main page content div (div with class "page-content") */
@@ -1323,7 +1327,6 @@ strong.attention-caution, svg.attention-caution {
13231327
}
13241328

13251329
overflow-menu {
1326-
margin-bottom: 15px !important;
13271330
border-bottom: 1px solid var(--color-secondary) !important;
13281331
display: flex;
13291332
}
@@ -1337,6 +1340,10 @@ overflow-menu .overflow-menu-items .item {
13371340
margin-bottom: 0 !important; /* reset fomantic's margin, because the active menu has special bottom border */
13381341
}
13391342

1343+
overflow-menu .ui.label {
1344+
margin-left: 7px !important;
1345+
}
1346+
13401347
.activity-bar-graph {
13411348
background-color: var(--color-primary);
13421349
color: var(--color-primary-contrast);

‎web_src/css/dashboard.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,14 @@
7777
margin: 0 1px; /* Accommodate for Semantic's 1px hacks on .attached elements */
7878
}
7979

80-
.dashboard .dashboard-navbar {
80+
.dashboard .secondary-nav {
8181
padding: 1px 12px; /* match .overflow-menu-items in height */
82-
background: var(--color-header-wrapper);
8382
}
8483

85-
.dashboard .dashboard-navbar .org-visibility .label {
84+
.dashboard .secondary-nav .org-visibility .label {
8685
margin-left: 5px;
8786
}
8887

89-
.dashboard .dashboard-navbar .ui.dropdown {
88+
.dashboard .secondary-nav .ui.dropdown {
9089
max-width: 100%;
9190
}

‎web_src/css/explore.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
.explore .navbar {
2-
margin-bottom: 15px !important;
3-
background-color: var(--color-header-wrapper) !important;
1+
.explore .secondary-nav {
42
border-width: 1px !important;
53
}
64

7-
.explore .navbar .svg {
5+
.explore .secondary-nav .svg {
86
width: 16px;
97
text-align: center;
108
margin-right: 5px;

‎web_src/css/modules/navbar.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,3 +136,7 @@
136136
justify-content: center;
137137
z-index: 1; /* prevent menu button background from overlaying icon */
138138
}
139+
140+
.secondary-nav {
141+
background: var(--color-secondary-nav-bg) !important; /* important because of .ui.secondary.menu */
142+
}

‎web_src/css/repo.css

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@
44
user-select: none;
55
}
66

7-
.repository .navbar {
8-
display: flex;
9-
justify-content: space-between;
10-
}
11-
12-
.repository .navbar .ui.label {
13-
margin-left: 7px;
14-
padding: 3px 5px;
15-
}
16-
177
.repository .owner.dropdown {
188
min-width: 40% !important;
199
}

‎web_src/css/repo/header.css

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
.header-wrapper .fork-flag {
1+
.repository .secondary-nav {
2+
padding-top: 12px;
3+
}
4+
5+
.repository .secondary-nav .fork-flag {
26
margin-top: 0.5rem;
37
font-size: 12px;
48
}
@@ -63,8 +67,3 @@
6367
.repo-buttons .ui.labeled.button.disabled > .button {
6468
pointer-events: none !important;
6569
}
66-
67-
.repository .header-wrapper {
68-
padding-top: 12px;
69-
background-color: var(--color-header-wrapper);
70-
}

‎web_src/css/themes/theme-gitea-dark.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
--color-input-toggle-background: #2e353b;
198198
--color-input-border: var(--color-secondary);
199199
--color-input-border-hover: var(--color-secondary-dark-1);
200-
--color-header-wrapper: #181c20;
201200
--color-light: #00001728;
202201
--color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)));
203202
--color-light-border: #e8e8ff28;
@@ -227,6 +226,7 @@
227226
--color-nav-bg: #16191c;
228227
--color-nav-hover-bg: var(--color-secondary-light-1);
229228
--color-nav-text: var(--color-text);
229+
--color-secondary-nav-bg: #181c20;
230230
--color-label-text: var(--color-text);
231231
--color-label-bg: #73828e4b;
232232
--color-label-hover-bg: #73828ea0;

‎web_src/css/themes/theme-gitea-light.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
--color-input-toggle-background: #d0d7de;
198198
--color-input-border: var(--color-secondary);
199199
--color-input-border-hover: var(--color-secondary-dark-1);
200-
--color-header-wrapper: #f9fafb;
201200
--color-light: #00001706;
202201
--color-light-mimic-enabled: rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)));
203202
--color-light-border: #0000171d;
@@ -227,6 +226,7 @@
227226
--color-nav-bg: #f6f7fa;
228227
--color-nav-hover-bg: var(--color-secondary-light-1);
229228
--color-nav-text: var(--color-text);
229+
--color-secondary-nav-bg: #f9fafb;
230230
--color-label-text: var(--color-text);
231231
--color-label-bg: #949da64b;
232232
--color-label-hover-bg: #949da6a0;

‎web_src/css/user.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@
112112
border: 1px solid var(--color-secondary);
113113
}
114114

115-
#notification_div {
116-
padding-top: 15px;
117-
}
118-
119115
#notification_table {
120116
background: var(--color-box-body);
121117
border: 1px solid var(--color-secondary);

0 commit comments

Comments
 (0)