Mercurial > kallithea
annotate rhodecode/public/css/mergerly.css @ 4057:6eaee7e2829e
pull requests: link to origin branch
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 27 Jun 2013 23:54:22 +0200 |
parents | fd5d7b17fa72 |
children |
rev | line source |
---|---|
4043
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 /* required */ |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 .mergely-column textarea { width: 80px; height: 200px; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
4 .mergely-column { float: left; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
5 .mergely-margin { float: left; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
6 .mergely-canvas { float: left; width: 28px; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
7 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
8 /* resizeable */ |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
9 .mergely-resizer { width: 100%; height: 100%; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
10 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
11 /* style configuration */ |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
12 .mergely-column { border: 1px solid #ccc; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
13 .mergely-active { border: 1px solid #a3d1ff; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
14 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
15 .mergely.a.rhs.start { border-top: 1px solid #ddffdd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
16 .mergely.a.lhs.start.end, |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
17 .mergely.a.rhs.end { border-bottom: 1px solid #ddffdd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
18 .mergely.a.rhs { background-color: #ddffdd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
19 .mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #ddffdd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
20 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
21 .mergely.d.lhs { background-color: #edc0c0; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
22 .mergely.d.lhs.end, |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
23 .mergely.d.rhs.start.end { border-bottom: 1px solid #ffdddd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
24 .mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ffdddd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
25 .mergely.d.lhs.start { border-top: 1px solid #ffdddd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
26 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
27 .mergely.c.lhs, |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
28 .mergely.c.rhs { background-color: #fafafa; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
29 .mergely.c.lhs.start, |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
30 .mergely.c.rhs.start { border-top: 1px solid #a3a3a3; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
31 .mergely.c.lhs.end, |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
32 .mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
33 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
34 .mergely.ch.a.rhs { background-color: #ddffdd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
35 .mergely.ch.d.lhs { background-color: #ffdddd; } |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
36 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
37 |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
38 .mergely-margin #compare-lhs-margin, |
4050 | 39 .mergely-margin #compare-rhs-margin { |
4043
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
40 cursor: pointer |
a1bc4af25ec5
Implemented issue #387 side-by-side diffs view
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
41 } |