fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-18 23:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify "text-align" CSS helpers, fix clone button padding (#25763) (#25764)

Browse source 
Backport  #25763

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
wxiaoguang 2023-07-10 06:19:24 +08:00 committed by GitHub
parent 372b622c2b
commit 012b804a9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/repo/clone_buttons.tmpl
View file

@ -9,7 +9,7 @@
SSH SSH
</button> </button>
{{end}} {{end}}
<input id="repo-clone-url" size="20" class="js-clone-url gt-br-0" value="{{$.CloneButtonOriginLink.HTTPS}}" readonly> <input id="repo-clone-url" size="20" class="js-clone-url" value="{{$.CloneButtonOriginLink.HTTPS}}" readonly>
<button class="ui basic small compact icon button" id="clipboard-btn" data-tooltip-content="{{.locale.Tr "copy_url"}}" data-clipboard-target="#repo-clone-url" aria-label="{{.locale.Tr "copy_url"}}"> <button class="ui basic small compact icon button" id="clipboard-btn" data-tooltip-content="{{.locale.Tr "copy_url"}}" data-clipboard-target="#repo-clone-url" aria-label="{{.locale.Tr "copy_url"}}">
{{svg "octicon-copy" 14}} {{svg "octicon-copy" 14}}
</button> </button>

2
templates/repo/commit_page.tmpl
View file

@ -189,7 +189,7 @@
</div> </div>
</div> </div>
{{if .Commit.Signature}} {{if .Commit.Signature}}
<div class="ui bottom attached message gt-tl gt-df gt-ac gt-sb commit-header-row gt-fw {{$class}}"> <div class="ui bottom attached message gt-text-left gt-df gt-ac gt-sb commit-header-row gt-fw {{$class}}">
<div class="gt-df gt-ac"> <div class="gt-df gt-ac">
{{if .Verification.Verified}} {{if .Verification.Verified}}
{{if ne .Verification.SigningUser.ID 0}} {{if ne .Verification.SigningUser.ID 0}}

2
templates/repo/header.tmpl
View file

@ -121,7 +121,7 @@
<div class="header"> <div class="header">
{{$.locale.Tr "repo.already_forked" .Name}} {{$.locale.Tr "repo.already_forked" .Name}}
</div> </div>
<div class="content gt-tl"> <div class="content gt-text-left">
<div class="ui list"> <div class="ui list">
{{range $.UserAndOrgForks}} {{range $.UserAndOrgForks}}
<div class="ui item gt-py-3"> <div class="ui item gt-py-3">

4
templates/repo/migrate/migrate.tmpl
View file

@ -16,10 +16,10 @@
{{svg (printf "gitea-%s" .Name) 184}} {{svg (printf "gitea-%s" .Name) 184}}
{{end}} {{end}}
<div class="content"> <div class="content">
<div class="header gt-tc"> <div class="header gt-text-center">
{{.Title}} {{.Title}}
</div> </div>
<div class="description gt-tc"> <div class="description gt-text-center">
{{(printf "repo.migrate.%s.description" .Name) | $.locale.Tr}} {{(printf "repo.migrate.%s.description" .Name) | $.locale.Tr}}
</div> </div>
</div> </div>

4
templates/repo/unicode_escape_prompt.tmpl
View file

@ -1,6 +1,6 @@
{{if .EscapeStatus}} {{if .EscapeStatus}}
{{if .EscapeStatus.HasInvisible}} {{if .EscapeStatus.HasInvisible}}
<div class="ui error message unicode-escape-prompt gt-tl"> <div class="ui error message unicode-escape-prompt gt-text-left">
<button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button> <button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button>
<div class="header"> <div class="header">
{{$.root.locale.Tr "repo.invisible_runes_header"}} {{$.root.locale.Tr "repo.invisible_runes_header"}}
@ -11,7 +11,7 @@
{{end}} {{end}}
</div> </div>
{{else if .EscapeStatus.HasAmbiguous}} {{else if .EscapeStatus.HasAmbiguous}}
<div class="ui warning message unicode-escape-prompt gt-tl"> <div class="ui warning message unicode-escape-prompt gt-text-left">
<button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button> <button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button>
<div class="header"> <div class="header">
{{$.root.locale.Tr "repo.ambiguous_runes_header"}} {{$.root.locale.Tr "repo.ambiguous_runes_header"}}

2
templates/user/auth/captcha.tmpl
View file

@ -22,7 +22,7 @@
<div id="captcha" data-captcha-type="m-captcha" class="m-captcha" data-sitekey="{{.McaptchaSitekey}}" data-instance-url="{{.McaptchaURL}}"></div> <div id="captcha" data-captcha-type="m-captcha" class="m-captcha" data-sitekey="{{.McaptchaSitekey}}" data-instance-url="{{.McaptchaURL}}"></div>
</div> </div>
{{else if eq .CaptchaType "cfturnstile"}} {{else if eq .CaptchaType "cfturnstile"}}
<div class="inline field captcha-field gt-tc"> <div class="inline field captcha-field gt-text-center">
<div id="captcha" data-captcha-type="cf-turnstile" data-sitekey="{{.CfTurnstileSitekey}}"></div> <div id="captcha" data-captcha-type="cf-turnstile" data-sitekey="{{.CfTurnstileSitekey}}"></div>
</div> </div>
{{end}}{{end}} {{end}}{{end}}

8
web_src/css/helpers.css
View file

@ -8,9 +8,6 @@ Gitea's private styles use `g-` prefix.
.gt-dif { display: inline-flex !important; } .gt-dif { display: inline-flex !important; }
.gt-dib { display: inline-block !important; } .gt-dib { display: inline-block !important; }
.gt-ac { align-items: center !important; } .gt-ac { align-items: center !important; }
.gt-ab { align-items: baseline !important; }
.gt-tc { text-align: center !important; }
.gt-tl { text-align: left !important; }
.gt-jc { justify-content: center !important; } .gt-jc { justify-content: center !important; }
.gt-js { justify-content: flex-start !important; } .gt-js { justify-content: flex-start !important; }
.gt-je { justify-content: flex-end !important; } .gt-je { justify-content: flex-end !important; }
@ -21,7 +18,6 @@ Gitea's private styles use `g-` prefix.
.gt-vm { vertical-align: middle !important; } .gt-vm { vertical-align: middle !important; }
.gt-w-100 { width: 100% !important; } .gt-w-100 { width: 100% !important; }
.gt-h-100 { height: 100% !important; } .gt-h-100 { height: 100% !important; }
.gt-br-0 { border-radius: 0 !important; }
.gt-mono { .gt-mono {
font-family: var(--fonts-monospace) !important; font-family: var(--fonts-monospace) !important;
@ -88,6 +84,10 @@ Gitea's private styles use `g-` prefix.
.gt-float-right { float: right !important; } .gt-float-right { float: right !important; }
.gt-clear-both { clear: both !important; } .gt-clear-both { clear: both !important; }
.gt-text-center { text-align: center !important; }
.gt-text-left { text-align: left !important; }
.gt-text-right { text-align: right !important; }
.gt-font-light { font-weight: var(--font-weight-light) !important; } .gt-font-light { font-weight: var(--font-weight-light) !important; }
.gt-font-normal { font-weight: var(--font-weight-normal) !important; } .gt-font-normal { font-weight: var(--font-weight-normal) !important; }
.gt-font-medium { font-weight: var(--font-weight-medium) !important; } .gt-font-medium { font-weight: var(--font-weight-medium) !important; }

3
web_src/css/repo.css
View file

@ -194,6 +194,7 @@
.repository #clone-panel #repo-clone-url { .repository #clone-panel #repo-clone-url {
width: 320px; width: 320px;
border-radius: 0;
} }
@media (min-width: 768px) and (max-width: 991.98px) { @media (min-width: 768px) and (max-width: 991.98px) {
@ -2662,7 +2663,7 @@
height: 30px; height: 30px;
} }
.repo-button-row .button.dropdown { .repo-button-row .button.dropdown:not(.icon) {
padding-right: 22px !important; /* normal buttons have !important paddings, so we need to override it for dropdown (Add File) icons */ padding-right: 22px !important; /* normal buttons have !important paddings, so we need to override it for dropdown (Add File) icons */
} }

2
web_src/js/features/common-global.js
View file

@ -143,7 +143,7 @@ export function initGlobalDropzone() {
// Create a "Copy Link" element, to conveniently copy the image // Create a "Copy Link" element, to conveniently copy the image
// or file link as Markdown to the clipboard // or file link as Markdown to the clipboard
const copyLinkElement = document.createElement('div'); const copyLinkElement = document.createElement('div');
copyLinkElement.className = 'gt-tc'; copyLinkElement.className = 'gt-text-center';
// The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone // The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone
copyLinkElement.innerHTML = `<a href="#" style="cursor: pointer;">${svg('octicon-copy', 14, 'copy link')} Copy link</a>`; copyLinkElement.innerHTML = `<a href="#" style="cursor: pointer;">${svg('octicon-copy', 14, 'copy link')} Copy link</a>`;
copyLinkElement.addEventListener('click', (e) => { copyLinkElement.addEventListener('click', (e) => {

2
web_src/js/features/repo-issue-content.js
View file

@ -23,7 +23,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
</div> </div>
</div> </div>
</div> </div>
<div class="comment-diff-data gt-tl gt-p-3 is-loading"></div> <div class="comment-diff-data gt-text-left gt-p-3 is-loading"></div>
</div>`); </div>`);
$dialog.appendTo($('body')); $dialog.appendTo($('body'));
$dialog.find('.dialog-header-options').dropdown({ $dialog.find('.dialog-header-options').dropdown({