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/repo/wiki | |
| 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/repo/wiki')
| -rw-r--r-- | templates/repo/wiki/pages.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/wiki/revision.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/wiki/view.tmpl | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index ea5b9709c4..9d3a3e8061 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository wiki pages"> {{template "repo/header" .}} <div class="ui container"> - <h2 class="ui header df ac sb"> + <h2 class="ui header gt-df gt-ac gt-sb"> <div> {{.locale.Tr "repo.wiki.pages"}} </div> diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index c5256ab534..4e66be2f34 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -4,7 +4,7 @@ {{$title := .title}} <div class="ui container"> <div class="ui stackable grid"> - <div class="ui eight wide column text right df ac je"> + <div class="ui eight wide column text right gt-df gt-ac gt-je"> <div class="ui action small input" id="clone-panel"> {{template "repo/clone_buttons" .}} {{template "repo/clone_script" .}} @@ -13,7 +13,7 @@ <div class="ui header eight wide column"> <a class="file-revisions-btn ui basic button" title="{{.locale.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}" ><span>{{.revision}}</span> {{svg "octicon-home"}}</a> {{$title}} - <div class="ui sub header word-break"> + <div class="ui sub header gt-word-break"> {{$timeSince := TimeSince .Author.When $.locale}} {{.locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}} </div> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index b5e65dffcf..e56c66fa4a 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -3,8 +3,8 @@ {{template "repo/header" .}} {{$title := .title}} <div class="ui container"> - <div class="repo-button-row df ac sb fw"> - <div class="df ac"> + <div class="repo-button-row gt-df gt-ac gt-sb gt-fw"> + <div class="gt-df gt-ac"> <div class="choose page"> <div class="ui floating filter dropdown" data-no-results="{{.locale.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> @@ -16,7 +16,7 @@ </div> <div class="menu"> <div class="ui icon search input"> - <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i> + <i class="icon gt-df gt-ac gt-jc gt-m-0">{{svg "octicon-filter" 16}}</i> <input name="search" placeholder="{{.locale.Tr "repo.wiki.filter_page"}}..."> </div> <div class="scrolling menu"> @@ -28,7 +28,7 @@ </div> </div> </div> - <div class="df ac"> + <div class="gt-df gt-ac"> <div class="ui action small input" id="clone-panel"> {{template "repo/clone_buttons" .}} {{template "repo/clone_script" .}} |