kallithea Files · rhodecode/public/css/mergerly.css

Files @ e13a747e9c6a

Branch filter:

Location: kallithea/rhodecode/public/css/mergerly.css

e13a747e9c6a 1.3 KiB text/css Show Annotation Show as Raw Download as Raw

Bradley M. Kuhn

Migrate to jQuery 1.10.2 from 1.10.1.

Include the minified version of jQuery 1.10.2 instead of 1.10.1. The 1.10.2
files were download via these commands:

$ wget -N http://code.jquery.com/jquery-1.10.2.min.js
$ wget -N http://code.jquery.com/jquery-1.10.2.min.map

Meanwhile, since the Javascript code is covered by GPLv3, we should always
provide an up-to-date version of the source code. I have included it
here by creating the directory jquery-src. I extracted the correct version
of the source with the following commands:

$ git clone git://github.com/jquery/jquery.git
$ git checkout 1.10.2

which is what the jQuery website instructs to do: http://jquery.com/download/

This repository is mirrorred at https://kallithea-scm.org/repos/mirror/jquery/ .


/* 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
}