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/org | |
| 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/org')
| -rw-r--r-- | templates/org/home.tmpl | 16 | ||||
| -rw-r--r-- | templates/org/team/new.tmpl | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index b3724e7a63..6e7ea7021f 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,12 +1,12 @@ {{template "base/head" .}} <div role="main" aria-label="{{.Title}}" class="page-content organization profile"> - <div class="ui container df"> + <div class="ui container gt-df"> {{avatar .Org 140 "org-avatar"}} <div id="org-info"> <div class="ui header"> {{.Org.DisplayName}} {{if .EnableFeed}} - <a href="{{.Org.HomeLink}}.rss"><i class="ui grey icon tooltip ml-3" data-content="{{.locale.Tr "rss_feed"}}" data-position="top center">{{svg "octicon-rss" 36}}</i></a> + <a href="{{.Org.HomeLink}}.rss"><i class="ui grey icon tooltip gt-ml-3" data-content="{{.locale.Tr "rss_feed"}}" data-position="top center">{{svg "octicon-rss" 36}}</i></a> {{end}} <span class="org-visibility"> {{if .Org.Visibility.IsLimited}}<div class="ui large basic horizontal label">{{.locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} @@ -41,10 +41,10 @@ </div> <div class="ui divider"></div> {{end}} - <h4 class="ui top attached header df"> - <strong class="f1">{{.locale.Tr "org.people"}}</strong> + <h4 class="ui top attached header gt-df"> + <strong class="gt-f1">{{.locale.Tr "org.people"}}</strong> <div class="ui"> - <a class="text grey dif ac" href="{{.OrgLink}}/members"><span>{{.MembersTotal}}</span> {{svg "octicon-chevron-right"}}</a> + <a class="text grey gt-dif gt-ac" href="{{.OrgLink}}/members"><span>{{.MembersTotal}}</span> {{svg "octicon-chevron-right"}}</a> </div> </h4> <div class="ui attached segment members"> @@ -59,10 +59,10 @@ </div> {{if .IsOrganizationMember}} - <div class="ui top attached header df"> - <strong class="f1">{{.locale.Tr "org.teams"}}</strong> + <div class="ui top attached header gt-df"> + <strong class="gt-f1">{{.locale.Tr "org.teams"}}</strong> <div class="ui"> - <a class="text grey dif ac" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> + <a class="text grey gt-dif gt-ac" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a> </div> </div> <div class="ui attached table segment teams"> diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 04b5715fc0..719ca4397d 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -78,11 +78,11 @@ <tr> <th>{{.locale.Tr "units.unit"}}</th> <th class="center aligned">{{.locale.Tr "org.teams.none_access"}} - <span class="tooltip vm" data-content="{{.locale.Tr "org.teams.none_access_helper"}}">{{svg "octicon-question" 16 "ml-2"}}</span></th> + <span class="tooltip gt-vm" data-content="{{.locale.Tr "org.teams.none_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> <th class="center aligned">{{.locale.Tr "org.teams.read_access"}} - <span class="tooltip vm" data-content="{{.locale.Tr "org.teams.read_access_helper"}}">{{svg "octicon-question" 16 "ml-2"}}</span></th> + <span class="tooltip gt-vm" data-content="{{.locale.Tr "org.teams.read_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> <th class="center aligned">{{.locale.Tr "org.teams.write_access"}} - <span class="tooltip vm" data-content="{{.locale.Tr "org.teams.write_access_helper"}}">{{svg "octicon-question" 16 "ml-2"}}</span></th> + <span class="tooltip gt-vm" data-content="{{.locale.Tr "org.teams.write_access_helper"}}">{{svg "octicon-question" 16 "gt-ml-2"}}</span></th> </tr> </thead> <tbody> |