##// END OF EJS Templates
diffs: seperate visually diff pills for better readability
marcink -
r3103:9bbd1ad2 default
parent child Browse files
Show More
@@ -1,1167 +1,1169 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 @pill-padding-small: 2px 2px 1px 2px;
652 652
653 653 input.filediff-collapse-state {
654 654 display: none;
655 655
656 656 &:checked + .filediff { /* file diff is collapsed */
657 657 .cb {
658 658 display: none
659 659 }
660 660 .filediff-collapse-indicator {
661 661 width: 0;
662 662 height: 0;
663 663 border-style: solid;
664 664 border-width: 4.5px 0 4.5px 9.3px;
665 665 border-color: transparent transparent transparent #aaa;
666 666 margin: 6px 0px;
667 667 }
668 668 .filediff-menu {
669 669 display: none;
670 670 }
671 671 margin: 10px 0 0 0;
672 672 }
673 673
674 674 &+ .filediff { /* file diff is expanded */
675 675 .filediff-collapse-indicator {
676 676 width: 0;
677 677 height: 0;
678 678 border-style: solid;
679 679 border-width: 9.3px 4.5px 0 4.5px;
680 680 border-color: #aaa transparent transparent transparent;
681 681 margin: 6px 0px;
682 682
683 683 }
684 684 .filediff-menu {
685 685 display: block;
686 686 }
687 687 margin: 10px 0;
688 688 &:nth-child(2) {
689 689 margin: 0;
690 690 }
691 691 }
692 692 }
693 693 .cs_files {
694 694 clear: both;
695 695 }
696 696
697 697 .diffset-menu {
698 698 margin-bottom: 20px;
699 699 }
700 700 .diffset {
701 701 margin: 20px auto;
702 702 .diffset-heading {
703 703 border: 1px solid @grey5;
704 704 margin-bottom: -1px;
705 705 // margin-top: 20px;
706 706 h2 {
707 707 margin: 0;
708 708 line-height: 38px;
709 709 padding-left: 10px;
710 710 }
711 711 .btn {
712 712 margin: 0;
713 713 }
714 714 background: @grey6;
715 715 display: block;
716 716 padding: 5px;
717 717 }
718 718 .diffset-heading-warning {
719 719 background: @alert3-inner;
720 720 border: 1px solid @alert3;
721 721 }
722 722 &.diffset-comments-disabled {
723 723 .cb-comment-box-opener, .comment-inline-form, .cb-comment-add-button {
724 724 display: none !important;
725 725 }
726 726 }
727 727 }
728 728
729 729 .filelist {
730 730 .pill {
731 731 display: block;
732 732 float: left;
733 733 padding: @pill-padding-small;
734 734 }
735 735 }
736 736
737 737 .pill {
738 738 display: block;
739 739 float: left;
740 740 padding: @pill-padding;
741 741 }
742 742
743 743 .pill-group {
744 744 .pill {
745 745 opacity: .8;
746 746 &:first-child {
747 747 border-radius: @border-radius 0 0 @border-radius;
748 margin-right: 3px;
748 749 }
749 750 &:last-child {
750 751 border-radius: 0 @border-radius @border-radius 0;
751 752 }
752 753 &:only-child {
753 754 border-radius: @border-radius;
755 margin-right: 0;
754 756 }
755 757 }
756 758 }
757 759
758 760 /* Main comments*/
759 761 #comments {
760 762 .comment-selected {
761 763 border-left: 6px solid @comment-highlight-color;
762 764 padding-left: 3px;
763 765 margin-left: -9px;
764 766 }
765 767 }
766 768
767 769 .filediff {
768 770 border: 1px solid @grey5;
769 771
770 772 /* START OVERRIDES */
771 773 .code-highlight {
772 774 border: none; // TODO: remove this border from the global
773 775 // .code-highlight, it doesn't belong there
774 776 }
775 777 label {
776 778 margin: 0; // TODO: remove this margin definition from global label
777 779 // it doesn't belong there - if margin on labels
778 780 // are needed for a form they should be defined
779 781 // in the form's class
780 782 }
781 783 /* END OVERRIDES */
782 784
783 785 * {
784 786 box-sizing: border-box;
785 787 }
786 788 .filediff-anchor {
787 789 visibility: hidden;
788 790 }
789 791 &:hover {
790 792 .filediff-anchor {
791 793 visibility: visible;
792 794 }
793 795 }
794 796
795 797 .filediff-collapse-indicator {
796 798 border-style: solid;
797 799 float: left;
798 800 margin: 4px 0px 0 0;
799 801 cursor: pointer;
800 802 }
801 803
802 804 .filediff-heading {
803 805 background: @grey7;
804 806 cursor: pointer;
805 807 display: block;
806 808 padding: 5px 10px;
807 809 }
808 810 .filediff-heading:after {
809 811 content: "";
810 812 display: table;
811 813 clear: both;
812 814 }
813 815 .filediff-heading:hover {
814 816 background: #e1e9f4 !important;
815 817 }
816 818
817 819 .filediff-menu {
818 820 float: right;
819 821 text-align: right;
820 822 padding: 5px 5px 5px 0px;
821 823
822 824 &> a,
823 825 &> span {
824 826 padding: 1px;
825 827 }
826 828 }
827 829
828 830 .filediff-collapse-button, .filediff-expand-button {
829 831 cursor: pointer;
830 832 }
831 833 .filediff-collapse-button {
832 834 display: inline;
833 835 }
834 836 .filediff-expand-button {
835 837 display: none;
836 838 }
837 839 .filediff-collapsed .filediff-collapse-button {
838 840 display: none;
839 841 }
840 842 .filediff-collapsed .filediff-expand-button {
841 843 display: inline;
842 844 }
843 845
844 846 /**** COMMENTS ****/
845 847
846 848 .filediff-menu {
847 849 .show-comment-button {
848 850 display: none;
849 851 }
850 852 }
851 853 &.hide-comments {
852 854 .inline-comments {
853 855 display: none;
854 856 }
855 857 .filediff-menu {
856 858 .show-comment-button {
857 859 display: inline;
858 860 }
859 861 .hide-comment-button {
860 862 display: none;
861 863 }
862 864 }
863 865 }
864 866
865 867 .hide-line-comments {
866 868 .inline-comments {
867 869 display: none;
868 870 }
869 871 }
870 872
871 873 /**** END COMMENTS ****/
872 874
873 875 }
874 876
875 877
876 878
877 879 .filediff, .filelist {
878 880 .pill {
879 881 &[op="name"] {
880 882 background: none;
881 883 opacity: 1;
882 884 color: white;
883 885 }
884 886 &[op="limited"] {
885 887 background: @grey2;
886 888 color: white;
887 889 }
888 890 &[op="binary"] {
889 891 background: @color7;
890 892 color: white;
891 893 }
892 894 &[op="modified"] {
893 895 background: @alert1;
894 896 color: white;
895 897 }
896 898 &[op="renamed"] {
897 899 background: @color4;
898 900 color: white;
899 901 }
900 902 &[op="copied"] {
901 903 background: @color4;
902 904 color: white;
903 905 }
904 906 &[op="mode"] {
905 907 background: @grey3;
906 908 color: white;
907 909 }
908 910 &[op="symlink"] {
909 911 background: @color8;
910 912 color: white;
911 913 }
912 914
913 915 &[op="added"] { /* added lines */
914 916 background: @alert1;
915 917 color: white;
916 918 }
917 919 &[op="deleted"] { /* deleted lines */
918 920 background: @alert2;
919 921 color: white;
920 922 }
921 923
922 924 &[op="created"] { /* created file */
923 925 background: @alert1;
924 926 color: white;
925 927 }
926 928 &[op="removed"] { /* deleted file */
927 929 background: @color5;
928 930 color: white;
929 931 }
930 932 }
931 933 }
932 934
933 935
934 936 .filediff-outdated {
935 937 padding: 8px 0;
936 938
937 939 .filediff-heading {
938 940 opacity: .5;
939 941 }
940 942 }
941 943
942 944 table.cb {
943 945 width: 100%;
944 946 border-collapse: collapse;
945 947
946 948 .cb-text {
947 949 padding: @cb-text-padding;
948 950 }
949 951 .cb-hunk {
950 952 padding: @cb-text-padding;
951 953 }
952 954 .cb-expand {
953 955 display: none;
954 956 }
955 957 .cb-collapse {
956 958 display: inline;
957 959 }
958 960 &.cb-collapsed {
959 961 .cb-line {
960 962 display: none;
961 963 }
962 964 .cb-expand {
963 965 display: inline;
964 966 }
965 967 .cb-collapse {
966 968 display: none;
967 969 }
968 970 }
969 971
970 972 /* intentionally general selector since .cb-line-selected must override it
971 973 and they both use !important since the td itself may have a random color
972 974 generated by annotation blocks. TLDR: if you change it, make sure
973 975 annotated block selection and line selection in file view still work */
974 976 .cb-line-fresh .cb-content {
975 977 background: white !important;
976 978 }
977 979 .cb-warning {
978 980 background: #fff4dd;
979 981 }
980 982
981 983 &.cb-diff-sideside {
982 984 td {
983 985 &.cb-content {
984 986 width: 50%;
985 987 }
986 988 }
987 989 }
988 990
989 991 tr {
990 992 &.cb-annotate {
991 993 border-top: 1px solid #eee;
992 994 }
993 995
994 996 &.cb-comment-info {
995 997 border-top: 1px solid #eee;
996 998 color: rgba(0, 0, 0, 0.3);
997 999 background: #edf2f9;
998 1000
999 1001 td {
1000 1002
1001 1003 }
1002 1004 }
1003 1005
1004 1006 &.cb-hunk {
1005 1007 font-family: @font-family-monospace;
1006 1008 color: rgba(0, 0, 0, 0.3);
1007 1009
1008 1010 td {
1009 1011 &:first-child {
1010 1012 background: #edf2f9;
1011 1013 }
1012 1014 &:last-child {
1013 1015 background: #f4f7fb;
1014 1016 }
1015 1017 }
1016 1018 }
1017 1019 }
1018 1020
1019 1021
1020 1022 td {
1021 1023 vertical-align: top;
1022 1024 padding: 0;
1023 1025
1024 1026 &.cb-content {
1025 1027 font-size: 12.35px;
1026 1028
1027 1029 &.cb-line-selected .cb-code {
1028 1030 background: @comment-highlight-color !important;
1029 1031 }
1030 1032
1031 1033 span.cb-code {
1032 1034 line-height: @cb-line-height;
1033 1035 padding-left: @cb-line-code-padding;
1034 1036 padding-right: @cb-line-code-padding;
1035 1037 display: block;
1036 1038 white-space: pre-wrap;
1037 1039 font-family: @font-family-monospace;
1038 1040 word-break: break-all;
1039 1041 .nonl {
1040 1042 color: @color5;
1041 1043 }
1042 1044 }
1043 1045
1044 1046 &> button.cb-comment-box-opener {
1045 1047
1046 1048 padding: 2px 2px 1px 3px;
1047 1049 margin-left: -6px;
1048 1050 margin-top: -1px;
1049 1051
1050 1052 border-radius: @border-radius;
1051 1053 position: absolute;
1052 1054 display: none;
1053 1055 }
1054 1056 .cb-comment {
1055 1057 margin-top: 10px;
1056 1058 white-space: normal;
1057 1059 }
1058 1060 }
1059 1061 &:hover {
1060 1062 button.cb-comment-box-opener {
1061 1063 display: block;
1062 1064 }
1063 1065 &+ td button.cb-comment-box-opener {
1064 1066 display: block
1065 1067 }
1066 1068 }
1067 1069
1068 1070 &.cb-data {
1069 1071 text-align: right;
1070 1072 width: 30px;
1071 1073 font-family: @font-family-monospace;
1072 1074
1073 1075 .icon-comment {
1074 1076 cursor: pointer;
1075 1077 }
1076 1078 &.cb-line-selected > div {
1077 1079 display: block;
1078 1080 background: @comment-highlight-color !important;
1079 1081 line-height: @cb-line-height;
1080 1082 color: rgba(0, 0, 0, 0.3);
1081 1083 }
1082 1084 }
1083 1085
1084 1086 &.cb-lineno {
1085 1087 padding: 0;
1086 1088 width: 50px;
1087 1089 color: rgba(0, 0, 0, 0.3);
1088 1090 text-align: right;
1089 1091 border-right: 1px solid #eee;
1090 1092 font-family: @font-family-monospace;
1091 1093 user-select: none;
1092 1094
1093 1095 a::before {
1094 1096 content: attr(data-line-no);
1095 1097 }
1096 1098 &.cb-line-selected a {
1097 1099 background: @comment-highlight-color !important;
1098 1100 }
1099 1101
1100 1102 a {
1101 1103 display: block;
1102 1104 padding-right: @cb-line-code-padding;
1103 1105 padding-left: @cb-line-code-padding;
1104 1106 line-height: @cb-line-height;
1105 1107 color: rgba(0, 0, 0, 0.3);
1106 1108 }
1107 1109 }
1108 1110
1109 1111 &.cb-empty {
1110 1112 background: @grey7;
1111 1113 }
1112 1114
1113 1115 ins {
1114 1116 color: black;
1115 1117 background: #a6f3a6;
1116 1118 text-decoration: none;
1117 1119 }
1118 1120 del {
1119 1121 color: black;
1120 1122 background: #f8cbcb;
1121 1123 text-decoration: none;
1122 1124 }
1123 1125 &.cb-addition {
1124 1126 background: #ecffec;
1125 1127
1126 1128 &.blob-lineno {
1127 1129 background: #ddffdd;
1128 1130 }
1129 1131 }
1130 1132 &.cb-deletion {
1131 1133 background: #ffecec;
1132 1134
1133 1135 &.blob-lineno {
1134 1136 background: #ffdddd;
1135 1137 }
1136 1138 }
1137 1139 &.cb-annotate-message-spacer {
1138 1140 width:8px;
1139 1141 padding: 1px 0px 0px 3px;
1140 1142 }
1141 1143 &.cb-annotate-info {
1142 1144 width: 320px;
1143 1145 min-width: 320px;
1144 1146 max-width: 320px;
1145 1147 padding: 5px 2px;
1146 1148 font-size: 13px;
1147 1149
1148 1150 .cb-annotate-message {
1149 1151 padding: 2px 0px 0px 0px;
1150 1152 white-space: pre-line;
1151 1153 overflow: hidden;
1152 1154 }
1153 1155 .rc-user {
1154 1156 float: none;
1155 1157 padding: 0 6px 0 17px;
1156 1158 min-width: unset;
1157 1159 min-height: unset;
1158 1160 }
1159 1161 }
1160 1162
1161 1163 &.cb-annotate-revision {
1162 1164 cursor: pointer;
1163 1165 text-align: right;
1164 1166 padding: 1px 3px 0px 3px;
1165 1167 }
1166 1168 }
1167 1169 }
General Comments 0
You need to be logged in to leave comments. Login now