Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove incorrect CSS helper classes #26712

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Remove incorrect CSS helper classes #26712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b699500
fix
wxiaoguang Aug 24, 2023
dc2028c
Merge branch 'main' into fix-css-helper
wxiaoguang Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/repo/diff/conversation.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{{template "repo/diff/comments" dict "root" $ "comments" .comments}}
</ui>
</div>
<div class="gt-df gt-je gt-js-small gt-ac gt-fw gt-mt-3">
<div class="gt-df gt-je gt-ac gt-fw gt-mt-3">
<div class="ui buttons gt-mr-2">
<button class="ui icon tiny basic button previous-conversation">
{{svg "octicon-arrow-up" 12 "icon"}} {{$.locale.Tr "repo.issues.previous"}}
Expand Down
10 changes: 5 additions & 5 deletions templates/user/auth/captcha.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
<div id="captcha" data-captcha-type="h-captcha" class="h-captcha-style" data-sitekey="{{.HcaptchaSitekey}}"></div>
</div>
{{else if eq .CaptchaType "mcaptcha"}}
<div class="inline field gt-df gt-ac gt-db-small captcha-field">
<span>{{.locale.Tr "captcha"}}</span>
<div class="gt-border-secondary gt-w-100-small" id="mcaptcha__widget-container" style="width: 50%; height: 5em"></div>
<div id="captcha" data-captcha-type="m-captcha" class="m-captcha" data-sitekey="{{.McaptchaSitekey}}" data-instance-url="{{.McaptchaURL}}"></div>
<div class="inline field">
<label></label>
<div class="m-captcha-style" id="mcaptcha__widget-container"></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="m-captcha-style" id="mcaptcha__widget-container"></div>
<div class="m-captcha-container" id="mcaptcha__widget-container"></div>

Better than naming something -style

Copy link
Contributor Author

@wxiaoguang wxiaoguang Aug 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not like this naming either, but there were already others (-style), I do not think it's necessary to break the naming rule here:

image

image

<div id="captcha" data-captcha-type="m-captcha" data-sitekey="{{.McaptchaSitekey}}" data-instance-url="{{.McaptchaURL}}"></div>
</div>
{{else if eq .CaptchaType "cfturnstile"}}
<div class="inline field captcha-field gt-text-center">
<div class="inline field gt-text-center">
<div id="captcha" data-captcha-type="cf-turnstile" data-sitekey="{{.CfTurnstileSitekey}}"></div>
</div>
{{end}}{{end}}
26 changes: 13 additions & 13 deletions web_src/css/form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ textarea:focus,
#create-page-form form .header {
padding-left: 280px !important;
}
#create-page-form form .inline.field > label,
#create-page-form form .inline.field.captcha-field > span {
#create-page-form form .inline.field > label {
text-align: right;
width: 250px !important;
word-wrap: break-word;
Expand All @@ -206,6 +205,13 @@ textarea:focus,
}
}

.m-captcha-style {
width: 100%;
height: 5em;
vertical-align: middle;
display: inline-block;
}

@media (min-width: 768px) {
.g-recaptcha-style,
.h-captcha-style {
Expand All @@ -219,6 +225,9 @@ textarea:focus,
width: 302px !important;
height: 76px !important;
}
.m-captcha-style {
width: 50%;
}
}

@media (max-height: 575px) {
Expand Down Expand Up @@ -271,13 +280,7 @@ textarea:focus,
.user.reset.password form .inline.field > label,
.user.link-account form .inline.field > label,
.user.signin form .inline.field > label,
.user.signup form .inline.field > label,
.user.activate form .inline.field.captcha-field > span,
.user.forgot.password form .inline.field.captcha-field > span,
.user.reset.password form .inline.field.captcha-field > span,
.user.link-account form .inline.field.captcha-field > span,
.user.signin form .inline.field.captcha-field > span,
.user.signup form .inline.field.captcha-field > span {
.user.signup form .inline.field > label {
text-align: right;
width: 250px !important;
word-wrap: break-word;
Expand Down Expand Up @@ -421,10 +424,7 @@ textarea:focus,
}
.repository.new.repo form .inline.field > label,
.repository.new.migrate form .inline.field > label,
.repository.new.fork form .inline.field > label,
.repository.new.repo form .inline.field.captcha-field > span,
.repository.new.migrate form .inline.field.captcha-field > span,
.repository.new.fork form .inline.field.captcha-field > span {
.repository.new.fork form .inline.field > label {
text-align: right;
width: 250px !important;
word-wrap: break-word;
Expand Down
6 changes: 0 additions & 6 deletions web_src/css/helpers.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,6 @@ Gitea's private styles use `g-` prefix.
.gt-font-17 { font-size: 17px !important }
.gt-font-18 { font-size: 18px !important }

@media (max-width: 767.98px) {
.gt-db-small { display: block !important; }
.gt-w-100-small { width: 100% !important; }
.gt-js-small { justify-content: flex-start !important; }
}

/*
gt-hidden must be placed after all other "display: xxx !important" classes to win the chance
do not use:
Expand Down
6 changes: 2 additions & 4 deletions web_src/css/org.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#create-page-form form .header {
padding-left: 280px !important;
}
#create-page-form form .inline.field > label,
#create-page-form form .inline.field.captcha-field > span {
#create-page-form form .inline.field > label {
text-align: right;
width: 250px !important;
word-wrap: break-word;
Expand Down Expand Up @@ -59,8 +58,7 @@
.organization.new.org form .header {
padding-left: 280px !important;
}
.organization.new.org form .inline.field > label,
.organization.new.org form .inline.field.captcha-field > span {
.organization.new.org form .inline.field > label {
text-align: right;
width: 250px !important;
word-wrap: break-word;
Expand Down