domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Move helpers to be prefixed with gt- (#22879)

Browse source 
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>
This commit is contained in:
zeripath 2023-02-13 17:59:59 +00:00 • committed by GitHub
parent 00b18ab42f
commit 51383ec084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
137 changed files with 901 additions and 900 deletions
Download patch file Download diff file Expand all files Collapse all files

22
templates/user/settings/applications.tmpl
View file

@ -15,7 +15,7 @@
<div class="item">
<div class="right floated content">
<button class="ui red tiny button delete-button" data-modal-id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
{{svg "octicon-trash" 16 "mr-2"}}
{{svg "octicon-trash" 16 "gt-mr-2"}}
{{$.locale.Tr "settings.delete_token"}}
</button>
</div>
@ -42,16 +42,16 @@
<input id="name" name="name" value="{{.name}}" autofocus required>
</div>
<details class="ui optional field">
<summary class="p-2">
<summary class="gt-p-2">
{{.locale.Tr "settings.select_scopes"}}
</summary>
<div class="field pl-2">
<div class="field gt-pl-2">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="repo">
<label>repo</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="repo:status">
@ -71,7 +71,7 @@
<label>admin:org</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="write:org">
@ -91,7 +91,7 @@
<label>admin:public_key</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="write:public_key">
@ -111,7 +111,7 @@
<label>admin:repo_hook</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="write:repo_hook">
@ -143,7 +143,7 @@
<label>user</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="read:user">
@ -175,7 +175,7 @@
<label>package</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="write:package">
@ -201,7 +201,7 @@
<label>admin:gpg_key</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="write:gpg_key">
@ -221,7 +221,7 @@
<label>admin:application</label>
</div>
</div>
<div class="field pl-4">
<div class="field gt-pl-4">
<div class="field">
<div class="ui checkbox">
<input class="enable-system" type="checkbox" name="scope" value="write:application">

4
templates/user/settings/applications_oauth2_list.tmpl
View file

@ -7,12 +7,12 @@
<div class="item">
<div class="right floated content">
<a href="{{$.Link}}/oauth2/{{$app.ID}}" class="ui primary tiny button">
{{svg "octicon-pencil" 16 "mr-2"}}
{{svg "octicon-pencil" 16 "gt-mr-2"}}
{{$.locale.Tr "settings.oauth2_application_edit"}}
</a>
<button class="ui red tiny button delete-button" data-modal-id="remove-gitea-oauth2-application"
data-url="{{$.Link}}/oauth2/{{$app.ID}}/delete">
{{svg "octicon-trash" 16 "mr-2"}}
{{svg "octicon-trash" 16 "gt-mr-2"}}
{{$.locale.Tr "settings.delete_key"}}
</button>
</div>

2
templates/user/settings/grants_oauth2.tmpl
View file

@ -30,7 +30,7 @@
<div class="ui small basic delete modal" id="revoke-gitea-oauth2-grant">
<div class="ui icon header">
{{svg "octicon-shield" 16 "mr-2"}}
{{svg "octicon-shield" 16 "gt-mr-2"}}
{{.locale.Tr "settings.revoke_oauth2_grant"}}
</div>
<div class="content">

4
templates/user/settings/keys_gpg.tmpl
View file

@ -5,7 +5,7 @@
</div>
</h4>
<div class="ui attached segment">
<div class="{{if not .HasGPGError}}hide{{end}} mb-4" id="add-gpg-key-panel">
<div class="{{if not .HasGPGError}}hide{{end}} gt-mb-4" id="add-gpg-key-panel">
<form class="ui form{{if .HasGPGError}} error{{end}}" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<input type="hidden" name="title" value="none">
@ -39,7 +39,7 @@
</button>
</form>
</div>
<div class="ui key list mt-0">
<div class="ui key list gt-mt-0">
<div class="item">
{{.locale.Tr "settings.gpg_desc"}}
</div>

4
templates/user/settings/keys_ssh.tmpl
View file

@ -11,7 +11,7 @@
</div>
</h4>
<div class="ui attached segment">
<div class="{{if not .HasSSHError}}hide{{end}} mb-4" id="add-ssh-key-panel">
<div class="{{if not .HasSSHError}}hide{{end}} gt-mb-4" id="add-ssh-key-panel">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="field {{if .Err_Title}}error{{end}}">
@ -31,7 +31,7 @@
</button>
</form>
</div>
<div class="ui key list mt-0">
<div class="ui key list gt-mt-0">
<div class="item">
{{.locale.Tr "settings.ssh_desc"}}
</div>

10
templates/user/settings/repos.tmpl
View file

@ -109,15 +109,15 @@
<div class="item">
<div class="content">
{{if .IsPrivate}}
{{svg "octicon-lock" 16 "mr-2 iconFloat text gold"}}
{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
{{else if .IsFork}}
{{svg "octicon-repo-forked" 16 "mr-2 iconFloat"}}
{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
{{else if .IsMirror}}
{{svg "octicon-mirror" 16 "mr-2 iconFloat"}}
{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
{{else if .IsTemplate}}
{{svg "octicon-repo-template" 16 "mr-2 iconFloat"}}
{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
{{else}}
{{svg "octicon-repo" 16 "mr-2 iconFloat"}}
{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
{{end}}
<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
<span>{{FileSize .Size}}</span>