Skip to content
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

Jump to bottom

Fix 5532 diff stats #8581

Merged
merged 21 commits into from
Oct 21, 2019
Merged

Fix 5532 diff stats #8581

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bd5d464
make diff-detail-box the main container
6543 Oct 18, 2019
06afff1
move file diff at the same level as diff-stats
6543 Oct 18, 2019
bc05084
make diff-view options sticy again
6543 Oct 18, 2019
fc4b006
make diff-stats scroll if to mouch
6543 Oct 18, 2019
c373be0
rm useless css info
6543 Oct 18, 2019
c0877e3
less: mv diff-stats to own class
6543 Oct 18, 2019
e06c095
use new css class
6543 Oct 18, 2019
ebc6aa5
cleanup less file
6543 Oct 18, 2019
97df5ea
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 18, 2019
0a954b8
diff-counter: margin-right: 15px;
6543 Oct 18, 2019
cb05a71
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 19, 2019
47c5f2c
make CI work
6543 Oct 19, 2019
7670f96
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 19, 2019
7e23a86
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 19, 2019
8554393
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 19, 2019
326b2c6
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 20, 2019
e45c495
Merge branch 'master' into fix-5532_diff-stats
6543 Oct 21, 2019
081167e
make numbers collorful
6543 Oct 21, 2019
ace2ae0
add sign (-/+) to nubers
6543 Oct 21, 2019
86e3cf1
Merge branch 'master' into fix-5532_diff-stats
zeripath Oct 21, 2019
07aa5f2
Merge branch 'master' into fix-5532_diff-stats
zeripath Oct 21, 2019
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
7 changes: 5 additions & 2 deletions public/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,8 +667,6 @@ i.icon.centerlock{top:1.5em}
.repository #commits-table td.sha .sha.label.isSigned.isVerified:hover,.repository #repo-files-table .sha.label.isSigned.isVerified:hover{background:rgba(33,186,69,.3)!important}
.repository .diff-detail-box{padding:7px 0;background:#fff;line-height:30px}
.repository .diff-detail-box>div:after{clear:both;content:"";display:block}
.repository .diff-detail-box ol{clear:both;padding-left:0;margin-top:5px;margin-bottom:28px}
.repository .diff-detail-box ol li{list-style:none;padding-bottom:4px;margin-bottom:4px;border-bottom:1px dashed #ddd;padding-left:6px}
.repository .diff-detail-box span.status{display:inline-block;width:12px;height:12px;margin-right:8px;vertical-align:middle}
.repository .diff-detail-box span.status.modify{background-color:#f0db88}
.repository .diff-detail-box span.status.add{background-color:#b4e2b4}
Expand Down Expand Up @@ -705,6 +703,11 @@ i.icon.centerlock{top:1.5em}
.repository .diff-file-box.file-content{clear:right}
.repository .diff-file-box.file-content img{max-width:100%;padding:5px 5px 0 5px}
.repository .diff-file-box.file-content img.emoji{padding:0}
.repository .diff-stats{clear:both;margin-bottom:5px;max-height:400px;overflow:auto;padding-left:0}
.repository .diff-stats li{list-style:none;padding-bottom:4px;margin-bottom:4px;border-bottom:1px dashed #ddd;padding-left:6px}
.repository .diff-stats .diff-counter{margin-right:15px}
.repository .diff-stats .diff-counter .del{color:red}
.repository .diff-stats .diff-counter .add{color:green}
.repository .repo-search-result{padding-top:10px;padding-bottom:10px}
.repository .repo-search-result .lines-num a{color:inherit}
.repository.quickstart .guide .item{padding:1em}
Expand Down
43 changes: 28 additions & 15 deletions public/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,21 +1246,6 @@
display: block;
}

ol {
clear: both;
padding-left: 0;
margin-top: 5px;
margin-bottom: 28px;

li {
list-style: none;
padding-bottom: 4px;
margin-bottom: 4px;
border-bottom: 1px dashed #dddddd;
padding-left: 6px;
}
}

span.status {
display: inline-block;
width: 12px;
Expand Down Expand Up @@ -1475,6 +1460,34 @@
}
}

.diff-stats {

clear: both;
margin-bottom: 5px;
max-height: 400px;
overflow: auto;
padding-left: 0;

li {
list-style: none;
padding-bottom: 4px;
margin-bottom: 4px;
border-bottom: 1px dashed #dddddd;
padding-left: 6px;
}

.diff-counter {
margin-right: 15px;

.del {
color: red;
}
.add {
color: green;
}
}
}

.repo-search-result {
padding-top: 10px;
padding-bottom: 10px;
Expand Down
Loading