Skip to content

Fix button alignments #34276

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

Merged
merged 10 commits into from
Apr 27, 2025
+14 −8
Merged

Fix button alignments #34276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59115ba
Fix button alignments
kerwin612 Apr 24, 2025
5ebabd8
Update branch_dropdown.tmpl
kerwin612 Apr 24, 2025
ac01246
fix
kerwin612 Apr 24, 2025
a02370b
Merge branch 'main' into fix/button-alignments
kerwin612 Apr 27, 2025
f238e45
Merge branch 'main' into patch-1
kerwin612 Apr 27, 2025
14df388
fix
kerwin612 Apr 27, 2025
d29bc96
Merge branch 'main' into fix/button-alignments
wxiaoguang Apr 27, 2025
cf5db37
Merge remote-tracking branch 'kerwin612/patch-1' into fix/button-alig…
wxiaoguang Apr 27, 2025
d9e8eb0
fix branch dropdown
wxiaoguang Apr 27, 2025
844f740
Fix template lint
lunny Apr 27, 2025
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
14 changes: 9 additions & 5 deletions templates/repo/branch_dropdown.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */}}
<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">
{{if not .DropdownFixedText}}
{{if .ShowTabTags}}
{{if .DropdownFixedText}}
{{.DropdownFixedText}}
{{else}}
{{if eq .CurrentRefType "tag"}}
{{svg "octicon-tag"}}
{{else if .ShowTabBranches}}
{{else if eq .CurrentRefType "branch"}}
{{svg "octicon-git-branch"}}
{{else}}
{{svg "octicon-git-commit"}}
{{end}}
<strong class="tw-inline-block gt-ellipsis">{{.CurrentRefShortName}}</strong>
{{end}}
<strong class="tw-ml-2 tw-inline-block gt-ellipsis">{{Iif .DropdownFixedText .SelectedRefShortName}}</strong>
</span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/wiki/revision.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
</div>
</div>
<div>
<div class="flex-text-block">
{{template "repo/clone_panel" .}}
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,6 +1150,7 @@ table th[data-sortt-desc] .svg {
min-width: 0;
}

.ui.dropdown > .ui.button,
.flex-text-block > .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 */
Expand Down
3 changes: 2 additions & 1 deletion web_src/js/components/RepoBranchTagSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ export default defineComponent({
<template v-if="dropdownFixedText">{{ dropdownFixedText }}</template>
<template v-else>
<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>
</template>
</span>
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/components/RepoContributors.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ export default defineComponent({
<div>
<!-- Contribution type -->
<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>
<svg-icon name="octicon-triangle-down" :size="14"/>
</div>
Expand Down