Skip to content

Commit 51432eb

Browse files
jolheiserlafriks
authored andcommitted
Fix context menu overflow & review tag margin (#9231)
* Fix context menu overflow Signed-off-by: jolheiser <john.olheiser@gmail.com> * Add review tag CSS Signed-off-by: jolheiser <john.olheiser@gmail.com>
1 parent a00d720 commit 51432eb

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

public/css/index.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ i.icon.centerlock{top:1.5em}
248248
.lines-commit .ui.avatar.image{height:18px;width:18px}
249249
.lines-code .bottom-line,.lines-commit .bottom-line,.lines-num .bottom-line{border-bottom:1px solid #eaecef}
250250
.code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
251+
.code-view.has-context-menu{overflow:visible;overflow-x:visible;overflow-y:visible}
251252
.code-view :not(.fa):not(.octicon):not(.icon){font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
252253
.code-view table{width:100%}
253254
.code-view .active{background:#fff866}
@@ -572,7 +573,8 @@ i.icon.centerlock{top:1.5em}
572573
.repository.view.issue .comment-list .timeline-line:before{display:block;content:"";position:absolute;margin-top:12px;margin-bottom:14px;top:0;bottom:0;left:82px;width:2px;background-color:#f3f3f3;z-index:-1}
573574
.repository.view.issue .comment-list .comment .avatar{width:3em}
574575
.repository.view.issue .comment-list .comment .tag{color:#767676;margin-top:3px;padding:2px 5px;font-size:12px;border:1px solid rgba(0,0,0,.1);border-radius:3px}
575-
.repository.view.issue .comment-list .comment .tag.pending{color:#000;background-color:#fffbb2;margin-left:5px}
576+
.repository.view.issue .comment-list .comment .tag.review{margin-left:5px}
577+
.repository.view.issue .comment-list .comment .tag.review.pending{color:#000;background-color:#fffbb2}
576578
.repository.view.issue .comment-list .comment .actions .item{float:left}
577579
.repository.view.issue .comment-list .comment .actions .item.context{float:none}
578580
.repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px}

templates/repo/diff/box.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
</h4>
114114
<div class="ui attached unstackable table segment">
115115
{{if ne $file.Type 4}}
116-
<div class="file-body file-code code-view code-diff {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}}">
116+
<div class="file-body file-code code-view has-context-menu code-diff {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}}">
117117
<table>
118118
<tbody>
119119
{{if $isImage}}

templates/repo/diff/comments.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<div class="ui right actions">
1212
{{if and .Review}}
1313
{{if eq .Review.Type 0}}
14-
<div class="item tag pending">
14+
<div class="item tag review pending">
1515
{{$.root.i18n.Tr "repo.issues.review.pending"}}
1616
</div>
1717
{{else}}
18-
<div class="item tag">
18+
<div class="item tag review">
1919
{{$.root.i18n.Tr "repo.issues.review.review"}}
2020
</div>
2121
{{end}}

web_src/less/_base.less

+6
Original file line numberDiff line numberDiff line change
@@ -1092,6 +1092,12 @@ i.icon.centerlock {
10921092
overflow-x: auto;
10931093
overflow-y: hidden;
10941094

1095+
&.has-context-menu {
1096+
overflow: visible;
1097+
overflow-x: visible;
1098+
overflow-y: visible;
1099+
}
1100+
10951101
*:not(.fa):not(.octicon):not(.icon) {
10961102
font-size: 12px;
10971103
font-family: @monospaced-fonts, monospace;

web_src/less/_repository.less

+5-3
Original file line numberDiff line numberDiff line change
@@ -737,10 +737,12 @@
737737
font-size: 12px;
738738
border: 1px solid rgba(0, 0, 0, 0.1);
739739
border-radius: 3px;
740-
&.pending {
741-
color: black;
742-
background-color: #fffbb2;
740+
&.review {
743741
margin-left: 5px;
742+
&.pending {
743+
color: black;
744+
background-color: #fffbb2;
745+
}
744746
}
745747
}
746748

0 commit comments

Comments
 (0)