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/admin | |
| 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/admin')
| -rw-r--r-- | templates/admin/process-row.tmpl | 6 | ||||
| -rw-r--r-- | templates/admin/repo/unadopted.tmpl | 8 | ||||
| -rw-r--r-- | templates/admin/stacktrace-row.tmpl | 20 |
3 files changed, 17 insertions, 17 deletions
diff --git a/templates/admin/process-row.tmpl b/templates/admin/process-row.tmpl index 4ab190af46..477bf5a41e 100644 --- a/templates/admin/process-row.tmpl +++ b/templates/admin/process-row.tmpl @@ -1,7 +1,7 @@ <div class="item"> - <div class="df ac"> - <div class="icon ml-3 mr-3">{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}</div> - <div class="content f1"> + <div class="gt-df gt-ac"> + <div class="icon gt-ml-3 gt-mr-3">{{if eq .Process.Type "request"}}{{svg "octicon-globe" 16}}{{else if eq .Process.Type "system"}}{{svg "octicon-cpu" 16}}{{else}}{{svg "octicon-terminal" 16}}{{end}}</div> + <div class="content gt-f1"> <div class="header">{{.Process.Description}}</div> <div class="description"><span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span></div> </div> diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index ca0b4c3bb9..2629056d1d 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -45,11 +45,11 @@ <input type="hidden" name="page" value="{{$.CurrentPage}}"> <div class="actions"> <div class="ui red basic inverted cancel button"> - {{svg "octicon-trash" 16 "mr-2"}} + {{svg "octicon-trash" 16 "gt-mr-2"}} {{$.locale.Tr "modal.no"}} </div> <button class="ui green basic inverted ok button"> - {{svg "octicon-check" 16 "mr-2"}} + {{svg "octicon-check" 16 "gt-mr-2"}} {{$.locale.Tr "modal.yes"}} </button> </div> @@ -72,11 +72,11 @@ <input type="hidden" name="page" value="{{$.CurrentPage}}"> <div class="actions"> <div class="ui red basic inverted cancel button"> - {{svg "octicon-trash" 16 "mr-2"}} + {{svg "octicon-trash" 16 "gt-mr-2"}} {{$.locale.Tr "modal.no"}} </div> <button class="ui green basic inverted ok button"> - {{svg "octicon-check" 16 "mr-2"}} + {{svg "octicon-check" 16 "gt-mr-2"}} {{$.locale.Tr "modal.yes"}} </button> </div> diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index a8ae486bcb..e6d2e68cbb 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -1,6 +1,6 @@ <div class="item"> - <div class="df ac"> - <div class="icon ml-3 mr-3"> + <div class="gt-df gt-ac"> + <div class="icon gt-ml-3 gt-mr-3"> {{if eq .Process.Type "request"}} {{svg "octicon-globe" 16}} {{else if eq .Process.Type "system"}} @@ -11,7 +11,7 @@ {{svg "octicon-code" 16}} {{end}} </div> - <div class="content f1"> + <div class="content gt-f1"> <div class="header">{{.Process.Description}}</div> <div class="description">{{if ne .Process.Type "none"}}<span title="{{DateFmtLong .Process.Start}}">{{TimeSince .Process.Start .root.locale}}</span>{{end}}</div> </div> @@ -22,14 +22,14 @@ </div> </div> {{if .Process.Stacks}} - <div class="divided list ml-3"> + <div class="divided list gt-ml-3"> {{range .Process.Stacks}} <div class="item"> <details> <summary> - <div class="dif content"> - <div class="header ml-3"> - <span class="icon mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}} + <div class="gt-dif content"> + <div class="header gt-ml-3"> + <span class="icon gt-mr-3">{{svg "octicon-code" 16}}</span>{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}} </div> <div class="description"> {{range .Labels}} @@ -40,9 +40,9 @@ </summary> <div class="list"> {{range .Entry}} - <div class="item df ac"> - <span class="icon mr-4">{{svg "octicon-dot-fill" 16}}</span> - <div class="content f1"> + <div class="item gt-df gt-ac"> + <span class="icon gt-mr-4">{{svg "octicon-dot-fill" 16}}</span> + <div class="content gt-f1"> <div class="header"><code>{{.Function}}</code></div> <div class="description"><code>{{.File}}:{{.Line}}</code></div> </div> |