Skip to content

Commit 2c9a036

Browse files
silverwindsilverwind
committed
Fix all rounded borders, re-style tab menus
1 parent fd63b96 commit 2c9a036

File tree

18 files changed

+46
-38
lines changed

18 files changed

+46
-38
lines changed

‎routers/web/repo/editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ func DiffPreviewPost(ctx *context.Context) {
420420
}
421421

422422
if diff.NumFiles == 0 {
423-
ctx.PlainText(http.StatusOK, ctx.Locale.TrString("repo.editor.no_changes_to_show"))
423+
ctx.PlainText(http.StatusOK, `<div class="tw-p-6">` + ctx.Locale.TrString("repo.editor.no_changes_to_show") + `</div>`)
424424
return
425425
}
426426
ctx.Data["File"] = diff.Files[0]

‎templates/admin/emails/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</div>
2424
</div>
2525
</div>
26-
<div class="ui attached table segment">
26+
<div class="ui attached table segment tw-rounded-b">
2727
<table class="ui very basic striped table unstackable">
2828
<thead>
2929
<tr>

‎templates/org/team/members.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="ui ten wide column">
99
{{template "org/team/navbar" .}}
1010
{{if .IsOrganizationOwner}}
11-
<div class="ui attached segment">
11+
<div class="ui top attached segment">
1212
<form class="ui form ignore-dirty tw-flex tw-flex-wrap tw-gap-2" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
1313
{{.CsrfTokenHtml}}
1414
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
@@ -21,7 +21,7 @@
2121
</form>
2222
</div>
2323
{{end}}
24-
<div class="ui attached segment">
24+
<div class="ui{{if not .IsOrganizationOwner}} top{{end}} attached segment">
2525
<div class="flex-list">
2626
{{range .Team.Members}}
2727
<div class="flex-item tw-items-center">

‎templates/org/team/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui top attached tabular menu org-team-navbar">
1+
<div class="ui compact small menu small-menu-items org-team-navbar">
22
<a class="item{{if .PageIsOrgTeamMembers}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}">{{svg "octicon-person"}} <strong>{{.Team.NumMembers}}</strong>&nbsp; {{ctx.Locale.Tr "org.lower_members"}}</a>
33
<a class="item{{if .PageIsOrgTeamRepos}} active{{end}}" href="{{.OrgLink}}/teams/{{.Team.LowerName | PathEscape}}/repositories">{{svg "octicon-repo"}} <strong>{{.Team.NumRepos}}</strong>&nbsp; {{ctx.Locale.Tr "org.lower_repositories"}}</a>
44
</div>

‎templates/org/team/repositories.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
</div>
2727
{{end}}
28-
<div class="ui attached segment">
28+
<div class="ui{{if not $canAddRemove}} top{{end}} attached segment">
2929
<div class="flex-list">
3030
{{range .Team.Repos}}
3131
<div class="flex-item tw-items-center">

‎templates/repo/editor/edit.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@
2626
</div>
2727
</div>
2828
<div class="field">
29-
<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
29+
<div class="ui compact small menu small-menu-items repo-editor-menu" data-write="write" data-preview="preview" data-diff="diff">
3030
<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
3131
<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
3232
{{if not .IsNewFile}}
3333
<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
3434
{{end}}
3535
</div>
36-
<div class="ui bottom attached active tab segment" data-tab="write">
36+
<div class="ui active tab segment tw-rounded" data-tab="write">
3737
<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
3838
data-url="{{.Repository.Link}}/markup"
3939
data-context="{{.RepoLink}}"
4040
data-previewable-extensions="{{.PreviewableExtensions}}"
4141
data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
4242
<div class="editor-loading is-loading"></div>
4343
</div>
44-
<div class="ui bottom attached tab segment markup" data-tab="preview">
44+
<div class="ui tab segment markup tw-rounded" data-tab="preview">
4545
{{ctx.Locale.Tr "loading"}}
4646
</div>
47-
<div class="ui bottom attached tab segment diff edit-diff" data-tab="diff">
47+
<div class="ui tab segment diff edit-diff tw-text-center" data-tab="diff">
4848
<div class="tw-p-16"></div>
4949
</div>
5050
</div>

‎templates/repo/issue/labels/label_load_template.tmpl

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
<div class="ui centered grid">
22
<div class="twelve wide computer column">
3-
<div class="ui attached left aligned segment">
4-
<p>{{ctx.Locale.Tr "repo.issues.label_templates.info"}}</p>
5-
<br>
6-
<form class="ui form center" action="{{.Link}}/initialize" method="post">
7-
{{.CsrfTokenHtml}}
8-
<div class="field">
9-
<div class="ui selection dropdown">
10-
<input type="hidden" name="template_name" value="Default">
11-
<div class="default text">{{ctx.Locale.Tr "repo.issues.label_templates.helper"}}</div>
12-
<div class="menu">
13-
{{range .LabelTemplateFiles}}
14-
<div class="item" data-value="{{.DisplayName}}">{{.DisplayName}}<br><i>({{.Description}})</i></div>
15-
{{end}}
16-
</div>
17-
{{svg "octicon-triangle-down" 18 "dropdown icon"}}
3+
<p>{{ctx.Locale.Tr "repo.issues.label_templates.info"}}</p>
4+
<form class="ui form center" action="{{.Link}}/initialize" method="post">
5+
{{.CsrfTokenHtml}}
6+
<div class="field">
7+
<div class="ui selection dropdown">
8+
<input type="hidden" name="template_name" value="Default">
9+
<div class="default text">{{ctx.Locale.Tr "repo.issues.label_templates.helper"}}</div>
10+
<div class="menu">
11+
{{range .LabelTemplateFiles}}
12+
<div class="item" data-value="{{.DisplayName}}">{{.DisplayName}}<br><i>({{.Description}})</i></div>
13+
{{end}}
1814
</div>
15+
{{svg "octicon-triangle-down" 18 "dropdown icon"}}
1916
</div>
20-
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "repo.issues.label_templates.use"}}</button>
21-
</form>
22-
</div>
17+
</div>
18+
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "repo.issues.label_templates.use"}}</button>
19+
</form>
2320
</div>
2421
</div>

‎templates/repo/migrate/migrate.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{template "repo/migrate/helper" .}}
66
<div class="ui cards migrate-entries">
77
{{range .Services}}
8-
<a class="ui card migrate-entry tw-flex tw-items-center" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">
8+
<a class="ui card migrate-entry tw-flex tw-items-center tw-rounded" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">
99
{{if eq .Name "github"}}
1010
{{svg "octicon-mark-github" 184 "tw-p-4"}}
1111
{{else if eq .Name "gitlab"}}

‎templates/repo/settings/webhook/base_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
</div>
99
</h4>
10-
<div class="ui attached segment">
10+
<div class="ui attached segment tw-rounded-b">
1111
<div class="ui list">
1212
<div class="item">
1313
{{.Description}}

‎templates/shared/secrets/add_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</button>
1111
</div>
1212
</h4>
13-
<div class="ui attached segment">
13+
<div class="ui attached segment tw-rounded-b">
1414
{{if .Secrets}}
1515
<div class="flex-list">
1616
{{range .Secrets}}

‎templates/shared/user/blocked_users.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<h4 class="ui top attached header">
3131
{{ctx.Locale.Tr "user.block.list"}}
3232
</h4>
33-
<div class="ui attached segment">
33+
<div class="ui attached segment tw-rounded">
3434
<div class="flex-list">
3535
{{range .UserBlocks}}
3636
<div class="flex-item">

‎templates/shared/user/profile_big_avatar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div id="profile-avatar-card" class="ui card">
1+
<div id="profile-avatar-card" class="ui card tw-rounded">
22
<div id="profile-avatar" class="content tw-flex">
33
{{if eq .SignedUserID .ContextUser.ID}}
44
<a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}">

‎templates/shared/variables/variable_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</button>
1313
</div>
1414
</h4>
15-
<div class="ui attached segment">
15+
<div class="ui attached segment tw-rounded-b">
1616
{{if .Variables}}
1717
<div class="flex-list">
1818
{{range .Variables}}

‎templates/user/notification/notification_subscriptions.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{{template "base/head" .}}
22
<div role="main" aria-label="{{.Title}}" class="page-content user notification">
33
<div class="ui container">
4-
<div class="ui top attached tabular menu">
4+
<div class="ui compact small menu small-menu-items">
55
<a href="{{AppSubUrl}}/notifications/subscriptions" class="{{if eq .Status 1}}active {{end}}item">
66
{{ctx.Locale.Tr "notification.subscriptions"}}
77
</a>
88
<a href="{{AppSubUrl}}/notifications/watching" class="{{if eq .Status 2}}active {{end}}item">
99
{{ctx.Locale.Tr "notification.watching"}}
1010
</a>
1111
</div>
12-
<div class="ui bottom attached active tab segment">
12+
<div class="ui top attached active tab segment">
1313
{{if eq .Status 1}}
1414
<div class="tw-flex tw-justify-between">
1515
<div class="tw-flex">

‎web_src/css/features/codeeditor.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
background-color: transparent !important;
2222
}
2323

24+
.monaco-editor,
25+
.monaco-editor .overflow-guard {
26+
border-radius: var(--border-radius);
27+
}
28+
2429
/* these seem unthemeable */
2530
.monaco-scrollable-element > .scrollbar > .slider {
2631
background: var(--color-primary) !important;

‎web_src/css/modules/segment.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@
152152
}
153153

154154
.ui.attached.segment:has(+ .ui[class*="top attached"].header),
155-
.ui.attached.segment:last-child {
155+
.ui.attached.segment:last-child,
156+
.ui.segment:has(+ .ui.segment:not(.attached)) {
156157
border-radius: 0 0 0.28571429rem 0.28571429rem;
157158
}
158159

@@ -166,6 +167,10 @@
166167
.ui.segment[class*="top attached"]:first-child {
167168
margin-top: 0;
168169
}
170+
.ui[class*="top attached"].segment:last-child {
171+
border-top-left-radius: 0.28571429rem;
172+
border-top-right-radius: 0.28571429rem;
173+
}
169174

170175
.ui.segment[class*="bottom attached"] {
171176
bottom: 0;

‎web_src/js/features/codeeditor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ export async function createMonaco(textarea, filename, editorOpts) {
9898
'input.foreground': getColor('--color-input-text'),
9999
'scrollbar.shadow': getColor('--color-shadow'),
100100
'progressBar.background': getColor('--color-primary'),
101+
'focusBorder': '#0000', // prevent blue border
101102
},
102103
});
103104

‎web_src/js/features/repo-editor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {attachRefIssueContextPopup} from './contextpopup.js';
77
import {POST} from '../modules/fetch.js';
88

99
function initEditPreviewTab($form) {
10-
const $tabMenu = $form.find('.tabular.menu');
10+
const $tabMenu = $form.find('.repo-editor-menu');
1111
$tabMenu.find('.item').tab();
1212
const $previewTab = $tabMenu.find(`.item[data-tab="${$tabMenu.data('preview')}"]`);
1313
if ($previewTab.length) {

0 commit comments

Comments
 (0)