##// 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
project: added all source files and assets
r1 div.diffblock .code-header .changeset_header > div {
margin: 0 @padding;
}
// Line select and comment
div.diffblock.margined.comm tr {
td {
dan
ux: remove position relative on diff td as it causes very slow...
r788 // IMPORTANT - never position:relative this as it causes insanely
// slow rendering
project: added all source files and assets
r1 }
.add-comment-line {
// Force td width for Firefox
width: 20px;
dan
ux: remove position relative on diff td as it causes very slow...
r788
// TODO: anderson: fixing mouse-over bug.
project: added all source files and assets
r1 // 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;
dan
ux: remove position relative on diff td as it causes very slow...
r788 margin-top: 2px;
margin-left: 2px;
project: added all source files and assets
r1 color: @grey3;
}
}
}
diffs: adding inline comment toggle fixes #2884
r696 .comment-toggle {
styling: fixing alignment of comment toggle button
r781 position: relative;
styling: fixing width on comment toggle button td
r783 min-width: 20px;
width: 20px;
diffs: adding inline comment toggle fixes #2884
r696 color: @rcblue;
styling: fixing alignment of comment toggle button
r781
.icon-comment {
position: absolute;
top: 2px;
left: 0;
z-index: 100;
diffs: do not set incorrect display type on table TD
r742 visibility: hidden;
}
diffs: adding inline comment toggle fixes #2884
r696
&.active {
diffs: do not set incorrect display type on table TD
r742 .icon-comment{
visibility: visible;
}
diffs: adding inline comment toggle fixes #2884
r696 cursor: pointer;
}
}
project: added all source files and assets
r1 &.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;
dan
ux: remove position relative on diff td as it causes very slow...
r788 background-color: lighten(@alert4, 10%) !important;
project: added all source files and assets
r1 }
}
}
}
.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;
}
diffs: do not set incorrect display type on table TD
r742 }