##// END OF EJS Templates
diffs: skip lines in diff to allow user selection from diff view.
marcink -
r2738:0de1a44a stable
parent child Browse files
Show More
@@ -1,1141 +1,1142 b''
1 1 // Default styles
2 2
3 3 .diff-collapse {
4 4 margin: @padding 0;
5 5 text-align: right;
6 6 }
7 7
8 8 .diff-container {
9 9 margin-bottom: @space;
10 10
11 11 .diffblock {
12 12 margin-bottom: @space;
13 13 }
14 14
15 15 &.hidden {
16 16 display: none;
17 17 overflow: hidden;
18 18 }
19 19 }
20 20
21 21
22 22 div.diffblock .sidebyside {
23 23 background: #ffffff;
24 24 }
25 25
26 26 div.diffblock {
27 27 overflow-x: auto;
28 28 overflow-y: hidden;
29 29 clear: both;
30 30 padding: 0px;
31 31 background: @grey6;
32 32 border: @border-thickness solid @grey5;
33 33 -webkit-border-radius: @border-radius @border-radius 0px 0px;
34 34 border-radius: @border-radius @border-radius 0px 0px;
35 35
36 36
37 37 .comments-number {
38 38 float: right;
39 39 }
40 40
41 41 // BEGIN CODE-HEADER STYLES
42 42
43 43 .code-header {
44 44 background: @grey6;
45 45 padding: 10px 0 10px 0;
46 46 height: auto;
47 47 width: 100%;
48 48
49 49 .hash {
50 50 float: left;
51 51 padding: 2px 0 0 2px;
52 52 }
53 53
54 54 .date {
55 55 float: left;
56 56 text-transform: uppercase;
57 57 padding: 4px 0px 0px 2px;
58 58 }
59 59
60 60 div {
61 61 margin-left: 4px;
62 62 }
63 63
64 64 div.compare_header {
65 65 min-height: 40px;
66 66 margin: 0;
67 67 padding: 0 @padding;
68 68
69 69 .drop-menu {
70 70 float:left;
71 71 display: block;
72 72 margin:0 0 @padding 0;
73 73 }
74 74
75 75 .compare-label {
76 76 float: left;
77 77 clear: both;
78 78 display: inline-block;
79 79 min-width: 5em;
80 80 margin: 0;
81 81 padding: @button-padding @button-padding @button-padding 0;
82 82 font-family: @text-semibold;
83 83 }
84 84
85 85 .compare-buttons {
86 86 float: left;
87 87 margin: 0;
88 88 padding: 0 0 @padding;
89 89
90 90 .btn {
91 91 margin: 0 @padding 0 0;
92 92 }
93 93 }
94 94 }
95 95
96 96 }
97 97
98 98 .parents {
99 99 float: left;
100 100 width: 100px;
101 101 font-weight: 400;
102 102 vertical-align: middle;
103 103 padding: 0px 2px 0px 2px;
104 104 background-color: @grey6;
105 105
106 106 #parent_link {
107 107 margin: 00px 2px;
108 108
109 109 &.double {
110 110 margin: 0px 2px;
111 111 }
112 112
113 113 &.disabled{
114 114 margin-right: @padding;
115 115 }
116 116 }
117 117 }
118 118
119 119 .children {
120 120 float: right;
121 121 width: 100px;
122 122 font-weight: 400;
123 123 vertical-align: middle;
124 124 text-align: right;
125 125 padding: 0px 2px 0px 2px;
126 126 background-color: @grey6;
127 127
128 128 #child_link {
129 129 margin: 0px 2px;
130 130
131 131 &.double {
132 132 margin: 0px 2px;
133 133 }
134 134
135 135 &.disabled{
136 136 margin-right: @padding;
137 137 }
138 138 }
139 139 }
140 140
141 141 .changeset_header {
142 142 height: 16px;
143 143
144 144 & > div{
145 145 margin-right: @padding;
146 146 }
147 147 }
148 148
149 149 .changeset_file {
150 150 text-align: left;
151 151 float: left;
152 152 padding: 0;
153 153
154 154 a{
155 155 display: inline-block;
156 156 margin-right: 0.5em;
157 157 }
158 158
159 159 #selected_mode{
160 160 margin-left: 0;
161 161 }
162 162 }
163 163
164 164 .diff-menu-wrapper {
165 165 float: left;
166 166 }
167 167
168 168 .diff-menu {
169 169 position: absolute;
170 170 background: none repeat scroll 0 0 #FFFFFF;
171 171 border-color: #003367 @grey3 @grey3;
172 172 border-right: 1px solid @grey3;
173 173 border-style: solid solid solid;
174 174 border-width: @border-thickness;
175 175 box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
176 176 margin-top: 5px;
177 177 margin-left: 1px;
178 178 }
179 179
180 180 .diff-actions, .editor-actions {
181 181 float: left;
182 182
183 183 input{
184 184 margin: 0 0.5em 0 0;
185 185 }
186 186 }
187 187
188 188 // END CODE-HEADER STYLES
189 189
190 190 // BEGIN CODE-BODY STYLES
191 191
192 192 .code-body {
193 193 padding: 0;
194 194 background-color: #ffffff;
195 195 position: relative;
196 196 max-width: none;
197 197 box-sizing: border-box;
198 198 // TODO: johbo: Parent has overflow: auto, this forces the child here
199 199 // to have the intended size and to scroll. Should be simplified.
200 200 width: 100%;
201 201 overflow-x: auto;
202 202 }
203 203
204 204 pre.raw {
205 205 background: white;
206 206 color: @grey1;
207 207 }
208 208 // END CODE-BODY STYLES
209 209
210 210 }
211 211
212 212
213 213 table.code-difftable {
214 214 border-collapse: collapse;
215 215 width: 99%;
216 216 border-radius: 0px !important;
217 217
218 218 td {
219 219 padding: 0 !important;
220 220 background: none !important;
221 221 border: 0 !important;
222 222 }
223 223
224 224 .context {
225 225 background: none repeat scroll 0 0 #DDE7EF;
226 226 }
227 227
228 228 .add {
229 229 background: none repeat scroll 0 0 #DDFFDD;
230 230
231 231 ins {
232 232 background: none repeat scroll 0 0 #AAFFAA;
233 233 text-decoration: none;
234 234 }
235 235 }
236 236
237 237 .del {
238 238 background: none repeat scroll 0 0 #FFDDDD;
239 239
240 240 del {
241 241 background: none repeat scroll 0 0 #FFAAAA;
242 242 text-decoration: none;
243 243 }
244 244 }
245 245
246 246 /** LINE NUMBERS **/
247 247 .lineno {
248 248 padding-left: 2px !important;
249 249 padding-right: 2px;
250 250 text-align: right;
251 251 width: 32px;
252 252 -moz-user-select: none;
253 253 -webkit-user-select: none;
254 254 border-right: @border-thickness solid @grey5 !important;
255 255 border-left: 0px solid #CCC !important;
256 256 border-top: 0px solid #CCC !important;
257 257 border-bottom: none !important;
258 258
259 259 a {
260 260 &:extend(pre);
261 261 text-align: right;
262 262 padding-right: 2px;
263 263 cursor: pointer;
264 264 display: block;
265 265 width: 32px;
266 266 }
267 267 }
268 268
269 269 .context {
270 270 cursor: auto;
271 271 &:extend(pre);
272 272 }
273 273
274 274 .lineno-inline {
275 275 background: none repeat scroll 0 0 #FFF !important;
276 276 padding-left: 2px;
277 277 padding-right: 2px;
278 278 text-align: right;
279 279 width: 30px;
280 280 -moz-user-select: none;
281 281 -webkit-user-select: none;
282 282 }
283 283
284 284 /** CODE **/
285 285 .code {
286 286 display: block;
287 287 width: 100%;
288 288
289 289 td {
290 290 margin: 0;
291 291 padding: 0;
292 292 }
293 293
294 294 pre {
295 295 margin: 0;
296 296 padding: 0;
297 297 margin-left: .5em;
298 298 }
299 299 }
300 300 }
301 301
302 302
303 303 // Comments
304 304
305 305 div.comment:target {
306 306 border-left: 6px solid @comment-highlight-color !important;
307 307 padding-left: 3px;
308 308 margin-left: -9px;
309 309 }
310 310
311 311 //TODO: anderson: can't get an absolute number out of anything, so had to put the
312 312 //current values that might change. But to make it clear I put as a calculation
313 313 @comment-max-width: 1065px;
314 314 @pr-extra-margin: 34px;
315 315 @pr-border-spacing: 4px;
316 316 @pr-comment-width: @comment-max-width - @pr-extra-margin - @pr-border-spacing;
317 317
318 318 // Pull Request
319 319 .cs_files .code-difftable {
320 320 border: @border-thickness solid @grey5; //borders only on PRs
321 321
322 322 .comment-inline-form,
323 323 div.comment {
324 324 width: @pr-comment-width;
325 325 }
326 326 }
327 327
328 328 // Changeset
329 329 .code-difftable {
330 330 .comment-inline-form,
331 331 div.comment {
332 332 width: @comment-max-width;
333 333 }
334 334 }
335 335
336 336 //Style page
337 337 @style-extra-margin: @sidebar-width + (@sidebarpadding * 3) + @padding;
338 338 #style-page .code-difftable{
339 339 .comment-inline-form,
340 340 div.comment {
341 341 width: @comment-max-width - @style-extra-margin;
342 342 }
343 343 }
344 344
345 345 #context-bar > h2 {
346 346 font-size: 20px;
347 347 }
348 348
349 349 #context-bar > h2> a {
350 350 font-size: 20px;
351 351 }
352 352 // end of defaults
353 353
354 354 .file_diff_buttons {
355 355 padding: 0 0 @padding;
356 356
357 357 .drop-menu {
358 358 float: left;
359 359 margin: 0 @padding 0 0;
360 360 }
361 361 .btn {
362 362 margin: 0 @padding 0 0;
363 363 }
364 364 }
365 365
366 366 .code-body.textarea.editor {
367 367 max-width: none;
368 368 padding: 15px;
369 369 }
370 370
371 371 td.injected_diff{
372 372 max-width: 1178px;
373 373 overflow-x: auto;
374 374 overflow-y: hidden;
375 375
376 376 div.diff-container,
377 377 div.diffblock{
378 378 max-width: 100%;
379 379 }
380 380
381 381 div.code-body {
382 382 max-width: 1124px;
383 383 overflow-x: auto;
384 384 overflow-y: hidden;
385 385 padding: 0;
386 386 }
387 387 div.diffblock {
388 388 border: none;
389 389 }
390 390
391 391 &.inline-form {
392 392 width: 99%
393 393 }
394 394 }
395 395
396 396
397 397 table.code-difftable {
398 398 width: 100%;
399 399 }
400 400
401 401 /** PYGMENTS COLORING **/
402 402 div.codeblock {
403 403
404 404 // TODO: johbo: Added interim to get rid of the margin around
405 405 // Select2 widgets. This needs further cleanup.
406 406 margin-top: @padding;
407 407
408 408 overflow: auto;
409 409 padding: 0px;
410 410 border: @border-thickness solid @grey5;
411 411 background: @grey6;
412 412 .border-radius(@border-radius);
413 413
414 414 #remove_gist {
415 415 float: right;
416 416 }
417 417
418 418 .gist_url {
419 419 padding: 0px 0px 10px 0px;
420 420 }
421 421
422 422 .author {
423 423 clear: both;
424 424 vertical-align: middle;
425 425 font-family: @text-bold;
426 426 }
427 427
428 428 .btn-mini {
429 429 float: left;
430 430 margin: 0 5px 0 0;
431 431 }
432 432
433 433 .code-header {
434 434 padding: @padding;
435 435 border-bottom: @border-thickness solid @grey5;
436 436
437 437 .rc-user {
438 438 min-width: 0;
439 439 margin-right: .5em;
440 440 }
441 441
442 442 .stats {
443 443 clear: both;
444 444 margin: 0 0 @padding 0;
445 445 padding: 0;
446 446 .left {
447 447 float: left;
448 448 clear: left;
449 449 max-width: 75%;
450 450 margin: 0 0 @padding 0;
451 451
452 452 &.item {
453 453 margin-right: @padding;
454 454 &.last { border-right: none; }
455 455 }
456 456 }
457 457 .buttons { float: right; }
458 458 .author {
459 459 height: 25px; margin-left: 15px; font-weight: bold;
460 460 }
461 461 }
462 462
463 463 .commit {
464 464 margin: 5px 0 0 26px;
465 465 font-weight: normal;
466 466 white-space: pre-wrap;
467 467 }
468 468 }
469 469
470 470 .message {
471 471 position: relative;
472 472 margin: @padding;
473 473
474 474 .codeblock-label {
475 475 margin: 0 0 1em 0;
476 476 }
477 477 }
478 478
479 479 .code-body {
480 480 padding: @padding;
481 481 background-color: #ffffff;
482 482 min-width: 100%;
483 483 box-sizing: border-box;
484 484 // TODO: johbo: Parent has overflow: auto, this forces the child here
485 485 // to have the intended size and to scroll. Should be simplified.
486 486 width: 100%;
487 487 overflow-x: auto;
488 488
489 489 img.rendered-binary {
490 490 height: auto;
491 491 width: 100%;
492 492 }
493 493 }
494 494 }
495 495
496 496 .code-highlighttable,
497 497 div.codeblock {
498 498
499 499 &.readme {
500 500 background-color: white;
501 501 }
502 502
503 503 .markdown-block table {
504 504 border-collapse: collapse;
505 505
506 506 th,
507 507 td {
508 508 padding: .5em;
509 509 border: @border-thickness solid @border-default-color;
510 510 }
511 511 }
512 512
513 513 table {
514 514 border: 0px;
515 515 margin: 0;
516 516 letter-spacing: normal;
517 517
518 518
519 519 td {
520 520 border: 0px;
521 521 vertical-align: top;
522 522 }
523 523 }
524 524 }
525 525
526 526 div.codeblock .code-header .search-path { padding: 0 0 0 10px; }
527 527 div.search-code-body {
528 528 background-color: #ffffff; padding: 5px 0 5px 10px;
529 529 pre {
530 530 .match { background-color: #faffa6;}
531 531 .break { display: block; width: 100%; background-color: #DDE7EF; color: #747474; }
532 532 }
533 533 .code-highlighttable {
534 534 border-collapse: collapse;
535 535
536 536 tr:hover {
537 537 background: #fafafa;
538 538 }
539 539 td.code {
540 540 padding-left: 10px;
541 541 }
542 542 td.line {
543 543 border-right: 1px solid #ccc !important;
544 544 padding-right: 10px;
545 545 text-align: right;
546 546 font-family: "Lucida Console",Monaco,monospace;
547 547 span {
548 548 white-space: pre-wrap;
549 549 color: #666666;
550 550 }
551 551 }
552 552 }
553 553 }
554 554
555 555 div.annotatediv { margin-left: 2px; margin-right: 4px; }
556 556 .code-highlight {
557 557 margin: 0; padding: 0; border-left: @border-thickness solid @grey5;
558 558 pre, .linenodiv pre { padding: 0 5px; margin: 0; }
559 559 pre div:target {background-color: @comment-highlight-color !important;}
560 560 }
561 561
562 562 .linenos a { text-decoration: none; }
563 563
564 564 .CodeMirror-selected { background: @rchighlightblue; }
565 565 .CodeMirror-focused .CodeMirror-selected { background: @rchighlightblue; }
566 566 .CodeMirror ::selection { background: @rchighlightblue; }
567 567 .CodeMirror ::-moz-selection { background: @rchighlightblue; }
568 568
569 569 .code { display: block; border:0px !important; }
570 570 .code-highlight, /* TODO: dan: merge codehilite into code-highlight */
571 571 .codehilite {
572 572 .hll { background-color: #ffffcc }
573 573 .c { color: #408080; font-style: italic } /* Comment */
574 574 .err, .codehilite .err { border: @border-thickness solid #FF0000 } /* Error */
575 575 .k { color: #008000; font-weight: bold } /* Keyword */
576 576 .o { color: #666666 } /* Operator */
577 577 .cm { color: #408080; font-style: italic } /* Comment.Multiline */
578 578 .cp { color: #BC7A00 } /* Comment.Preproc */
579 579 .c1 { color: #408080; font-style: italic } /* Comment.Single */
580 580 .cs { color: #408080; font-style: italic } /* Comment.Special */
581 581 .gd { color: #A00000 } /* Generic.Deleted */
582 582 .ge { font-style: italic } /* Generic.Emph */
583 583 .gr { color: #FF0000 } /* Generic.Error */
584 584 .gh { color: #000080; font-weight: bold } /* Generic.Heading */
585 585 .gi { color: #00A000 } /* Generic.Inserted */
586 586 .go { color: #808080 } /* Generic.Output */
587 587 .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
588 588 .gs { font-weight: bold } /* Generic.Strong */
589 589 .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
590 590 .gt { color: #0040D0 } /* Generic.Traceback */
591 591 .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
592 592 .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
593 593 .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
594 594 .kp { color: #008000 } /* Keyword.Pseudo */
595 595 .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
596 596 .kt { color: #B00040 } /* Keyword.Type */
597 597 .m { color: #666666 } /* Literal.Number */
598 598 .s { color: #BA2121 } /* Literal.String */
599 599 .na { color: #7D9029 } /* Name.Attribute */
600 600 .nb { color: #008000 } /* Name.Builtin */
601 601 .nc { color: #0000FF; font-weight: bold } /* Name.Class */
602 602 .no { color: #880000 } /* Name.Constant */
603 603 .nd { color: #AA22FF } /* Name.Decorator */
604 604 .ni { color: #999999; font-weight: bold } /* Name.Entity */
605 605 .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
606 606 .nf { color: #0000FF } /* Name.Function */
607 607 .nl { color: #A0A000 } /* Name.Label */
608 608 .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
609 609 .nt { color: #008000; font-weight: bold } /* Name.Tag */
610 610 .nv { color: #19177C } /* Name.Variable */
611 611 .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
612 612 .w { color: #bbbbbb } /* Text.Whitespace */
613 613 .mf { color: #666666 } /* Literal.Number.Float */
614 614 .mh { color: #666666 } /* Literal.Number.Hex */
615 615 .mi { color: #666666 } /* Literal.Number.Integer */
616 616 .mo { color: #666666 } /* Literal.Number.Oct */
617 617 .sb { color: #BA2121 } /* Literal.String.Backtick */
618 618 .sc { color: #BA2121 } /* Literal.String.Char */
619 619 .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
620 620 .s2 { color: #BA2121 } /* Literal.String.Double */
621 621 .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
622 622 .sh { color: #BA2121 } /* Literal.String.Heredoc */
623 623 .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
624 624 .sx { color: #008000 } /* Literal.String.Other */
625 625 .sr { color: #BB6688 } /* Literal.String.Regex */
626 626 .s1 { color: #BA2121 } /* Literal.String.Single */
627 627 .ss { color: #19177C } /* Literal.String.Symbol */
628 628 .bp { color: #008000 } /* Name.Builtin.Pseudo */
629 629 .vc { color: #19177C } /* Name.Variable.Class */
630 630 .vg { color: #19177C } /* Name.Variable.Global */
631 631 .vi { color: #19177C } /* Name.Variable.Instance */
632 632 .il { color: #666666 } /* Literal.Number.Integer.Long */
633 633 }
634 634
635 635 /* customized pre blocks for markdown/rst */
636 636 pre.literal-block, .codehilite pre{
637 637 padding: @padding;
638 638 border: 1px solid @grey6;
639 639 .border-radius(@border-radius);
640 640 background-color: @grey7;
641 641 }
642 642
643 643
644 644 /* START NEW CODE BLOCK CSS */
645 645
646 646 @cb-line-height: 18px;
647 647 @cb-line-code-padding: 10px;
648 648 @cb-text-padding: 5px;
649 649
650 650 @pill-padding: 2px 7px;
651 651
652 652 input.filediff-collapse-state {
653 653 display: none;
654 654
655 655 &:checked + .filediff { /* file diff is collapsed */
656 656 .cb {
657 657 display: none
658 658 }
659 659 .filediff-collapse-indicator {
660 660 width: 0;
661 661 height: 0;
662 662 border-style: solid;
663 663 border-width: 4.5px 0 4.5px 9.3px;
664 664 border-color: transparent transparent transparent #aaa;
665 665 margin: 6px 0px;
666 666 }
667 667 .filediff-menu {
668 668 display: none;
669 669 }
670 670 margin: 10px 0 0 0;
671 671 }
672 672
673 673 &+ .filediff { /* file diff is expanded */
674 674 .filediff-collapse-indicator {
675 675 width: 0;
676 676 height: 0;
677 677 border-style: solid;
678 678 border-width: 9.3px 4.5px 0 4.5px;
679 679 border-color: #aaa transparent transparent transparent;
680 680 margin: 6px 0px;
681 681
682 682 }
683 683 .filediff-menu {
684 684 display: block;
685 685 }
686 686 margin: 10px 0;
687 687 &:nth-child(2) {
688 688 margin: 0;
689 689 }
690 690 }
691 691 }
692 692 .cs_files {
693 693 clear: both;
694 694 }
695 695
696 696 .diffset-menu {
697 697 margin-bottom: 20px;
698 698 }
699 699 .diffset {
700 700 margin: 20px auto;
701 701 .diffset-heading {
702 702 border: 1px solid @grey5;
703 703 margin-bottom: -1px;
704 704 // margin-top: 20px;
705 705 h2 {
706 706 margin: 0;
707 707 line-height: 38px;
708 708 padding-left: 10px;
709 709 }
710 710 .btn {
711 711 margin: 0;
712 712 }
713 713 background: @grey6;
714 714 display: block;
715 715 padding: 5px;
716 716 }
717 717 .diffset-heading-warning {
718 718 background: @alert3-inner;
719 719 border: 1px solid @alert3;
720 720 }
721 721 &.diffset-comments-disabled {
722 722 .cb-comment-box-opener, .comment-inline-form, .cb-comment-add-button {
723 723 display: none !important;
724 724 }
725 725 }
726 726 }
727 727
728 728 .pill {
729 729 display: block;
730 730 float: left;
731 731 padding: @pill-padding;
732 732 }
733 733 .pill-group {
734 734 .pill {
735 735 opacity: .8;
736 736 &:first-child {
737 737 border-radius: @border-radius 0 0 @border-radius;
738 738 }
739 739 &:last-child {
740 740 border-radius: 0 @border-radius @border-radius 0;
741 741 }
742 742 &:only-child {
743 743 border-radius: @border-radius;
744 744 }
745 745 }
746 746 }
747 747
748 748 /* Main comments*/
749 749 #comments {
750 750 .comment-selected {
751 751 border-left: 6px solid @comment-highlight-color;
752 752 padding-left: 3px;
753 753 margin-left: -9px;
754 754 }
755 755 }
756 756
757 757 .filediff {
758 758 border: 1px solid @grey5;
759 759
760 760 /* START OVERRIDES */
761 761 .code-highlight {
762 762 border: none; // TODO: remove this border from the global
763 763 // .code-highlight, it doesn't belong there
764 764 }
765 765 label {
766 766 margin: 0; // TODO: remove this margin definition from global label
767 767 // it doesn't belong there - if margin on labels
768 768 // are needed for a form they should be defined
769 769 // in the form's class
770 770 }
771 771 /* END OVERRIDES */
772 772
773 773 * {
774 774 box-sizing: border-box;
775 775 }
776 776 .filediff-anchor {
777 777 visibility: hidden;
778 778 }
779 779 &:hover {
780 780 .filediff-anchor {
781 781 visibility: visible;
782 782 }
783 783 }
784 784
785 785 .filediff-collapse-indicator {
786 786 border-style: solid;
787 787 float: left;
788 788 margin: 4px 0px 0 0;
789 789 cursor: pointer;
790 790 }
791 791
792 792 .filediff-heading {
793 793 background: @grey7;
794 794 cursor: pointer;
795 795 display: block;
796 796 padding: 5px 10px;
797 797 }
798 798 .filediff-heading:after {
799 799 content: "";
800 800 display: table;
801 801 clear: both;
802 802 }
803 803 .filediff-heading:hover {
804 804 background: #e1e9f4 !important;
805 805 }
806 806
807 807 .filediff-menu {
808 808 float: right;
809 809 text-align: right;
810 810 padding: 5px 5px 5px 0px;
811 811
812 812 &> a,
813 813 &> span {
814 814 padding: 1px;
815 815 }
816 816 }
817 817
818 818 .pill {
819 819 &[op="name"] {
820 820 background: none;
821 821 opacity: 1;
822 822 color: white;
823 823 }
824 824 &[op="limited"] {
825 825 background: @grey2;
826 826 color: white;
827 827 }
828 828 &[op="binary"] {
829 829 background: @color7;
830 830 color: white;
831 831 }
832 832 &[op="modified"] {
833 833 background: @alert1;
834 834 color: white;
835 835 }
836 836 &[op="renamed"] {
837 837 background: @color4;
838 838 color: white;
839 839 }
840 840 &[op="copied"] {
841 841 background: @color4;
842 842 color: white;
843 843 }
844 844 &[op="mode"] {
845 845 background: @grey3;
846 846 color: white;
847 847 }
848 848 &[op="symlink"] {
849 849 background: @color8;
850 850 color: white;
851 851 }
852 852
853 853 &[op="added"] { /* added lines */
854 854 background: @alert1;
855 855 color: white;
856 856 }
857 857 &[op="deleted"] { /* deleted lines */
858 858 background: @alert2;
859 859 color: white;
860 860 }
861 861
862 862 &[op="created"] { /* created file */
863 863 background: @alert1;
864 864 color: white;
865 865 }
866 866 &[op="removed"] { /* deleted file */
867 867 background: @color5;
868 868 color: white;
869 869 }
870 870 }
871 871
872 872 .filediff-collapse-button, .filediff-expand-button {
873 873 cursor: pointer;
874 874 }
875 875 .filediff-collapse-button {
876 876 display: inline;
877 877 }
878 878 .filediff-expand-button {
879 879 display: none;
880 880 }
881 881 .filediff-collapsed .filediff-collapse-button {
882 882 display: none;
883 883 }
884 884 .filediff-collapsed .filediff-expand-button {
885 885 display: inline;
886 886 }
887 887
888 888 /**** COMMENTS ****/
889 889
890 890 .filediff-menu {
891 891 .show-comment-button {
892 892 display: none;
893 893 }
894 894 }
895 895 &.hide-comments {
896 896 .inline-comments {
897 897 display: none;
898 898 }
899 899 .filediff-menu {
900 900 .show-comment-button {
901 901 display: inline;
902 902 }
903 903 .hide-comment-button {
904 904 display: none;
905 905 }
906 906 }
907 907 }
908 908
909 909 .hide-line-comments {
910 910 .inline-comments {
911 911 display: none;
912 912 }
913 913 }
914 914
915 915 /**** END COMMENTS ****/
916 916
917 917 }
918 918
919 919 .filediff-outdated {
920 920 padding: 8px 0;
921 921
922 922 .filediff-heading {
923 923 opacity: .5;
924 924 }
925 925 }
926 926
927 927 table.cb {
928 928 width: 100%;
929 929 border-collapse: collapse;
930 930
931 931 .cb-text {
932 932 padding: @cb-text-padding;
933 933 }
934 934 .cb-hunk {
935 935 padding: @cb-text-padding;
936 936 }
937 937 .cb-expand {
938 938 display: none;
939 939 }
940 940 .cb-collapse {
941 941 display: inline;
942 942 }
943 943 &.cb-collapsed {
944 944 .cb-line {
945 945 display: none;
946 946 }
947 947 .cb-expand {
948 948 display: inline;
949 949 }
950 950 .cb-collapse {
951 951 display: none;
952 952 }
953 953 }
954 954
955 955 /* intentionally general selector since .cb-line-selected must override it
956 956 and they both use !important since the td itself may have a random color
957 957 generated by annotation blocks. TLDR: if you change it, make sure
958 958 annotated block selection and line selection in file view still work */
959 959 .cb-line-fresh .cb-content {
960 960 background: white !important;
961 961 }
962 962 .cb-warning {
963 963 background: #fff4dd;
964 964 }
965 965
966 966 &.cb-diff-sideside {
967 967 td {
968 968 &.cb-content {
969 969 width: 50%;
970 970 }
971 971 }
972 972 }
973 973
974 974 tr {
975 975 &.cb-annotate {
976 976 border-top: 1px solid #eee;
977 977 }
978 978
979 979 &.cb-hunk {
980 980 font-family: @font-family-monospace;
981 981 color: rgba(0, 0, 0, 0.3);
982 982
983 983 td {
984 984 &:first-child {
985 985 background: #edf2f9;
986 986 }
987 987 &:last-child {
988 988 background: #f4f7fb;
989 989 }
990 990 }
991 991 }
992 992 }
993 993
994 994
995 995 td {
996 996 vertical-align: top;
997 997 padding: 0;
998 998
999 999 &.cb-content {
1000 1000 font-size: 12.35px;
1001 1001
1002 1002 &.cb-line-selected .cb-code {
1003 1003 background: @comment-highlight-color !important;
1004 1004 }
1005 1005
1006 1006 span.cb-code {
1007 1007 line-height: @cb-line-height;
1008 1008 padding-left: @cb-line-code-padding;
1009 1009 padding-right: @cb-line-code-padding;
1010 1010 display: block;
1011 1011 white-space: pre-wrap;
1012 1012 font-family: @font-family-monospace;
1013 1013 word-break: break-all;
1014 1014 .nonl {
1015 1015 color: @color5;
1016 1016 }
1017 1017 }
1018 1018
1019 1019 &> button.cb-comment-box-opener {
1020 1020
1021 1021 padding: 2px 2px 1px 3px;
1022 1022 margin-left: -6px;
1023 1023 margin-top: -1px;
1024 1024
1025 1025 border-radius: @border-radius;
1026 1026 position: absolute;
1027 1027 display: none;
1028 1028 }
1029 1029 .cb-comment {
1030 1030 margin-top: 10px;
1031 1031 white-space: normal;
1032 1032 }
1033 1033 }
1034 1034 &:hover {
1035 1035 button.cb-comment-box-opener {
1036 1036 display: block;
1037 1037 }
1038 1038 &+ td button.cb-comment-box-opener {
1039 1039 display: block
1040 1040 }
1041 1041 }
1042 1042
1043 1043 &.cb-data {
1044 1044 text-align: right;
1045 1045 width: 30px;
1046 1046 font-family: @font-family-monospace;
1047 1047
1048 1048 .icon-comment {
1049 1049 cursor: pointer;
1050 1050 }
1051 1051 &.cb-line-selected > div {
1052 1052 display: block;
1053 1053 background: @comment-highlight-color !important;
1054 1054 line-height: @cb-line-height;
1055 1055 color: rgba(0, 0, 0, 0.3);
1056 1056 }
1057 1057 }
1058 1058
1059 1059 &.cb-lineno {
1060 1060 padding: 0;
1061 1061 width: 50px;
1062 1062 color: rgba(0, 0, 0, 0.3);
1063 1063 text-align: right;
1064 1064 border-right: 1px solid #eee;
1065 1065 font-family: @font-family-monospace;
1066 user-select: none;
1066 1067
1067 1068 a::before {
1068 1069 content: attr(data-line-no);
1069 1070 }
1070 1071 &.cb-line-selected a {
1071 1072 background: @comment-highlight-color !important;
1072 1073 }
1073 1074
1074 1075 a {
1075 1076 display: block;
1076 1077 padding-right: @cb-line-code-padding;
1077 1078 padding-left: @cb-line-code-padding;
1078 1079 line-height: @cb-line-height;
1079 1080 color: rgba(0, 0, 0, 0.3);
1080 1081 }
1081 1082 }
1082 1083
1083 1084 &.cb-empty {
1084 1085 background: @grey7;
1085 1086 }
1086 1087
1087 1088 ins {
1088 1089 color: black;
1089 1090 background: #a6f3a6;
1090 1091 text-decoration: none;
1091 1092 }
1092 1093 del {
1093 1094 color: black;
1094 1095 background: #f8cbcb;
1095 1096 text-decoration: none;
1096 1097 }
1097 1098 &.cb-addition {
1098 1099 background: #ecffec;
1099 1100
1100 1101 &.blob-lineno {
1101 1102 background: #ddffdd;
1102 1103 }
1103 1104 }
1104 1105 &.cb-deletion {
1105 1106 background: #ffecec;
1106 1107
1107 1108 &.blob-lineno {
1108 1109 background: #ffdddd;
1109 1110 }
1110 1111 }
1111 1112 &.cb-annotate-message-spacer {
1112 1113 width:8px;
1113 1114 padding: 1px 0px 0px 3px;
1114 1115 }
1115 1116 &.cb-annotate-info {
1116 1117 width: 320px;
1117 1118 min-width: 320px;
1118 1119 max-width: 320px;
1119 1120 padding: 5px 2px;
1120 1121 font-size: 13px;
1121 1122
1122 1123 .cb-annotate-message {
1123 1124 padding: 2px 0px 0px 0px;
1124 1125 white-space: pre-line;
1125 1126 overflow: hidden;
1126 1127 }
1127 1128 .rc-user {
1128 1129 float: none;
1129 1130 padding: 0 6px 0 17px;
1130 1131 min-width: unset;
1131 1132 min-height: unset;
1132 1133 }
1133 1134 }
1134 1135
1135 1136 &.cb-annotate-revision {
1136 1137 cursor: pointer;
1137 1138 text-align: right;
1138 1139 padding: 1px 3px 0px 3px;
1139 1140 }
1140 1141 }
1141 1142 }
General Comments 0
You need to be logged in to leave comments. Login now