Skip to content

Commit 51383ec

Browse files
zeripathwxiaoguang
zeripath
and
wxiaoguang
authored
Move helpers to be prefixed with gt- (go-gitea#22879)
As discussed in go-gitea#22847 the helpers in helpers.less need to have a separate prefix as they are causing conflicts with fomantic styles This will allow us to have the `.gt-hidden { display:none !important; }` style that is needed to for the reverted PR. Of note in doing this I have noticed that there was already a conflict with at least one chroma style which this PR now avoids. I've also added in the `gt-hidden` style that matches the tailwind one and switched the code that needed it to use that. Signed-off-by: Andrew Thornton <[email protected]> --------- Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent 00b18ab commit 51383ec

File tree

137 files changed

+922
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+922
-921
lines changed

‎models/avatars/avatar.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
const (
2323
// DefaultAvatarClass is the default class of a rendered avatar
24-
DefaultAvatarClass = "ui avatar vm"
24+
DefaultAvatarClass = "ui avatar gt-vm"
2525
// DefaultAvatarPixelSize is the default size in pixels of a rendered avatar
2626
DefaultAvatarPixelSize = 28
2727
)

‎routers/web/repo/blame.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m
262262

263263
var avatar string
264264
if commit.User != nil {
265-
avatar = string(templates.Avatar(commit.User, 18, "mr-3"))
265+
avatar = string(templates.Avatar(commit.User, 18, "gt-mr-3"))
266266
} else {
267-
avatar = string(templates.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "mr-3"))
267+
avatar = string(templates.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "gt-mr-3"))
268268
}
269269

270270
br.Avatar = gotemplate.HTML(avatar)

‎routers/web/repo/issue_content_history.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func GetContentHistoryList(ctx *context.Context) {
7171
}
7272

7373
src := html.EscapeString(item.UserAvatarLink)
74-
class := avatars.DefaultAvatarClass + " mr-3"
74+
class := avatars.DefaultAvatarClass + " gt-mr-3"
7575
name := html.EscapeString(username)
7676
avatarHTML := string(templates.AvatarHTML(src, 28, class, username))
7777
timeSinceText := string(timeutil.TimeSinceUnix(item.EditedUnix, ctx.Locale))

‎templates/admin/process-row.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="item">
2-
<div class="df ac">
3-
<div class="icon ml-3 mr-3">{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}</div>
4-
<div class="content f1">
2+
<div class="gt-df gt-ac">
3+
<div class="icon gt-ml-3 gt-mr-3">{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}</div>
4+
<div class="content gt-f1">
55
<div class="header">{{.Process.Description}}</div>
66
<div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span></div>
77
</div>

‎templates/admin/repo/unadopted.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<input type="hidden" name="page" value="{{$.CurrentPage}}">
4646
<div class="actions">
4747
<div class="ui red basic inverted cancel button">
48-
{{svg "octicon-trash" 16 "mr-2"}}
48+
{{svg "octicon-trash" 16 "gt-mr-2"}}
4949
{{$.locale.Tr "modal.no"}}
5050
</div>
5151
<button class="ui green basic inverted ok button">
52-
{{svg "octicon-check" 16 "mr-2"}}
52+
{{svg "octicon-check" 16 "gt-mr-2"}}
5353
{{$.locale.Tr "modal.yes"}}
5454
</button>
5555
</div>
@@ -72,11 +72,11 @@
7272
<input type="hidden" name="page" value="{{$.CurrentPage}}">
7373
<div class="actions">
7474
<div class="ui red basic inverted cancel button">
75-
{{svg "octicon-trash" 16 "mr-2"}}
75+
{{svg "octicon-trash" 16 "gt-mr-2"}}
7676
{{$.locale.Tr "modal.no"}}
7777
</div>
7878
<button class="ui green basic inverted ok button">
79-
{{svg "octicon-check" 16 "mr-2"}}
79+
{{svg "octicon-check" 16 "gt-mr-2"}}
8080
{{$.locale.Tr "modal.yes"}}
8181
</button>
8282
</div>

‎templates/admin/stacktrace-row.tmpl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="item">
2-
<div class="df ac">
3-
<div class="icon ml-3 mr-3">
2+
<div class="gt-df gt-ac">
3+
<div class="icon gt-ml-3 gt-mr-3">
44
{{if eq .Process.Type "request"}}
55
{{svg "octicon-globe" 16}}
66
{{else if eq .Process.Type "system"}}
@@ -11,7 +11,7 @@
1111
{{svg "octicon-code" 16}}
1212
{{end}}
1313
</div>
14-
<div class="content f1">
14+
<div class="content gt-f1">
1515
<div class="header">{{.Process.Description}}</div>
1616
<div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span>{{end}}</div>
1717
</div>
@@ -22,14 +22,14 @@
2222
</div>
2323
</div>
2424
{{if .Process.Stacks}}
25-
<div class="divided list ml-3">
25+
<div class="divided list gt-ml-3">
2626
{{range .Process.Stacks}}
2727
<div class="item">
2828
<details>
2929
<summary>
30-
<div class="dif content">
31-
<div class="header ml-3">
32-
<span class="icon mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
30+
<div class="gt-dif content">
31+
<div class="header gt-ml-3">
32+
<span class="icon gt-mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
3333
</div>
3434
<div class="description">
3535
{{range .Labels}}
@@ -40,9 +40,9 @@
4040
</summary>
4141
<div class="list">
4242
{{range .Entry}}
43-
<div class="item df ac">
44-
<span class="icon mr-4">{{svg "octicon-dot-fill" 16}}</span>
45-
<div class="content f1">
43+
<div class="item gt-df gt-ac">
44+
<span class="icon gt-mr-4">{{svg "octicon-dot-fill" 16}}</span>
45+
<div class="content gt-f1">
4646
<div class="header"><code>{{.Function}}</code></div>
4747
<div class="description"><code>{{.File}}:{{.Line}}</code></div>
4848
</div>

‎templates/base/head_navbar.tmpl‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
{{if .IsSigned}}
44
{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
55
{{end}}
6-
<div class="item brand sb">
6+
<div class="item brand gt-sb">
77
<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
88
<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
99
</a>
10-
<div class="df ac">
10+
<div class="gt-df gt-ac">
1111
{{if .IsSigned}}
12-
<a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only mr-4 mt-3" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
12+
<a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only gt-mr-4 gt-mt-3" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
1313
<span class="fitted item">
1414
{{svg "octicon-bell"}}
15-
<span class="notification_count{{if not $notificationUnreadCount}} hidden{{end}}">
15+
<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">
1616
{{$notificationUnreadCount}}
1717
</span>
1818
</span>
@@ -49,7 +49,7 @@
4949
<div class="item">
5050
<div class="ui icon input">
5151
<input class="searchbox" type="text" placeholder="{{.locale.Tr "search_project"}}">
52-
<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
52+
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
5353
</div>
5454
</div>
5555
*/}}
@@ -80,19 +80,19 @@
8080
{{else if .IsSigned}}
8181
<div class="right stackable menu">
8282
{{if EnableTimetracking}}
83-
<a class="active-stopwatch-trigger item ui mx-0{{if not .ActiveStopwatch}} hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
84-
<span class="fitted relative">
83+
<a class="active-stopwatch-trigger item ui gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
84+
<span class="fitted gt-relative">
8585
{{svg "octicon-stopwatch"}}
8686
<span class="header-stopwatch-dot"></span>
8787
<span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span>
8888
</span>
8989
</a>
9090
<div class="active-stopwatch-popup tippy-target">
91-
<div class="df ac">
92-
<a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
93-
{{svg "octicon-issue-opened" 16 "mr-3"}}
91+
<div class="gt-df gt-ac">
92+
<a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}">
93+
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
9494
<span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
95-
<span class="ui primary label stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
95+
<span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
9696
{{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
9797
</span>
9898
</a>
@@ -118,16 +118,16 @@
118118
</div>
119119
{{end}}
120120

121-
<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile mx-0" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
121+
<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile gt-mx-0" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
122122
<span class="fitted item">
123123
{{svg "octicon-bell"}}
124-
<span class="notification_count{{if not $notificationUnreadCount}} hidden{{end}}">
124+
<span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">
125125
{{$notificationUnreadCount}}
126126
</span>
127127
</span>
128128
</a>
129129

130-
<div class="ui dropdown jump item tooltip mx-0" data-content="{{.locale.Tr "create_new"}}">
130+
<div class="ui dropdown jump item tooltip gt-mx-0" data-content="{{.locale.Tr "create_new"}}">
131131
<span class="text">
132132
<span class="fitted">{{svg "octicon-plus"}}</span>
133133
<span class="sr-mobile-only">{{.locale.Tr "create_new"}}</span>
@@ -150,7 +150,7 @@
150150
</div><!-- end content create new menu -->
151151
</div><!-- end dropdown menu create new -->
152152

153-
<div class="ui dropdown jump item tooltip mx-0" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
153+
<div class="ui dropdown jump item tooltip gt-mx-0" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
154154
<span class="text">
155155
{{avatar .SignedUser 24 "tiny"}}
156156
<span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>

‎templates/base/paginate.tmpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
<div class="center page buttons">
55
<div class="ui borderless pagination menu">
66
<a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$.Link}}{{if $paginationLink}}?{{$paginationLink}}{{end}}"{{end}}>
7-
{{svg "gitea-double-chevron-left" 16 "mr-2"}}
7+
{{svg "gitea-double-chevron-left" 16 "gt-mr-2"}}
88
<span class="navigation_label">{{$.locale.Tr "admin.first_page"}}</span>
99
</a>
1010
<a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
11-
{{svg "octicon-chevron-left" 16 "mr-2"}}
11+
{{svg "octicon-chevron-left" 16 "gt-mr-2"}}
1212
<span class="navigation_label">{{$.locale.Tr "repo.issues.previous"}}</span>
1313
</a>
1414
{{range .Pages}}
1515
{{if eq .Num -1}}
1616
<a class="disabled item">...</a>
1717
{{else}}
18-
<a class="{{if .IsCurrent}}active {{end}}item content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>
18+
<a class="{{if .IsCurrent}}active {{end}}item gt-content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a>
1919
{{end}}
2020
{{end}}
2121
<a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
2222
<span class="navigation_label">{{$.locale.Tr "repo.issues.next"}}</span>
23-
{{svg "octicon-chevron-right" 16 "ml-2"}}
23+
{{svg "octicon-chevron-right" 16 "gt-ml-2"}}
2424
</a>
2525
<a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$.Link}}?page={{.TotalPages}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
2626
<span class="navigation_label">{{$.locale.Tr "admin.last_page"}}</span>
27-
{{svg "gitea-double-chevron-right" 16 "ml-2"}}
27+
{{svg "gitea-double-chevron-right" 16 "gt-ml-2"}}
2828
</a>
2929
</div>
3030
</div>

‎templates/code/searchresults.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<div class="df ac fw">
1+
<div class="gt-df gt-ac gt-fw">
22
{{range $term := .SearchResultLanguages}}
3-
<a class="ui text-label df ac mr-1 my-1 {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}{{if $.ContextUser}}/{{$.ContextUser.Name}}/-/code{{else}}/explore/code{{end}}?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}{{if ne $.queryType ""}}&t={{$.queryType}}{{end}}">
4-
<i class="color-icon mr-3" style="background-color: {{$term.Color}}"></i>
3+
<a class="ui text-label gt-df gt-ac gt-mr-1 gt-my-1 {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}{{if $.ContextUser}}/{{$.ContextUser.Name}}/-/code{{else}}/explore/code{{end}}?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}{{if ne $.queryType ""}}&t={{$.queryType}}{{end}}">
4+
<i class="color-icon gt-mr-3" style="background-color: {{$term.Color}}"></i>
55
{{$term.Language}}
66
<div class="detail">{{$term.Count}}</div>
77
</a>

‎templates/explore/repo_list.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<div class="ui repository list">
22
{{range .Repos}}
33
<div class="item">
4-
<div class="ui header df ac">
4+
<div class="ui header gt-df gt-ac">
55
<div class="repo-title">
6-
{{$avatar := (repoAvatar . 32 "mr-3")}}
6+
{{$avatar := (repoAvatar . 32 "gt-mr-3")}}
77
{{if $avatar}}
88
{{$avatar}}
99
{{end}}
1010
<a class="name" href="{{.Link}}">
1111
{{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
1212
</a>
13-
<div class="labels df ac fw">
13+
<div class="labels gt-df gt-ac gt-fw">
1414
{{if .IsArchived}}
1515
<span class="ui basic label">{{$.locale.Tr "repo.desc.archived"}}</span>
1616
{{end}}
@@ -32,22 +32,22 @@
3232
{{end}}
3333
{{end}}
3434
{{if .IsFork}}
35-
<span class="tooltip df" data-content="{{$.locale.Tr "repo.fork"}}" data-position="bottom center">{{svg "octicon-repo-forked"}}</span>
35+
<span class="tooltip gt-df" data-content="{{$.locale.Tr "repo.fork"}}" data-position="bottom center">{{svg "octicon-repo-forked"}}</span>
3636
{{else if .IsMirror}}
37-
<span class="tooltip df" data-content="{{$.locale.Tr "mirror"}}" data-position="bottom center">{{svg "octicon-mirror"}}</span>
37+
<span class="tooltip gt-df" data-content="{{$.locale.Tr "mirror"}}" data-position="bottom center">{{svg "octicon-mirror"}}</span>
3838
{{end}}
3939
</div>
4040
</div>
41-
<div class="metas df ac text grey">
41+
<div class="metas gt-df gt-ac text grey">
4242
{{if .PrimaryLanguage}}
4343
<a class="muted" href="{{$.Link}}?q={{$.Keyword}}&sort={{$.SortType}}&language={{.PrimaryLanguage.Language}}">
44-
<span class="df ac mr-3"><i class="color-icon mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span>
44+
<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span>
4545
</a>
4646
{{end}}
4747
{{if not $.DisableStars}}
48-
<span class="text grey df ac mr-3">{{svg "octicon-star" 16 "mr-3"}}{{.NumStars}}</span>
48+
<span class="text grey gt-df gt-ac gt-mr-3">{{svg "octicon-star" 16 "gt-mr-3"}}{{.NumStars}}</span>
4949
{{end}}
50-
<span class="text grey df ac mr-3">{{svg "octicon-git-branch" 16 "mr-3"}}{{.NumForks}}</span>
50+
<span class="text grey gt-df gt-ac gt-mr-3">{{svg "octicon-git-branch" 16 "gt-mr-3"}}{{.NumForks}}</span>
5151
</div>
5252
</div>
5353
<div class="description">

0 commit comments

Comments
 (0)