Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix context menu overflow & review tag margin (#9231)

Browse Source 
* Fix context menu overflow

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Add review tag CSS

Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser 2019-12-02 17:03:30 -06:00 committed by Lauris BH
parent a00d7200b1
commit 51432ebb9c
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/index.css
View File

@ -248,6 +248,7 @@ i.icon.centerlock{top:1.5em}
.lines-commit .ui.avatar.image{height:18px;width:18px}
.lines-code .bottom-line,.lines-commit .bottom-line,.lines-num .bottom-line{border-bottom:1px solid #eaecef}
.code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
.code-view.has-context-menu{overflow:visible;overflow-x:visible;overflow-y:visible}
.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}
.code-view table{width:100%}
.code-view .active{background:#fff866}
@ -572,7 +573,8 @@ i.icon.centerlock{top:1.5em}
.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}
.repository.view.issue .comment-list .comment .avatar{width:3em}
.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}
.repository.view.issue .comment-list .comment .tag.pending{color:#000;background-color:#fffbb2;margin-left:5px}
.repository.view.issue .comment-list .comment .tag.review{margin-left:5px}
.repository.view.issue .comment-list .comment .tag.review.pending{color:#000;background-color:#fffbb2}
.repository.view.issue .comment-list .comment .actions .item{float:left}
.repository.view.issue .comment-list .comment .actions .item.context{float:none}
.repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px}

2
templates/repo/diff/box.tmpl
View File

@ -113,7 +113,7 @@
</h4>
<div class="ui attached unstackable table segment">
{{if ne $file.Type 4}}
<div class="file-body file-code code-view code-diff {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}}">
<div class="file-body file-code code-view has-context-menu code-diff {{if $.IsSplitStyle}}code-diff-split{{else}}code-diff-unified{{end}}">
<table>
<tbody>
{{if $isImage}}

4
templates/repo/diff/comments.tmpl
View File

@ -11,11 +11,11 @@
<div class="ui right actions">
{{if and .Review}}
{{if eq .Review.Type 0}}
<div class="item tag pending">
<div class="item tag review pending">
{{$.root.i18n.Tr "repo.issues.review.pending"}}
</div>
{{else}}
<div class="item tag">
<div class="item tag review">
{{$.root.i18n.Tr "repo.issues.review.review"}}
</div>
{{end}}

6
web_src/less/_base.less
View File

@ -1092,6 +1092,12 @@ i.icon.centerlock {
overflow-x: auto;
overflow-y: hidden;
&.has-context-menu {
overflow: visible;
overflow-x: visible;
overflow-y: visible;
}
*:not(.fa):not(.octicon):not(.icon) {
font-size: 12px;
font-family: @monospaced-fonts, monospace;

8
web_src/less/_repository.less
View File

@ -737,10 +737,12 @@
font-size: 12px;
border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: 3px;
&.pending {
color: black;
background-color: #fffbb2;
&.review {
margin-left: 5px;
&.pending {
color: black;
background-color: #fffbb2;
}
}
}