Files
@ aa3b55946089
Branch filter:
Location: kallithea/rhodecode/public/css/contextbar.css - annotation
aa3b55946089
10.7 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 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | 87c97fcea029 87c97fcea029 87c97fcea029 87c97fcea029 9bf927589f7a 9bf927589f7a dc4644865e8b dc4644865e8b dc4644865e8b 9bf927589f7a 9bf927589f7a 9bf927589f7a ceb7fdf4588a ceb7fdf4588a fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 93d912ea8cb1 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 87c97fcea029 fc79b3d5beb7 dc4644865e8b dc4644865e8b dc4644865e8b fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 87c97fcea029 87c97fcea029 c65b440540da c65b440540da a8373e8fff51 a8373e8fff51 a8373e8fff51 a8373e8fff51 a8373e8fff51 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 ceb7fdf4588a 7967d00e4692 87c97fcea029 87c97fcea029 9bf927589f7a ceb7fdf4588a 7967d00e4692 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da 87c97fcea029 1c32b72930fa 87c97fcea029 c65b440540da c65b440540da 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 c65b440540da 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da fc79b3d5beb7 fc79b3d5beb7 87c97fcea029 87c97fcea029 9bf927589f7a 9bf927589f7a c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 fc79b3d5beb7 2487fc74c864 c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 c65b440540da c65b440540da 2487fc74c864 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 9bf927589f7a c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 7967d00e4692 87c97fcea029 c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 9bf927589f7a c65b440540da 9bf927589f7a 9bf927589f7a 9bf927589f7a 87c97fcea029 87c97fcea029 87c97fcea029 9bf927589f7a 9bf927589f7a 9bf927589f7a c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da fc79b3d5beb7 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da fc79b3d5beb7 87c97fcea029 87c97fcea029 ceb7fdf4588a c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 ceb7fdf4588a ceb7fdf4588a c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da 87c97fcea029 87c97fcea029 7967d00e4692 c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 fc79b3d5beb7 87c97fcea029 87c97fcea029 9bf927589f7a 87c97fcea029 c65b440540da c65b440540da c65b440540da 87c97fcea029 6ff98871247a 9bf927589f7a 87c97fcea029 fc79b3d5beb7 87c97fcea029 87c97fcea029 b44bb596ddb2 fc79b3d5beb7 9bf927589f7a 9bf927589f7a c65b440540da c65b440540da 9bf927589f7a 9bf927589f7a 9bf927589f7a c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 fc79b3d5beb7 9bf927589f7a c65b440540da 9bf927589f7a 9bf927589f7a 9bf927589f7a c65b440540da 9bf927589f7a 9bf927589f7a 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da 87c97fcea029 9bf927589f7a c5efdafee8fe 9bf927589f7a c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da c65b440540da c65b440540da 87c97fcea029 87c97fcea029 87c97fcea029 c65b440540da 87c97fcea029 87c97fcea029 c65b440540da c65b440540da f0384b9ed5b9 | /**
* Stylesheets for the context bar
*/
#quick .repo_switcher { background-image: url("../images/icons/database.png"); }
#quick .journal { background-image: url("../images/icons/book.png"); }
#quick .gists { background-image: url("../images/icons/note.png"); }
#quick .gists-private { background-image: url("../images/icons/note_error.png"); }
#quick .gists-new { background-image: url("../images/icons/note_add.png"); }
#quick .search { background-image: url("../images/icons/search_16.png"); }
#quick .admin { background-image: url("../images/icons/cog_edit.png"); }
#context-bar a.follow { background-image: url("../images/icons/heart.png"); }
#context-bar a.following { background-image: url("../images/icons/heart_delete.png"); }
#context-bar a.fork { background-image: url("../images/icons/arrow_divide.png"); }
#context-bar a.summary { background-image: url("../images/icons/clipboard_16.png"); }
#context-bar a.changelogs { background-image: url("../images/icons/time.png"); }
#context-bar a.files { background-image: url("../images/icons/file.png"); }
#context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); }
#context-bar a.options { background-image: url("../images/icons/table_gear.png"); }
#context-bar a.forks { background-image: url("../images/icons/arrow_divide.png"); }
#context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); }
#context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); }
#context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); }
#context-bar a.bookmarks { background-image: url("../images/icons/tag_green.png"); }
#context-bar a.settings { background-image: url("../images/icons/cog.png"); }
#context-bar a.search { background-image: url("../images/icons/search_16.png"); }
#context-bar a.admin { background-image: url("../images/icons/cog_edit.png"); }
#context-bar a.journal { background-image: url("../images/icons/book.png"); }
#context-bar a.gists { background-image: url("../images/icons/note.png"); }
#context-bar a.gists-private { background-image: url("../images/icons/note_error.png"); }
#context-bar a.gists-new { background-image: url("../images/icons/note_add.png"); }
#context-bar a.repos { background-image: url("../images/icons/database_edit.png"); }
#context-bar a.repos_groups { background-image: url("../images/icons/database_link.png"); }
#context-bar a.users { background-image: url("../images/icons/user_edit.png"); }
#context-bar a.groups { background-image: url("../images/icons/group_edit.png"); }
#context-bar a.permissions { background-image: url("../images/icons/key.png"); }
#context-bar a.ldap { background-image: url("../images/icons/server_key.png"); }
#context-bar a.defaults { background-image: url("../images/icons/wrench.png"); }
#context-bar a.settings { background-image: url("../images/icons/cog_edit.png"); }
#context-bar a.compare_request { background-image: url('../images/icons/arrow_inout.png')}
#context-bar a.locking_del { background-image: url('../images/icons/lock_delete.png')}
#context-bar a.locking_add { background-image: url('../images/icons/lock_add.png')}
#content #context-bar {
position: relative;
overflow: visible;
background-color: #336699;
border-top: 1px solid #517da8;
border-bottom: 1px solid #003162;
padding: 0 5px;
min-height: 36px;
}
#header #header-inner #quick a,
#content #context-bar,
#content #context-bar a {
color: #FFFFFF;
}
#header #header-inner #quick a:hover,
#content #context-bar a:hover {
text-decoration: none;
}
#content #context-bar .icon {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: text-bottom;
}
ul.horizontal-list {
display: block;
}
ul.horizontal-list > li {
float: left;
position: relative;
}
#header #header-inner #quick ul,
ul.horizontal-list > li ul {
position: absolute;
display: none;
right: 0;
z-index: 999;
}
#header #header-inner #quick li:hover > ul,
ul.horizontal-list li:hover > ul {
display: block;
}
#header #header-inner #quick li ul li,
ul.horizontal-list ul li {
position: relative;
border-bottom: 1px solid rgba(0,0,0,0.1);
border-top: 1px solid rgba(255,255,255,0.1);
}
ul.horizontal-list > li ul ul {
position: absolute;
right: 100%;
top: -1px;
min-width: 200px;
max-height: 400px;
overflow-x: hidden;
overflow-y: auto;
}
#header #header-inner #quick ul a,
ul.horizontal-list li a {
white-space: nowrap;
}
#breadcrumbs {
float: left;
padding: 6px 0 5px 0;
padding-left: 5px;
font-weight: bold;
font-size: 14px;
}
#breadcrumbs span {
font-weight: bold;
font-size: 1.4em;
}
#header #header-inner #quick ul,
#revision-changer,
#context-pages,
#context-pages ul {
background: #3b6998; /* Old browsers */
background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */
background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */
/*Filter on IE will also use overflow:hidden implicitly, and that would clip our inner menus.*/
/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/
}
#header #header-inner #quick a,
#context-actions a,
#context-pages a {
background-repeat: no-repeat;
background-position: 10px 50%;
padding-left: 30px;
}
#quick a,
#context-pages ul ul a {
padding-left: 10px;
}
ul#context-actions {
display: inline-block;
float: right;
border-radius: 4px;
background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%);
}
#content ul#context-actions li {
padding: 0px;
border-right: 1px solid rgba(0,0,0,0.1);
border-left: 1px solid rgba(255,255,255,0.1);
}
#context-actions a {
display: block;
cursor: pointer;
background: none;
border: none;
margin: 0px;
height: auto;
padding: 10px 10px 10px 30px;
background-repeat: no-repeat;
background-position: 10px 50%;
font-size: 1em;
}
#context-actions a {
padding: 11px 10px 12px 30px;
}
#header #header-inner #quick li:hover,
#revision-changer:hover,
#context-pages li:hover,
#context-actions li:hover,
#content #context-actions li:hover,
#header #header-inner #quick li.current,
#context-pages li.current {
background: #6388ad; /* Old browsers */
background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */
/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/
}
#content #context-actions li:first-child {
border-left: none;
border-radius: 4px 0 0px 4px;
}
#content #context-actions li:last-child {
border-right: none;
border-radius: 0 4px 4px 0;
}
#content #context-actions .icon {
margin: auto;
margin-bottom: 5px;
display: block;
clear: both;
float: none;
}
#content #context-pages .follow .show-following,
#content #context-pages .following .show-follow {
display: none;
}
#context-pages {
float: right;
border-left: 1px solid rgba(0,0,0,0.1);
}
#context-pages li.current {
background: #535353; /* Old browsers */
background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */
background: linear-gradient(to bottom, #5d5d5d 0%, #484848 100%); /* W3C */
}
#content #context-pages .icon {
margin-right: 5px;
}
#header #header-inner #quick li,
#content #context-pages li {
border-right: 1px solid rgba(0,0,0,0.1);
border-left: 1px solid rgba(255,255,255,0.1);
padding: 0;
}
#header #header-inner #quick li:last-child,
#content #context-pages li:last-child {
border-right: none;
}
#header #header-inner #quick > li:first-child {
border-left: none;
}
#header #header-inner #quick > li:first-child > a {
border-radius: 4px 0 0 4px;
}
#header #header-inner #quick a,
#context-pages a,
#context-pages .admin_menu a {
display: block;
padding: 0px 10px 1px 30px;
padding-left: 30px;
line-height: 35px;
}
#header #header-inner #quick a.thin,
#context-pages a.thin,
#context-pages .admin_menu a.thin {
line-height: 28px !important;
}
#header #header-inner #quick a#quick_login_link {
padding-left: 0px;
}
#header #header-inner #quick a {
overflow: hidden;
}
#quick a.childs:after,
#revision-changer:before,
#context-pages a.childs:after,
#context-pages a.dropdown:after {
content: ' \25BE';
}
#context-pages a.childs {
padding-right: 30px;
}
#context-pages a.childs:after {
position: absolute;
float: right;
padding-left: 5px;
padding-right: 5px;
}
#revision-changer:before {
position: absolute;
top: 0px;
right: 0px;
border-right: 1px solid rgba(0,0,0,0.1);
height: 25px;
padding-top: 10px;
padding-right: 10px;
}
#context-pages li:last-child a {
padding-right: 10px;
}
#context-bar #revision-changer {
position: relative;
cursor: pointer;
border: none;
padding: 0;
margin: 0;
color: #FFFFFF;
font-size: 0.85em;
padding: 2px 15px;
padding-bottom: 3px;
padding-right: 30px;
border-right: 1px solid rgba(255,255,255,0.1);
}
#revision-changer .branch-name,
#revision-changer .revision {
display: block;
text-align: center;
line-height: 1.5em;
}
#revision-changer .branch-name {
font-weight: bold;
}
#revision-changer .revision {
text-transform: uppercase;
}
|