Files
@ 4e429252f3ee
Branch filter:
Location: kallithea/rhodecode/public/css/mergerly.css - annotation
4e429252f3ee
1.3 KiB
text/css
Don't use -p flag together with -s in git calls. Latest
git version changes behaviour of such call changing the output.
In all the calls where -p -s was used we're only interested in
list of changesets and not the diff.
git version changes behaviour of such call changing the output.
In all the calls where -p -s was used we're only interested in
list of changesets and not the diff.
a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 a1bc4af25ec5 fd5d7b17fa72 a1bc4af25ec5 a1bc4af25ec5 |
/* required */
.mergely-column textarea { width: 80px; height: 200px; }
.mergely-column { float: left; }
.mergely-margin { float: left; }
.mergely-canvas { float: left; width: 28px; }
/* resizeable */
.mergely-resizer { width: 100%; height: 100%; }
/* style configuration */
.mergely-column { border: 1px solid #ccc; }
.mergely-active { border: 1px solid #a3d1ff; }
.mergely.a.rhs.start { border-top: 1px solid #ddffdd; }
.mergely.a.lhs.start.end,
.mergely.a.rhs.end { border-bottom: 1px solid #ddffdd; }
.mergely.a.rhs { background-color: #ddffdd; }
.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #ddffdd; }
.mergely.d.lhs { background-color: #edc0c0; }
.mergely.d.lhs.end,
.mergely.d.rhs.start.end { border-bottom: 1px solid #ffdddd; }
.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ffdddd; }
.mergely.d.lhs.start { border-top: 1px solid #ffdddd; }
.mergely.c.lhs,
.mergely.c.rhs { background-color: #fafafa; }
.mergely.c.lhs.start,
.mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
.mergely.c.lhs.end,
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
.mergely.ch.a.rhs { background-color: #ddffdd; }
.mergely.ch.d.lhs { background-color: #ffdddd; }
.mergely-margin #compare-lhs-margin,
.mergely-margin #compare-rhs-margin {
cursor: pointer
}
|