Skip to content

Commit cda69a0

Browse files
GiteaBotwxiaoguang
andauthored
Fix dropdown icon layout on diff page (#25397) (#25403)
Backport #25397 by @wxiaoguang Address #25163 (comment) Remove the unused "icon-button". And fix the layout: Without the dropdown icon: ``` {{svg "gitea-whitespace"}} ``` ![image](https://github.com/go-gitea/gitea/assets/2114189/58a524ba-f289-4982-aea2-6f9f9f9cbdcf) With the dropdown icon: ``` {{svg "gitea-whitespace" 16 "gt-mr-3"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} ``` ![image](https://github.com/go-gitea/gitea/assets/2114189/eb99168b-5d49-40a7-8665-5296cbb4e486) Co-authored-by: wxiaoguang <[email protected]>
1 parent 4908cc9 commit cda69a0

File tree

6 files changed

+8
-14
lines changed

6 files changed

+8
-14
lines changed

templates/package/shared/cleanup_rules/list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{range .CleanupRules}}
1010
<div class="item">
1111
<div class="right floated content">
12-
<div class="ui dropdown tiny basic button icon-button">
12+
<div class="ui dropdown tiny basic button">
1313
{{svg "octicon-kebab-horizontal"}}
1414
<div class="menu">
1515
<a class="item" href="{{$.Link}}/rules/{{.ID}}">{{$.locale.Tr "edit"}}</a>

templates/repo/diff/new_review.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="review-box">
2-
<button class="ui tiny green button gt-ml-2 gt-mr-0 js-btn-review">
2+
<button class="ui tiny green button gt-pr-2 gt-df js-btn-review">
33
{{.locale.Tr "repo.diff.review"}}
44
<span class="ui small label review-comments-counter" data-pending-comment-number="{{.PendingCodeCommentNumber}}">{{.PendingCodeCommentNumber}}</span>
55
{{svg "octicon-triangle-down" 14 "dropdown icon"}}

templates/repo/diff/options_dropdown.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui dropdown tiny basic button icon-button" data-tooltip-content="{{.locale.Tr "repo.diff.options_button"}}">
1+
<div class="ui dropdown tiny basic button" data-tooltip-content="{{.locale.Tr "repo.diff.options_button"}}">
22
{{svg "octicon-kebab-horizontal"}}
33
<div class="menu">
44
<a class="item" id="show-file-list-btn">{{.locale.Tr "repo.diff.show_diff_stats"}}</a>

templates/repo/diff/whitespace_dropdown.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<div class="ui dropdown tiny basic button icon-button" data-tooltip-content="{{.locale.Tr "repo.diff.whitespace_button"}}">
1+
<div class="ui dropdown tiny basic button" data-tooltip-content="{{.locale.Tr "repo.diff.whitespace_button"}}">
22
{{svg "gitea-whitespace"}}
3-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
43
<div class="menu">
54
<a class="item" href="?style={{if .IsSplitStyle}}split{{else}}unified{{end}}&whitespace=show-all">
65
<label class="gt-pointer-events-none">
@@ -28,4 +27,4 @@
2827
</a>
2928
</div>
3029
</div>
31-
<a class="ui tiny basic button icon-button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}&whitespace={{$.WhitespaceBehavior}}" data-tooltip-content="{{if .IsSplitStyle}}{{.locale.Tr "repo.diff.show_unified_view"}}{{else}}{{.locale.Tr "repo.diff.show_split_view"}}{{end}}">{{if .IsSplitStyle}}{{svg "gitea-join"}}{{else}}{{svg "gitea-split"}}{{end}}</a>
30+
<a class="ui tiny basic button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}&whitespace={{$.WhitespaceBehavior}}" data-tooltip-content="{{if .IsSplitStyle}}{{.locale.Tr "repo.diff.show_unified_view"}}{{else}}{{.locale.Tr "repo.diff.show_split_view"}}{{end}}">{{if .IsSplitStyle}}{{svg "gitea-join"}}{{else}}{{svg "gitea-split"}}{{end}}</a>

web_src/css/modules/button.css

-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
color: var(--color-red);
3030
}
3131

32-
/* try to match button with no icons in height */
33-
.icon-button {
34-
padding-top: 7.42px !important;
35-
padding-bottom: 7.42px !important;
36-
}
37-
3832
/* btn is a plain button without any opinionated styling */
3933

4034
.btn {

web_src/css/repo.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -1666,8 +1666,9 @@
16661666
background-color: var(--color-teal);
16671667
}
16681668

1669-
.repository .diff-detail-box .button {
1670-
padding: 8px 12px;
1669+
.repository .diff-detail-box .ui.button {
1670+
padding: 0 12px;
1671+
height: 30px;
16711672
}
16721673

16731674
.repository .diff-box .header:not(.resolved-placeholder) {

0 commit comments

Comments
 (0)