Files
@ aa3b55946089
Branch filter:
Location: kallithea/rhodecode/public/css/pygments.css
aa3b55946089
7.5 KiB
text/css
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
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
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | div.codeblock {
overflow: auto;
padding: 0px;
border: 1px solid #ccc;
background: #f8f8f8;
font-size: 100%;
line-height: 100%;
/* new */
line-height: 125%;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
div.codeblock .code-header {
border-bottom: 1px solid #CCCCCC;
background: #EEEEEE;
padding: 10px 0 5px 0;
}
div.codeblock .code-header .stats {
clear: both;
padding: 2px 8px 2px 14px;
border-bottom: 1px solid rgb(204, 204, 204);
height: 23px;
margin-bottom: 6px;
}
div.codeblock .code-header .stats .left {
float: left;
}
div.codeblock .code-header .stats .left.img {
margin-top: -2px;
}
div.codeblock .code-header .stats .left.item {
float: left;
padding: 0 9px 0 9px;
border-right: 1px solid #ccc;
}
div.codeblock .code-header .stats .left.item pre {
}
div.codeblock .code-header .stats .left.item.last {
border-right: none;
}
div.codeblock .code-header .stats .buttons {
float: right;
padding-right: 4px;
}
div.codeblock .code-header .author {
margin-left: 15px;
font-weight: bold;
height: 25px;
}
div.codeblock .code-header .author .user {
padding-top: 3px;
}
div.codeblock .code-header .commit {
margin-left: 15px;
font-weight: normal;
white-space: pre;
}
.code-highlighttable,
div.codeblock .code-body table {
width: 0 !important;
border: 0px !important;
}
.code-highlighttable,
div.codeblock .code-body table td {
border: 0px !important;
}
div.code-body {
background-color: #FFFFFF;
}
div.codeblock .code-header .search-path {
padding: 0px 0px 0px 10px;
}
div.search-code-body {
background-color: #FFFFFF;
padding: 5px 0px 5px 10px;
}
div.search-code-body pre .match {
background-color: #FAFFA6;
}
div.search-code-body pre .break {
background-color: #DDE7EF;
width: 100%;
color: #747474;
display: block;
}
div.annotatediv {
margin-left: 2px;
margin-right: 4px;
}
.code-highlight {
padding: 0px;
margin-top: 5px;
margin-bottom: 5px;
border-left: 1px solid #ccc;
}
.code-highlight pre, .linenodiv pre {
padding: 5px 2px 0px 5px;
margin: 0;
}
.code-highlight pre div:target {
background-color: #FFFFBE !important;
}
.linenos { padding: 0px !important; border:0px !important;}
.linenos a { text-decoration: none; }
.code { display: block; border:0px !important; }
.code-highlight .hll, .codehilite .hll { background-color: #ffffcc }
.code-highlight .c, .codehilite .c { color: #408080; font-style: italic } /* Comment */
.code-highlight .err, .codehilite .err { border: 1px solid #FF0000 } /* Error */
.code-highlight .k, .codehilite .k { color: #008000; font-weight: bold } /* Keyword */
.code-highlight .o, .codehilite .o { color: #666666 } /* Operator */
.code-highlight .cm, .codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */
.code-highlight .cp, .codehilite .cp { color: #BC7A00 } /* Comment.Preproc */
.code-highlight .c1, .codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */
.code-highlight .cs, .codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */
.code-highlight .gd, .codehilite .gd { color: #A00000 } /* Generic.Deleted */
.code-highlight .ge, .codehilite .ge { font-style: italic } /* Generic.Emph */
.code-highlight .gr, .codehilite .gr { color: #FF0000 } /* Generic.Error */
.code-highlight .gh, .codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
.code-highlight .gi, .codehilite .gi { color: #00A000 } /* Generic.Inserted */
.code-highlight .go, .codehilite .go { color: #808080 } /* Generic.Output */
.code-highlight .gp, .codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
.code-highlight .gs, .codehilite .gs { font-weight: bold } /* Generic.Strong */
.code-highlight .gu, .codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
.code-highlight .gt, .codehilite .gt { color: #0040D0 } /* Generic.Traceback */
.code-highlight .kc, .codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
.code-highlight .kd, .codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
.code-highlight .kn, .codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
.code-highlight .kp, .codehilite .kp { color: #008000 } /* Keyword.Pseudo */
.code-highlight .kr, .codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
.code-highlight .kt, .codehilite .kt { color: #B00040 } /* Keyword.Type */
.code-highlight .m, .codehilite .m { color: #666666 } /* Literal.Number */
.code-highlight .s, .codehilite .s { color: #BA2121 } /* Literal.String */
.code-highlight .na, .codehilite .na { color: #7D9029 } /* Name.Attribute */
.code-highlight .nb, .codehilite .nb { color: #008000 } /* Name.Builtin */
.code-highlight .nc, .codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
.code-highlight .no, .codehilite .no { color: #880000 } /* Name.Constant */
.code-highlight .nd, .codehilite .nd { color: #AA22FF } /* Name.Decorator */
.code-highlight .ni, .codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */
.code-highlight .ne, .codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
.code-highlight .nf, .codehilite .nf { color: #0000FF } /* Name.Function */
.code-highlight .nl, .codehilite .nl { color: #A0A000 } /* Name.Label */
.code-highlight .nn, .codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
.code-highlight .nt, .codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
.code-highlight .nv, .codehilite .nv { color: #19177C } /* Name.Variable */
.code-highlight .ow, .codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
.code-highlight .w, .codehilite .w { color: #bbbbbb } /* Text.Whitespace */
.code-highlight .mf, .codehilite .mf { color: #666666 } /* Literal.Number.Float */
.code-highlight .mh, .codehilite .mh { color: #666666 } /* Literal.Number.Hex */
.code-highlight .mi, .codehilite .mi { color: #666666 } /* Literal.Number.Integer */
.code-highlight .mo, .codehilite .mo { color: #666666 } /* Literal.Number.Oct */
.code-highlight .sb, .codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
.code-highlight .sc, .codehilite .sc { color: #BA2121 } /* Literal.String.Char */
.code-highlight .sd, .codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
.code-highlight .s2, .codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
.code-highlight .se, .codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
.code-highlight .sh, .codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
.code-highlight .si, .codehilite .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
.code-highlight .sx, .codehilite .sx { color: #008000 } /* Literal.String.Other */
.code-highlight .sr, .codehilite .sr { color: #BB6688 } /* Literal.String.Regex */
.code-highlight .s1, .codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
.code-highlight .ss, .codehilite .ss { color: #19177C } /* Literal.String.Symbol */
.code-highlight .bp, .codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
.code-highlight .vc, .codehilite .vc { color: #19177C } /* Name.Variable.Class */
.code-highlight .vg, .codehilite .vg { color: #19177C } /* Name.Variable.Global */
.code-highlight .vi, .codehilite .vi { color: #19177C } /* Name.Variable.Instance */
.code-highlight .il, .codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
|