github/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-04-28 19:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix button alignments (#34276)

Browse Source 
Continue with #34206.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Kerwin Bryant 2025-04-28 03:39:03 +08:00 committed by GitHub
parent 0376c09fc2
commit 533b8b2d3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/repo/branch_dropdown.tmpl
View File

@ -47,16 +47,20 @@ Search "repo/branch_dropdown" in the template directory to find all occurrences.
> >
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}} {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
<div class="ui dropdown custom branch-selector-dropdown ellipsis-text-items"> <div class="ui dropdown custom branch-selector-dropdown ellipsis-text-items">
<div class="ui button branch-dropdown-button"> <div class="ui compact button branch-dropdown-button">
<span class="flex-text-block gt-ellipsis"> <span class="flex-text-block gt-ellipsis">
{{if not .DropdownFixedText}} {{if .DropdownFixedText}}
{{if .ShowTabTags}} {{.DropdownFixedText}}
{{else}}
{{if eq .CurrentRefType "tag"}}
{{svg "octicon-tag"}} {{svg "octicon-tag"}}
{{else if .ShowTabBranches}} {{else if eq .CurrentRefType "branch"}}
{{svg "octicon-git-branch"}} {{svg "octicon-git-branch"}}
{{else}}
{{svg "octicon-git-commit"}}
{{end}} {{end}}
<strong class="tw-inline-block gt-ellipsis">{{.CurrentRefShortName}}</strong>
{{end}} {{end}}
<strong class="tw-ml-2 tw-inline-block gt-ellipsis">{{Iif .DropdownFixedText .SelectedRefShortName}}</strong>
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
</div> </div>

2
templates/repo/wiki/revision.tmpl
View File

@ -14,7 +14,7 @@
</div> </div>
</div> </div>
</div> </div>
<div> <div class="flex-text-block">
{{template "repo/clone_panel" .}} {{template "repo/clone_panel" .}}
</div> </div>
</div> </div>

1
web_src/css/base.css
View File

@ -1150,6 +1150,7 @@ table th[data-sortt-desc] .svg {
min-width: 0; min-width: 0;
} }
.ui.dropdown > .ui.button,
.flex-text-block > .ui.button, .flex-text-block > .ui.button,
.flex-text-inline > .ui.button { .flex-text-inline > .ui.button {
margin: 0; /* fomantic buttons have default margin, when we use them in a flex container with gap, we do not need these margins */ margin: 0; /* fomantic buttons have default margin, when we use them in a flex container with gap, we do not need these margins */

3
web_src/js/components/RepoBranchTagSelector.vue
View File

@ -222,7 +222,8 @@ export default defineComponent({
<template v-if="dropdownFixedText">{{ dropdownFixedText }}</template> <template v-if="dropdownFixedText">{{ dropdownFixedText }}</template>
<template v-else> <template v-else>
<svg-icon v-if="currentRefType === 'tag'" name="octicon-tag"/> <svg-icon v-if="currentRefType === 'tag'" name="octicon-tag"/>
<svg-icon v-else name="octicon-git-branch"/> <svg-icon v-else-if="currentRefType === 'branch'" name="octicon-git-branch"/>
<svg-icon v-else name="octicon-git-commit"/>
<strong ref="dropdownRefName" class="tw-inline-block gt-ellipsis">{{ currentRefShortName }}</strong> <strong ref="dropdownRefName" class="tw-inline-block gt-ellipsis">{{ currentRefShortName }}</strong>
</template> </template>
</span> </span>

2
web_src/js/components/RepoContributors.vue
View File

@ -354,7 +354,7 @@ export default defineComponent({
<div> <div>
<!-- Contribution type --> <!-- Contribution type -->
<div class="ui floating dropdown jump" id="repo-contributors"> <div class="ui floating dropdown jump" id="repo-contributors">
<div class="ui basic compact button tw-mr-0"> <div class="ui basic compact button">
<span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong> <span class="not-mobile">{{ locale.filterLabel }}</span> <strong>{{ locale.contributionType[type] }}</strong>
<svg-icon name="octicon-triangle-down" :size="14"/> <svg-icon name="octicon-triangle-down" :size="14"/>
</div> </div>