Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-13 00:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for ie 7

Browse Source
This commit is contained in:
nazoking
2015-03-25 10:20:59 +09:00
parent 444af0935e
commit 40f376dbd9
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/twirl/gitbucket/core/helper/diff.scala.html
View File

@@ -47,9 +47,6 @@
<tr> <tr>
<th style="font-weight: normal; line-height: 27px;" class="box-header"> <th style="font-weight: normal; line-height: 27px;" class="box-header">
@if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){ @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
<span class="diffstat">
<img src="@assets/common/images/diff_move.png"/>
</span> @diff.oldPath -> @diff.newPath
@if(newCommitId.isDefined){ @if(newCommitId.isDefined){
<div class="pull-right align-right"> <div class="pull-right align-right">
<label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label> <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
@@ -57,8 +54,18 @@
<a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a> <a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
</div> </div>
} }
<span class="diffstat">
<img src="@assets/common/images/diff_move.png"/>
</span> @diff.oldPath -> @diff.newPath
} }
@if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){ @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
@if(newCommitId.isDefined){
<div class="pull-right align-right">
<label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
<label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
<a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
</div>
}
<span class="diffstat"> <span class="diffstat">
@if(diff.changeType == ChangeType.ADD){ @if(diff.changeType == ChangeType.ADD){
<img src="@assets/common/images/diff_add.png"/> <img src="@assets/common/images/diff_add.png"/>
@@ -67,24 +74,17 @@
} }
</span> </span>
@diff.newPath @diff.newPath
@if(newCommitId.isDefined){
<div class="pull-right align-right">
<label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
<label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
<a href="@url(repository)/blob/@newCommitId.get/@diff.newPath" class="btn btn-small" title="View the whole file at version @newCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
</div>
}
} }
@if(diff.changeType == ChangeType.DELETE){ @if(diff.changeType == ChangeType.DELETE){
<span class="diffstat">
<img src="@assets/common/images/diff_delete.png"/>
</span> @diff.oldPath
@if(oldCommitId.isDefined){ @if(oldCommitId.isDefined){
<div class="pull-right align-right"> <div class="pull-right align-right">
<label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label> <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
<a href="@url(repository)/blob/@oldCommitId.get/@diff.oldPath" class="btn btn-small" title="View the whole file at version @oldCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a> <a href="@url(repository)/blob/@oldCommitId.get/@diff.oldPath" class="btn btn-small" title="View the whole file at version @oldCommitId.get.substring(0, 10)" data-toggle="tooltip">View</a>
</div> </div>
} }
<span class="diffstat">
<img src="@assets/common/images/diff_delete.png"/>
</span> @diff.oldPath
} }
</th> </th>
</tr> </tr>

3
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -1121,6 +1121,9 @@ table.diff tbody tr.not-diff:hover td{
.diffstat-bar { .diffstat-bar {
display: inline-block; display: inline-block;
/* For IE 6/7 */
*display: inline;
*zoom: 1;
margin-left: 3px; margin-left: 3px;
font-size: 16px; font-size: 16px;
color: #ddd; color: #ddd;