Files @ aa3b55946089
Branch filter:

Location: kallithea/rhodecode/public/css/codemirror.css - annotation

"Bradley M. Kuhn"
Migrate to Mergely 3.3.4.

RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that
Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be
changes we want for Kallithea this way and we take the 3.3.4 files as they are.

I've also included the Mergely license file, as downloaded from:
http://www.mergely.com/license.php

That LICENSE file is kept in HTML just as it was downloaded from their
website. While it's a bit annoying to keep the license file in HTML, this is
the way it came from upstream so we'll leave it that way.

Since the Javascript code is used with other GPLv3 Javascript, we are using the
GPL option of Mergely's tri-license.

Finally, note that previously, this was incorrectly called "mergerly", so the
opportunity is taken here to correct the name. That required changes to
diff_2way.html.

As commands::

$ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php
$ hg add LICENSE-MERGELY.html
$ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css
$ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js
$ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html
$ ( cd /tmp; \
wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \
unzip mergely-3.3.4.zip )
$ sha256sum /tmp/mergely-3.3.4.zip
87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip
$ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js
$ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css
$ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
cd23cc2c9961
cd23cc2c9961
166317d464f3
cd23cc2c9961
166317d464f3
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
af3c746b3f1f
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
af3c746b3f1f
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
968c84475f73
cd23cc2c9961
cd23cc2c9961
968c84475f73
968c84475f73
968c84475f73
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
968c84475f73
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
af3c746b3f1f
f034e6a13a5e
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
f034e6a13a5e
968c84475f73
968c84475f73
968c84475f73
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
cd23cc2c9961
cd23cc2c9961
af3c746b3f1f
af3c746b3f1f
af3c746b3f1f
166317d464f3
166317d464f3
cd23cc2c9961
166317d464f3
cd23cc2c9961
cd23cc2c9961
166317d464f3
cd23cc2c9961
af3c746b3f1f
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
f034e6a13a5e
cd23cc2c9961
166317d464f3
cd23cc2c9961
166317d464f3
968c84475f73
968c84475f73
166317d464f3
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
166317d464f3
968c84475f73
cd23cc2c9961
968c84475f73
968c84475f73
968c84475f73
968c84475f73
cd23cc2c9961
cd23cc2c9961
31f98c850623
166317d464f3
968c84475f73
968c84475f73
968c84475f73
968c84475f73
968c84475f73
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
bb9ef0638069
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
968c84475f73
968c84475f73
968c84475f73
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
cd23cc2c9961
968c84475f73
cd23cc2c9961
968c84475f73
cd23cc2c9961
166317d464f3
166317d464f3
968c84475f73
968c84475f73
166317d464f3
cd23cc2c9961
166317d464f3
166317d464f3
166317d464f3
cd23cc2c9961
cd23cc2c9961
968c84475f73
cd23cc2c9961
968c84475f73
968c84475f73
166317d464f3
166317d464f3
cd23cc2c9961
cd23cc2c9961
f034e6a13a5e
f034e6a13a5e
f034e6a13a5e
cd23cc2c9961
f034e6a13a5e
f034e6a13a5e
f0384b9ed5b9
/* BASICS */

.CodeMirror {
  /* Set height, width, borders, and global font properties here */
  font-family: monospace;
  height: 300px;
}
.CodeMirror-scroll {
  /* Set scrolling behaviour here */
  overflow: auto;
}

/* PADDING */

.CodeMirror-lines {
  padding: 4px 0; /* Vertical padding around content */
}
.CodeMirror pre {
  padding: 0 4px; /* Horizontal padding of content */
}

.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
  background-color: white; /* The little square between H and V scrollbars */
}

/* GUTTER */

.CodeMirror-gutters {
  border-right: 1px solid #ddd;
  background-color: #f7f7f7;
  white-space: nowrap;
}
.CodeMirror-linenumbers {}
.CodeMirror-linenumber {
  padding: 0 3px 0 5px;
  min-width: 20px;
  text-align: right;
  color: #999;
}

/* CURSOR */

.CodeMirror div.CodeMirror-cursor {
  border-left: 1px solid black;
  z-index: 3;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
  border-left: 1px solid silver;
}
.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
  width: auto;
  border: 0;
  background: #7e7;
  z-index: 1;
}
/* Can style cursor different in overwrite (non-insert) mode */
.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}

.cm-tab { display: inline-block; }

/* DEFAULT THEME */

.cm-s-default .cm-keyword {color: #708;}
.cm-s-default .cm-atom {color: #219;}
.cm-s-default .cm-number {color: #164;}
.cm-s-default .cm-def {color: #00f;}
.cm-s-default .cm-variable {color: black;}
.cm-s-default .cm-variable-2 {color: #05a;}
.cm-s-default .cm-variable-3 {color: #085;}
.cm-s-default .cm-property {color: black;}
.cm-s-default .cm-operator {color: black;}
.cm-s-default .cm-comment {color: #a50;}
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
.cm-s-default .cm-meta {color: #555;}
.cm-s-default .cm-error {color: #f00;}
.cm-s-default .cm-qualifier {color: #555;}
.cm-s-default .cm-builtin {color: #30a;}
.cm-s-default .cm-bracket {color: #997;}
.cm-s-default .cm-tag {color: #170;}
.cm-s-default .cm-attribute {color: #00c;}
.cm-s-default .cm-header {color: blue;}
.cm-s-default .cm-quote {color: #090;}
.cm-s-default .cm-hr {color: #999;}
.cm-s-default .cm-link {color: #00c;}

.cm-negative {color: #d44;}
.cm-positive {color: #292;}
.cm-header, .cm-strong {font-weight: bold;}
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}

.cm-invalidchar {color: #f00;}

div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

/* STOP */

/* The rest of this file contains styles related to the mechanics of
   the editor. You probably shouldn't touch them. */

.CodeMirror {
  line-height: 1;
  position: relative;
  overflow: hidden;
  background: white;
  color: black;
}

.CodeMirror-scroll {
  /* 30px is the magic margin used to hide the element's real scrollbars */
  /* See overflow: hidden in .CodeMirror */
  margin-bottom: -30px; margin-right: -30px;
  padding-bottom: 30px; padding-right: 30px;
  height: 100%;
  outline: none; /* Prevent dragging from highlighting the element */
  position: relative;
}
.CodeMirror-sizer {
  position: relative;
}

/* The fake, visible scrollbars. Used to force redraw during scrolling
   before actuall scrolling happens, thus preventing shaking and
   flickering artifacts. */
.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
  position: absolute;
  z-index: 6;
  display: none;
}
.CodeMirror-vscrollbar {
  right: 0; top: 0;
  overflow-x: hidden;
  overflow-y: scroll;
}
.CodeMirror-hscrollbar {
  bottom: 0; left: 0;
  overflow-y: hidden;
  overflow-x: scroll;
}
.CodeMirror-scrollbar-filler {
  right: 0; bottom: 0;
}
.CodeMirror-gutter-filler {
  left: 0; bottom: 0;
}

.CodeMirror-gutters {
  position: absolute; left: 0; top: 0;
  padding-bottom: 30px;
  z-index: 3;
}
.CodeMirror-gutter {
  white-space: normal;
  height: 100%;
  padding-bottom: 30px;
  margin-bottom: -32px;
  display: inline-block;
  /* Hack to make IE7 behave */
  *zoom:1;
  *display:inline;
}
.CodeMirror-gutter-elt {
  position: absolute;
  cursor: default;
  z-index: 4;
}

.CodeMirror-lines {
  cursor: text;
}
.CodeMirror pre {
  /* Reset some styles that the rest of the page might have set */
  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
  border-width: 0;
  background: transparent;
  font-family: inherit;
  font-size: inherit;
  margin: 0;
  white-space: pre;
  word-wrap: normal;
  line-height: inherit;
  color: inherit;
  z-index: 2;
  position: relative;
  overflow: visible;
}
.CodeMirror-wrap pre {
  word-wrap: break-word;
  white-space: pre-wrap;
  word-break: normal;
}
.CodeMirror-code pre {
  border-right: 30px solid transparent;
  width: -webkit-fit-content;
  width: -moz-fit-content;
  width: fit-content;
}
.CodeMirror-wrap .CodeMirror-code pre {
  border-right: none;
  width: auto;
}
.CodeMirror-linebackground {
  position: absolute;
  left: 0; right: 0; top: 0; bottom: 0;
  z-index: 0;
}

.CodeMirror-linewidget {
  position: relative;
  z-index: 2;
  overflow: auto;
}

.CodeMirror-widget {
}

.CodeMirror-wrap .CodeMirror-scroll {
  overflow-x: hidden;
}

.CodeMirror-measure {
  position: absolute;
  width: 100%; height: 0px;
  overflow: hidden;
  visibility: hidden;
}
.CodeMirror-measure pre { position: static; }

.CodeMirror div.CodeMirror-cursor {
  position: absolute;
  visibility: hidden;
  border-right: none;
  width: 0;
}
.CodeMirror-focused div.CodeMirror-cursor {
  visibility: visible;
}

.CodeMirror-selected { background: #d9d9d9; }
.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }

.cm-searching {
  background: #ffa;
  background: rgba(255, 255, 0, .4);
}

/* IE7 hack to prevent it from returning funny offsetTops on the spans */
.CodeMirror span { *vertical-align: text-bottom; }

@media print {
  /* Hide the cursor when printing */
  .CodeMirror div.CodeMirror-cursor {
    visibility: hidden;
  }
}