diff options
author | zeripath <art27@cantab.net> | 2023-02-13 17:59:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-13 17:59:59 +0000 |
commit | 51383ec0841ec2562e5c4a9dadd4fef82974dd5c (patch) | |
tree | ca77ae07a74536297ded91b51e6a1eb6d55047d9 /templates/base | |
parent | 00b18ab42fdd49a437249f57c0b9086fd0ee1d03 (diff) | |
download | gitea-51383ec0841ec2562e5c4a9dadd4fef82974dd5c.tar.gz gitea-51383ec0841ec2562e5c4a9dadd4fef82974dd5c.zip |
Move helpers to be prefixed with `gt-` (#22879)
As discussed in #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 <art27@cantab.net>
---------
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'templates/base')
-rw-r--r-- | templates/base/head_navbar.tmpl | 30 | ||||
-rw-r--r-- | templates/base/paginate.tmpl | 10 |
2 files changed, 20 insertions, 20 deletions
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1c995e73e7..dafc64cad7 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -3,16 +3,16 @@ {{if .IsSigned}} {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} {{end}} - <div class="item brand sb"> + <div class="item brand gt-sb"> <a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}"> <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true"> </a> - <div class="df ac"> + <div class="gt-df gt-ac"> {{if .IsSigned}} - <a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only mr-4 mt-3" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> + <a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only gt-mr-4 gt-mt-3" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> <span class="fitted item"> {{svg "octicon-bell"}} - <span class="notification_count{{if not $notificationUnreadCount}} hidden{{end}}"> + <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}"> {{$notificationUnreadCount}} </span> </span> @@ -49,7 +49,7 @@ <div class="item"> <div class="ui icon input"> <input class="searchbox" type="text" placeholder="{{.locale.Tr "search_project"}}"> - <i class="icon df ac jc">{{svg "octicon-search" 16}}</i> + <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> </div> </div> */}} @@ -80,19 +80,19 @@ {{else if .IsSigned}} <div class="right stackable menu"> {{if EnableTimetracking}} - <a class="active-stopwatch-trigger item ui mx-0{{if not .ActiveStopwatch}} hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}"> - <span class="fitted relative"> + <a class="active-stopwatch-trigger item ui gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}"> + <span class="fitted gt-relative"> {{svg "octicon-stopwatch"}} <span class="header-stopwatch-dot"></span> <span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span> </span> </a> <div class="active-stopwatch-popup tippy-target"> - <div class="df ac"> - <a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}"> - {{svg "octicon-issue-opened" 16 "mr-3"}} + <div class="gt-df gt-ac"> + <a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}"> + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} <span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span> - <span class="ui primary label stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}"> + <span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}"> {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}} </span> </a> @@ -118,16 +118,16 @@ </div> {{end}} - <a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile mx-0" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> + <a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile gt-mx-0" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> <span class="fitted item"> {{svg "octicon-bell"}} - <span class="notification_count{{if not $notificationUnreadCount}} hidden{{end}}"> + <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}"> {{$notificationUnreadCount}} </span> </span> </a> - <div class="ui dropdown jump item tooltip mx-0" data-content="{{.locale.Tr "create_new"}}"> + <div class="ui dropdown jump item tooltip gt-mx-0" data-content="{{.locale.Tr "create_new"}}"> <span class="text"> <span class="fitted">{{svg "octicon-plus"}}</span> <span class="sr-mobile-only">{{.locale.Tr "create_new"}}</span> @@ -150,7 +150,7 @@ </div><!-- end content create new menu --> </div><!-- end dropdown menu create new --> - <div class="ui dropdown jump item tooltip mx-0" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}"> + <div class="ui dropdown jump item tooltip gt-mx-0" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}"> <span class="text"> {{avatar .SignedUser 24 "tiny"}} <span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span> diff --git a/templates/base/paginate.tmpl b/templates/base/paginate.tmpl index 421e96a00a..9dd1549ea1 100644 --- a/templates/base/paginate.tmpl +++ b/templates/base/paginate.tmpl @@ -4,27 +4,27 @@ <div class="center page buttons"> <div class="ui borderless pagination menu"> <a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$.Link}}{{if $paginationLink}}?{{$paginationLink}}{{end}}"{{end}}> - {{svg "gitea-double-chevron-left" 16 "mr-2"}} + {{svg "gitea-double-chevron-left" 16 "gt-mr-2"}} <span class="navigation_label">{{$.locale.Tr "admin.first_page"}}</span> </a> <a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}> - {{svg "octicon-chevron-left" 16 "mr-2"}} + {{svg "octicon-chevron-left" 16 "gt-mr-2"}} <span class="navigation_label">{{$.locale.Tr "repo.issues.previous"}}</span> </a> {{range .Pages}} {{if eq .Num -1}} <a class="disabled item">...</a> {{else}} - <a class="{{if .IsCurrent}}active {{end}}item content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a> + <a class="{{if .IsCurrent}}active {{end}}item gt-content-center" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>{{.Num}}</a> {{end}} {{end}} <a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}> <span class="navigation_label">{{$.locale.Tr "repo.issues.next"}}</span> - {{svg "octicon-chevron-right" 16 "ml-2"}} + {{svg "octicon-chevron-right" 16 "gt-ml-2"}} </a> <a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$.Link}}?page={{.TotalPages}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}> <span class="navigation_label">{{$.locale.Tr "admin.last_page"}}</span> - {{svg "gitea-double-chevron-right" 16 "ml-2"}} + {{svg "gitea-double-chevron-right" 16 "gt-ml-2"}} </a> </div> </div> |