forked from NYANDEV/forgejo
Backport #24251 Fix #24249 Diff with ignoring spaces: https://github.com/go-gitea/gitea/pull/24269/files?diff=split&w=1 Manually tested ![image](https://user-images.githubusercontent.com/2114189/233766806-18eb18ad-0c4d-44f7-b0fc-b40466c64445.png) Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
parent
5ccb626cda
commit
da4448421e
3 changed files with 59 additions and 69 deletions
|
@ -1,5 +1,4 @@
|
||||||
<footer role="group" aria-label="{{.locale.Tr "aria.footer"}}">
|
<footer role="group" aria-label="{{.locale.Tr "aria.footer"}}">
|
||||||
<div class="ui container">
|
|
||||||
<div class="ui left" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
|
<div class="ui left" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
|
||||||
<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
|
<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
|
||||||
{{if (or .ShowFooterVersion .PageIsAdmin)}}
|
{{if (or .ShowFooterVersion .PageIsAdmin)}}
|
||||||
|
@ -32,5 +31,4 @@
|
||||||
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
|
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
|
||||||
{{template "custom/extra_links_footer" .}}
|
{{template "custom/extra_links_footer" .}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</footer>
|
</footer>
|
||||||
|
|
|
@ -1821,46 +1821,6 @@ img.ui.avatar,
|
||||||
color: var(--color-warning-text);
|
color: var(--color-warning-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
|
||||||
background-color: var(--color-footer);
|
|
||||||
border-top: 1px solid var(--color-secondary);
|
|
||||||
width: 100%;
|
|
||||||
flex-basis: 40px;
|
|
||||||
color: var(--color-text-light);
|
|
||||||
}
|
|
||||||
|
|
||||||
footer .container {
|
|
||||||
padding: 0 0.5rem;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer .container .links > * {
|
|
||||||
border-left: 1px solid var(--color-secondary-dark-1);
|
|
||||||
padding-left: 8px;
|
|
||||||
margin-left: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer .container .links > *:first-child {
|
|
||||||
border-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer .ui.language .menu {
|
|
||||||
max-height: 500px;
|
|
||||||
overflow-y: auto;
|
|
||||||
margin-bottom: 7px;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer .ui.language .svg {
|
|
||||||
margin-right: 0.15em;
|
|
||||||
vertical-align: top;
|
|
||||||
margin-top: calc(2em - 16px);
|
|
||||||
}
|
|
||||||
|
|
||||||
footer .ui.left,
|
|
||||||
footer .ui.right {
|
|
||||||
line-height: 39px; /* there is a border-top on the footer, so make the line-height 1px less */
|
|
||||||
}
|
|
||||||
|
|
||||||
.center:not(.popup) {
|
.center:not(.popup) {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,9 +43,41 @@
|
||||||
color: var(--color-green);
|
color: var(--color-green);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
footer {
|
||||||
|
background-color: var(--color-footer);
|
||||||
|
border-top: 1px solid var(--color-secondary);
|
||||||
|
line-height: 39px;
|
||||||
|
flex-basis: 40px;
|
||||||
|
color: var(--color-text-light);
|
||||||
|
padding: 0 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
footer .right.links {
|
||||||
|
min-width: 180px; /* make sure the menu dropdown doesn't overflow horizontally when language name is short */
|
||||||
|
}
|
||||||
|
|
||||||
|
footer .right.links > * {
|
||||||
|
border-left: 1px solid var(--color-secondary-dark-1);
|
||||||
|
padding-left: 8px;
|
||||||
|
margin-left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
footer .right.links > *:first-child {
|
||||||
|
border-left: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
footer .ui.dropdown.language .menu {
|
||||||
|
height: 500px;
|
||||||
|
max-height: calc(100vh - 60px);
|
||||||
|
overflow-y: auto;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@media (max-width: 880px) {
|
@media (max-width: 880px) {
|
||||||
footer .ui.container .left,
|
footer .ui.left,
|
||||||
footer .ui.container .right {
|
footer .ui.right {
|
||||||
|
width: 100%;
|
||||||
display: block;
|
display: block;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
float: none;
|
float: none;
|
||||||
|
|
Loading…
Reference in a new issue