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/user/notification | |
| 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/user/notification')
| -rw-r--r-- | templates/user/notification/notification_div.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/notification/notification_subscriptions.tmpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 0ea001ff3d..8dae8baa28 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -5,7 +5,7 @@ {{$notificationUnreadCount := call .NotificationUnreadCount}} <a href="{{AppSubUrl}}/notifications?q=unread" class="{{if eq .Status 1}}active {{end}}item"> {{.locale.Tr "notification.unread"}} - <div class="ui label {{if not $notificationUnreadCount}}hidden{{end}}">{{$notificationUnreadCount}}</div> + <div class="ui label {{if not $notificationUnreadCount}}gt-hidden{{end}}">{{$notificationUnreadCount}}</div> </a> <a href="{{AppSubUrl}}/notifications?q=read" class="{{if eq .Status 2}}active {{end}}item"> {{.locale.Tr "notification.read"}} diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 2083902c5a..5aff7ef9d6 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -18,11 +18,11 @@ {{.locale.Tr "all"}} </a> <a class="{{if eq .State "open"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=open&issueType={{$.IssueType}}&labels={{$.Labels}}"> - {{svg "octicon-issue-opened" 16 "mr-3"}} + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "repo.issues.open_title"}} </a> <a class="{{if eq .State "closed"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=closed&issueType={{$.IssueType}}&labels={{$.Labels}}"> - {{svg "octicon-issue-closed" 16 "mr-3"}} + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{.locale.Tr "repo.issues.closed_title"}} </a> </div> |