holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change diff colors to match github, provided by Ralf

Browse Source
This commit is contained in:
nathangray 2019-03-01 10:31:52 -07:00
parent b39f4e0aef
commit 8765b9a084
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_widget_diff.js
View File

@ -47,7 +47,7 @@ var et2_diff = (function(){ "use strict"; return et2_valueWidget.extend([et2_IDe
// included via etemplate2.css
//this.egw().includeCSS('../../../vendor/bower-asset/dist/dist2html.css');
this.div = document.createElement("div");
jQuery(this.div).addClass('diff');
jQuery(this.div).addClass('et2_diff');
},
set_value: function(value) {
@ -100,7 +100,7 @@ var et2_diff = (function(){ "use strict"; return et2_valueWidget.extend([et2_IDe
{
jQuery(this).height(jQuery(window).height() *0.7);
}
jQuery(this).dialog({position: "center"});
jQuery(this).addClass('et2_diff').dialog({position: "center"});
},
close: function(event, ui) {
// Need to destroy the dialog, etemplate widget needs divs back where they were

23
api/templates/default/etemplate2.css
View File

@ -567,22 +567,22 @@ for printing
/**
* Diff widget
*/
div.diff {
div.et2_diff {
width: 100%;
}
.diff thead,
.et2_diff thead,
.author,
.d2h-file-header,
.d2h-file-info,
.d2h-info,
.diff .d2h-cntx
.et2_diff .d2h-cntx
{
display: none;
}
.d2h-file-diff {
white-space:normal;
}
.diff .d2h-file-diff {
.et2_diff .d2h-file-diff {
overflow-x: hidden;
}
.ui-widget-content .d2h-code-line-ctn {
@ -592,10 +592,23 @@ div.diff {
overflow-x: visible;
overflow-y: visible;
}
.diff .ui-icon {
.et2_diff .ui-icon {
margin-top: -16px;
float: right;
}
.et2_diff .d2h-del, .et2_diff.d2h-del.d2h-change, .et2_diff .d2h-file-diff .d2h-del.d2h-change {
background-color: #ffeef0;
}
.et2_diff .d2h-code-line del, .et2_diff .d2h-code-side-line del {
background-color: #fdb8c0;
}
.et2_diff .d2h-ins, .et2_diff.d2h-ins.d2h-change, .et2_diff .d2h-file-diff .d2h-ins.d2h-change {
background-color: #e6ffed;
}
.et2_diff .d2h-code-line ins, .et2_diff .d2h-code-side-line ins {
background-color: #acf2bd;
}
/** Display a loading icon **/
.loading {
background-position: center;