Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace fomantic divider module with our own #25539

Merged
merged 13 commits into from
Jun 29, 2023
Merged

Replace fomantic divider module with our own #25539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
efdcf29
Replace fomantic divider module with our own
silverwind Jun 27, 2023
574587b
allow text selection
silverwind Jun 27, 2023
9a6523f
remove unnecessary line-height
silverwind Jun 27, 2023
a48e610
fix more divider icons in activity
silverwind Jun 27, 2023
7379816
use border-top for consistency
silverwind Jun 27, 2023
5a5101d
Merge branch 'main' into divider
silverwind Jun 27, 2023
4ddcc8c
Merge branch 'main' into divider
silverwind Jun 28, 2023
64653ad
move style
silverwind Jun 28, 2023
6cd4d8a
remove unnecessary height
silverwind Jun 28, 2023
86d4061
remove divider class, improve activity history headers
silverwind Jun 29, 2023
ad40cb5
Merge branch 'main' into divider
GiteaBot Jun 29, 2023
d199018
Merge branch 'main' into divider
GiteaBot Jun 29, 2023
d87f596
Merge branch 'main' into divider
GiteaBot Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions templates/admin/config.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
<dt>{{.locale.Tr "admin.config.disable_router_log"}}</dt>
<dd>{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>

<div class="ui divider"></div>
<div class="divider"></div>

<dt>{{.locale.Tr "admin.config.run_user"}}</dt>
<dd>{{.RunUser}}</dd>
<dt>{{.locale.Tr "admin.config.run_mode"}}</dt>
<dd>{{.RunMode}}</dd>

<div class="ui divider"></div>
<div class="divider"></div>

<dt>{{.locale.Tr "admin.config.git_version"}}</dt>
<dd>{{.GitVersion}}</dd>

<div class="ui divider"></div>
<div class="divider"></div>

<dt>{{.locale.Tr "admin.config.repo_root_path"}}</dt>
<dd>{{.RepoRootPath}}</dd>
Expand Down Expand Up @@ -174,7 +174,7 @@
<dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
<dt>{{.locale.Tr "admin.config.default_enable_dependencies"}}</dt>
<dd>{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt>{{.locale.Tr "admin.config.active_code_lives"}}</dt>
<dd>{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
<dt>{{.locale.Tr "admin.config.reset_password_code_lives"}}</dt>
Expand Down Expand Up @@ -230,7 +230,7 @@
{{end}}
<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt class="gt-py-2">{{.locale.Tr "admin.config.send_test_mail"}}</dt>
<dd>
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
Expand Down Expand Up @@ -296,7 +296,7 @@
<input type="checkbox" name="picture.disable_gravatar" version="{{.SystemSettings.GetVersion "picture.disable_gravatar"}}"{{if .SystemSettings.GetBool "picture.disable_gravatar"}} checked{{end}} title="{{.locale.Tr "admin.config.disable_gravatar"}}">
</div>
</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt>{{.locale.Tr "admin.config.enable_federated_avatar"}}</dt>
<dd>
<div class="ui toggle checkbox">
Expand All @@ -322,7 +322,7 @@
<dt>{{.locale.Tr "admin.config.git_gc_args"}}</dt>
<dd><code>{{.Git.GCArgs}}</code></dd>

<div class="ui divider"></div>
<div class="divider"></div>

<dt>{{.locale.Tr "admin.config.git_migrate_timeout"}}</dt>
<dd>{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}</dd>
Expand Down
8 changes: 4 additions & 4 deletions templates/admin/dashboard.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>
<dd>{{.SysStatus.NumGoroutine}}</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt>{{.locale.Tr "admin.dashboard.current_memory_usage"}}</dt>
<dd>{{.SysStatus.MemAllocated}}</dd>
<dt>{{.locale.Tr "admin.dashboard.total_memory_allocated"}}</dt>
Expand All @@ -92,7 +92,7 @@
<dd>{{.SysStatus.MemMallocs}}</dd>
<dt>{{.locale.Tr "admin.dashboard.memory_free_times"}}</dt>
<dd>{{.SysStatus.MemFrees}}</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt>{{.locale.Tr "admin.dashboard.current_heap_usage"}}</dt>
<dd>{{.SysStatus.HeapAlloc}}</dd>
<dt>{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}</dt>
Expand All @@ -105,7 +105,7 @@
<dd>{{.SysStatus.HeapReleased}}</dd>
<dt>{{.locale.Tr "admin.dashboard.heap_objects"}}</dt>
<dd>{{.SysStatus.HeapObjects}}</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt>{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt>
<dd>{{.SysStatus.StackInuse}}</dd>
<dt>{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}</dt>
Expand All @@ -124,7 +124,7 @@
<dd>{{.SysStatus.GCSys}}</dd>
<dt>{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt>
<dd>{{.SysStatus.OtherSys}}</dd>
<div class="ui divider"></div>
<div class="divider"></div>
<dt>{{.locale.Tr "admin.dashboard.next_gc_recycle"}}</dt>
<dd>{{.SysStatus.NextGC}}</dd>
<dt>{{.locale.Tr "admin.dashboard.last_gc_time"}}</dt>
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/stacktrace.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</form>
</div>

<div class="ui divider"></div>
<div class="divider"></div>

<h4 class="ui top attached header">
{{printf "%d Goroutines" .GoroutineCount}}{{/* Goroutine is non-translatable*/}}
Expand Down
8 changes: 4 additions & 4 deletions templates/admin/user/edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@
<input id="location" name="location" value="{{.User.Location}}" maxlength="50">
</div>

<div class="ui divider"></div>
<div class="divider"></div>

<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
<input id="max_repo_creation" name="max_repo_creation" type="number" min="-1" value="{{.User.MaxRepoCreation}}">
<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
</div>

<div class="ui divider"></div>
<div class="divider"></div>

<div class="inline field">
<div class="ui checkbox">
Expand Down Expand Up @@ -135,7 +135,7 @@
{{end}}

{{if .TwoFactorEnabled}}
<div class="ui divider"></div>
<div class="divider"></div>
<div class="inline field">
<div class="ui checkbox">
<label><strong>{{.locale.Tr "admin.users.reset_2fa"}}</strong></label>
Expand All @@ -144,7 +144,7 @@
</div>
{{end}}

<div class="ui divider"></div>
<div class="divider"></div>

<div class="field">
<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
Expand Down
10 changes: 5 additions & 5 deletions templates/admin/user/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
<div class="menu">
<a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a>
<div class="ui divider"></div>
<div class="divider"></div>
<label class="item"><input type="radio" name="status_filter[is_admin]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_admin"}}</label>
<label class="item"><input type="radio" name="status_filter[is_admin]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_admin"}}</label>
<div class="ui divider"></div>
<div class="divider"></div>
<label class="item"><input type="radio" name="status_filter[is_active]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_active"}}</label>
<label class="item"><input type="radio" name="status_filter[is_active]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_active"}}</label>
<div class="ui divider"></div>
<div class="divider"></div>
<label class="item"><input type="radio" name="status_filter[is_restricted]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_restricted"}}</label>
<label class="item"><input type="radio" name="status_filter[is_restricted]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_restricted"}}</label>
<div class="ui divider"></div>
<div class="divider"></div>
<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_prohibit_login"}}</label>
<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_prohibit_login"}}</label>
<div class="ui divider"></div>
<div class="divider"></div>
<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_2fa_enabled"}}</label>
<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_2fa_enabled"}}</label>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/explore/code.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{template "explore/navbar" .}}
<div class="ui container">
{{template "code/searchform" .}}
<div class="ui divider"></div>
<div class="divider"></div>
<div class="ui user list">
{{if .CodeIndexerUnavailable}}
<div class="ui error message">
Expand Down
2 changes: 1 addition & 1 deletion templates/explore/repo_search.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@
<span data-tooltip-content="{{.locale.Tr "explore.relevant_repositories_tooltip"}}">{{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?only_show_relevant=0")|Escape) | Safe}}</span>
</div>
{{end}}
<div class="ui divider"></div>
<div class="divider"></div>
2 changes: 1 addition & 1 deletion templates/explore/search.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
</div>
</div>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
2 changes: 1 addition & 1 deletion templates/install.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
</div>
</details>

<div class="ui divider"></div>
<div class="divider"></div>
<div class="inline field">
<label></label>
<button class="ui primary button">{{.locale.Tr "install.install_btn_confirm"}}</button>
Expand Down
2 changes: 1 addition & 1 deletion templates/org/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<a class="ui green button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.locale.Tr "new_migrate"}}</a>
{{end}}
</div>
<div class="ui divider"></div>
<div class="divider"></div>
{{end}}
<h4 class="ui top attached header gt-df">
<strong class="gt-f1">{{.locale.Tr "org.members"}}</strong>
Expand Down
2 changes: 1 addition & 1 deletion templates/org/settings/labels.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
</div>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
{{template "repo/issue/labels/label_new" .}}
{{template "repo/issue/labels/label_list" .}}
</div>
Expand Down
6 changes: 3 additions & 3 deletions templates/org/settings/options.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<input id="location" name="location" value="{{.Org.Location}}" maxlength="50">
</div>

<div class="ui divider"></div>
<div class="divider"></div>
<div class="field" id="visibility_box">
<label for="visibility">{{.locale.Tr "org.settings.visibility"}}</label>
<div class="field">
Expand Down Expand Up @@ -65,7 +65,7 @@
</div>

{{if .SignedUser.IsAdmin}}
<div class="ui divider"></div>
<div class="divider"></div>

<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
Expand All @@ -79,7 +79,7 @@
</div>
</form>

<div class="ui divider"></div>
<div class="divider"></div>

<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
{{.CsrfTokenHtml}}
Expand Down
2 changes: 1 addition & 1 deletion templates/org/team/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</div>
</div>
</div>
<div class="ui divider"></div>
<div class="divider"></div>

<div class="team-units required grouped field {{if eq .Team.AccessMode 3}}gt-hidden{{end}}">
<label>{{.locale.Tr "org.team_unit_desc"}}</label>
Expand Down
2 changes: 1 addition & 1 deletion templates/org/team/teams.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="text right">
<a class="ui green button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{.locale.Tr "org.create_new_team"}}</a>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
{{end}}

<div class="ui two column stackable grid">
Expand Down
4 changes: 2 additions & 2 deletions templates/package/shared/cleanup_rules/edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<input type="checkbox" name="match_full_name" {{if .CleanupRule.MatchFullName}}checked{{end}}>
</div>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
<p>{{.locale.Tr "packages.owner.settings.cleanuprules.keep.title"}}</p>
<div class="field {{if .Err_KeepCount}}error{{end}}">
<label>{{.locale.Tr "packages.owner.settings.cleanuprules.keep.count"}}:</label>
Expand All @@ -42,7 +42,7 @@
<input name="keep_pattern" type="text" value="{{.CleanupRule.KeepPattern}}">
<p>{{.locale.Tr "packages.owner.settings.cleanuprules.keep.pattern.container" | Safe}}</p>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
<p>{{.locale.Tr "packages.owner.settings.cleanuprules.remove.title"}}</p>
<div class="field {{if .Err_RemoveDays}}error{{end}}">
<label>{{.locale.Tr "packages.owner.settings.cleanuprules.remove.days"}}:</label>
Expand Down
6 changes: 3 additions & 3 deletions templates/package/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{{end}}
</div>
{{if not (eq .PackageDescriptor.Package.Type "container")}}
<div class="ui divider"></div>
<div class="divider"></div>
<strong>{{.locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})</strong>
<div class="ui relaxed list">
{{range .PackageDescriptor.Files}}
Expand All @@ -85,7 +85,7 @@
</div>
{{end}}
{{if .LatestVersions}}
<div class="ui divider"></div>
<div class="divider"></div>
<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
<div class="ui relaxed list">
Expand All @@ -98,7 +98,7 @@
</div>
{{end}}
{{if or .CanWritePackages .HasRepositoryAccess}}
<div class="ui divider"></div>
<div class="divider"></div>
<div class="ui relaxed list">
{{if .HasRepositoryAccess}}
<div class="item">{{svg "octicon-issue-opened" 16 "gt-mr-3"}} <a href="{{.PackageDescriptor.Repository.Link}}/issues">{{.locale.Tr "repo.issues"}}</a></div>
Expand Down
2 changes: 1 addition & 1 deletion templates/projects/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a>
</div>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
{{end}}

{{template "base/alert" .}}
Expand Down
2 changes: 1 addition & 1 deletion templates/projects/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</div>
</div>
<div class="ui container">
<div class="ui divider"></div>
<div class="divider"></div>
<div class="ui left">
<a class="ui cancel button" href="{{$.CancelLink}}">
{{.locale.Tr "repo.milestones.cancel"}}
Expand Down
6 changes: 3 additions & 3 deletions templates/projects/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</div>
</div>
</div>
<div class="ui divider"></div>
<div class="divider"></div>
<div class="ui two column stackable grid">
<div class="column">
<h2 class="project-title">{{$.Project.Title}}</h2>
Expand Down Expand Up @@ -69,7 +69,7 @@
</div>
{{end}}
</div>
<div class="ui divider"></div>
<div class="divider"></div>
</div>
<div class="ui container fluid padded" id="project-board">

Expand Down Expand Up @@ -175,7 +175,7 @@
</div>
{{end}}
</div>
<div class="ui divider"></div>
<div class="divider"></div>

<div class="ui cards board" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">

Expand Down
Loading