##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r788:5bb62bb1 default
r2784:e8c62649 default
Show More
diff.less
100 lines | 2.2 KiB | text/x-less | LessCssLexer
div.diffblock .code-header .changeset_header > div {
margin: 0 @padding;
}
// Line select and comment
div.diffblock.margined.comm tr {
td {
// IMPORTANT - never position:relative this as it causes insanely
// slow rendering
}
.add-comment-line {
// Force td width for Firefox
width: 20px;
// TODO: anderson: fixing mouse-over bug.
// why was it vertical-align baseline in first place??
vertical-align: top !important;
// Force width and display for IE 9
.add-comment-content {
display: inline-block;
width: 20px;
a {
display: none;
margin-top: 2px;
margin-left: 2px;
color: @grey3;
}
}
}
.comment-toggle {
position: relative;
min-width: 20px;
width: 20px;
color: @rcblue;
.icon-comment {
position: absolute;
top: 2px;
left: 0;
z-index: 100;
visibility: hidden;
}
&.active {
.icon-comment{
visibility: visible;
}
cursor: pointer;
}
}
&.line {
&:hover, &.hover{
.add-comment-line a{
display: inline;
}
}
&.hover, &.selected {
&, del, ins {
background-color: lighten(@alert3, 10%) !important;
}
}
&.commenting {
&, del, ins {
background-image: none !important;
background-color: lighten(@alert4, 10%) !important;
}
}
}
}
.compare-header {
overflow-x: auto;
overflow-y: hidden;
clear: both;
padding: @padding;
background: @grey6;
border: @border-thickness solid @border-default-color;
.border-radius(@border-radius);
.compare-value,
.compare-label {
float: left;
display: inline-block;
min-width: 5em;
margin: 0;
padding: 0.9em 0.9em 0.9em 0;
}
.compare-label {
clear: both;
font-family: @text-semibold;
}
}