summaryrefslogtreecommitdiffabout
authorJohan Herland <johan@herland.net>2010-06-18 15:56:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 10:20:09 (UTC)
commit47187b33be1c3de43fbed6f350ab05bc978aacd0 (patch) (unidiff)
tree896a454446d2b6f5e19f96a212a2069898b05606
parentc8bc3fc04c9af0fd881fb43b8e540fd93920b851 (diff)
downloadcgit-47187b33be1c3de43fbed6f350ab05bc978aacd0.zip
cgit-47187b33be1c3de43fbed6f350ab05bc978aacd0.tar.gz
cgit-47187b33be1c3de43fbed6f350ab05bc978aacd0.tar.bz2
Fix style of commit-filter links in commit-subject.
When using the commit-filter functionality to add e.g. bug tracker links to commit messages, the style of those links is mangled by a CSS directive that is meant to only apply to decorations that are listed on the commit-subject line. Fix this directive to only apply to the decorations. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css5
1 files changed, 4 insertions, 1 deletions
diff --git a/cgit.css b/cgit.css
index 0cb894a..6198403 100644
--- a/cgit.css
+++ b/cgit.css
@@ -336,372 +336,375 @@ table.diffstat th {
336 text-align: left; 336 text-align: left;
337 text-decoration: underline; 337 text-decoration: underline;
338 padding: 0.1em 1em 0.1em 0.1em; 338 padding: 0.1em 1em 0.1em 0.1em;
339 font-size: 100%; 339 font-size: 100%;
340} 340}
341 341
342table.diffstat td { 342table.diffstat td {
343 padding: 0.2em 0.2em 0.1em 0.1em; 343 padding: 0.2em 0.2em 0.1em 0.1em;
344 font-size: 100%; 344 font-size: 100%;
345 border: none; 345 border: none;
346} 346}
347 347
348table.diffstat td.mode { 348table.diffstat td.mode {
349 white-space: nowrap; 349 white-space: nowrap;
350} 350}
351 351
352table.diffstat td span.modechange { 352table.diffstat td span.modechange {
353 padding-left: 1em; 353 padding-left: 1em;
354 color: red; 354 color: red;
355} 355}
356 356
357table.diffstat td.add a { 357table.diffstat td.add a {
358 color: green; 358 color: green;
359} 359}
360 360
361table.diffstat td.del a { 361table.diffstat td.del a {
362 color: red; 362 color: red;
363} 363}
364 364
365table.diffstat td.upd a { 365table.diffstat td.upd a {
366 color: blue; 366 color: blue;
367} 367}
368 368
369table.diffstat td.graph { 369table.diffstat td.graph {
370 width: 500px; 370 width: 500px;
371 vertical-align: middle; 371 vertical-align: middle;
372} 372}
373 373
374table.diffstat td.graph table { 374table.diffstat td.graph table {
375 border: none; 375 border: none;
376} 376}
377 377
378table.diffstat td.graph td { 378table.diffstat td.graph td {
379 padding: 0px; 379 padding: 0px;
380 border: 0px; 380 border: 0px;
381 height: 7pt; 381 height: 7pt;
382} 382}
383 383
384table.diffstat td.graph td.add { 384table.diffstat td.graph td.add {
385 background-color: #5c5; 385 background-color: #5c5;
386} 386}
387 387
388table.diffstat td.graph td.rem { 388table.diffstat td.graph td.rem {
389 background-color: #c55; 389 background-color: #c55;
390} 390}
391 391
392div.diffstat-summary { 392div.diffstat-summary {
393 color: #888; 393 color: #888;
394 padding-top: 0.5em; 394 padding-top: 0.5em;
395} 395}
396 396
397table.diff { 397table.diff {
398 width: 100%; 398 width: 100%;
399} 399}
400 400
401table.diff td { 401table.diff td {
402 font-family: monospace; 402 font-family: monospace;
403 white-space: pre; 403 white-space: pre;
404} 404}
405 405
406table.diff td div.head { 406table.diff td div.head {
407 font-weight: bold; 407 font-weight: bold;
408 margin-top: 1em; 408 margin-top: 1em;
409 color: black; 409 color: black;
410} 410}
411 411
412table.diff td div.hunk { 412table.diff td div.hunk {
413 color: #009; 413 color: #009;
414} 414}
415 415
416table.diff td div.add { 416table.diff td div.add {
417 color: green; 417 color: green;
418} 418}
419 419
420table.diff td div.del { 420table.diff td div.del {
421 color: red; 421 color: red;
422} 422}
423 423
424.sha1 { 424.sha1 {
425 font-family: monospace; 425 font-family: monospace;
426 font-size: 90%; 426 font-size: 90%;
427} 427}
428 428
429.left { 429.left {
430 text-align: left; 430 text-align: left;
431} 431}
432 432
433.right { 433.right {
434 text-align: right; 434 text-align: right;
435} 435}
436 436
437table.list td.reposection { 437table.list td.reposection {
438 font-style: italic; 438 font-style: italic;
439 color: #888; 439 color: #888;
440} 440}
441 441
442a.button { 442a.button {
443 font-size: 80%; 443 font-size: 80%;
444 padding: 0em 0.5em; 444 padding: 0em 0.5em;
445} 445}
446 446
447a.primary { 447a.primary {
448 font-size: 100%; 448 font-size: 100%;
449} 449}
450 450
451a.secondary { 451a.secondary {
452 font-size: 90%; 452 font-size: 90%;
453} 453}
454 454
455td.toplevel-repo { 455td.toplevel-repo {
456 456
457} 457}
458 458
459table.list td.sublevel-repo { 459table.list td.sublevel-repo {
460 padding-left: 1.5em; 460 padding-left: 1.5em;
461} 461}
462 462
463div.pager { 463div.pager {
464 text-align: center; 464 text-align: center;
465 margin: 1em 0em 0em 0em; 465 margin: 1em 0em 0em 0em;
466} 466}
467 467
468div.pager a { 468div.pager a {
469 color: #777; 469 color: #777;
470 margin: 0em 0.5em; 470 margin: 0em 0.5em;
471} 471}
472 472
473span.age-mins { 473span.age-mins {
474 font-weight: bold; 474 font-weight: bold;
475 color: #080; 475 color: #080;
476} 476}
477 477
478span.age-hours { 478span.age-hours {
479 color: #080; 479 color: #080;
480} 480}
481 481
482span.age-days { 482span.age-days {
483 color: #040; 483 color: #040;
484} 484}
485 485
486span.age-weeks { 486span.age-weeks {
487 color: #444; 487 color: #444;
488} 488}
489 489
490span.age-months { 490span.age-months {
491 color: #888; 491 color: #888;
492} 492}
493 493
494span.age-years { 494span.age-years {
495 color: #bbb; 495 color: #bbb;
496} 496}
497div.footer { 497div.footer {
498 margin-top: 0.5em; 498 margin-top: 0.5em;
499 text-align: center; 499 text-align: center;
500 font-size: 80%; 500 font-size: 80%;
501 color: #ccc; 501 color: #ccc;
502} 502}
503a.branch-deco { 503a.branch-deco {
504 margin: 0px 0.5em; 504 margin: 0px 0.5em;
505 padding: 0px 0.25em; 505 padding: 0px 0.25em;
506 background-color: #88ff88; 506 background-color: #88ff88;
507 border: solid 1px #007700; 507 border: solid 1px #007700;
508} 508}
509a.tag-deco { 509a.tag-deco {
510 margin: 0px 0.5em; 510 margin: 0px 0.5em;
511 padding: 0px 0.25em; 511 padding: 0px 0.25em;
512 background-color: #ffff88; 512 background-color: #ffff88;
513 border: solid 1px #777700; 513 border: solid 1px #777700;
514} 514}
515a.remote-deco { 515a.remote-deco {
516 margin: 0px 0.5em; 516 margin: 0px 0.5em;
517 padding: 0px 0.25em; 517 padding: 0px 0.25em;
518 background-color: #ccccff; 518 background-color: #ccccff;
519 border: solid 1px #000077; 519 border: solid 1px #000077;
520} 520}
521a.deco { 521a.deco {
522 margin: 0px 0.5em; 522 margin: 0px 0.5em;
523 padding: 0px 0.25em; 523 padding: 0px 0.25em;
524 background-color: #ff8888; 524 background-color: #ff8888;
525 border: solid 1px #770000; 525 border: solid 1px #770000;
526} 526}
527 527
528div.commit-subject a { 528div.commit-subject a.branch-deco,
529div.commit-subject a.tag-deco,
530div.commit-subject a.remote-deco,
531div.commit-subject a.deco {
529 margin-left: 1em; 532 margin-left: 1em;
530 font-size: 75%; 533 font-size: 75%;
531} 534}
532 535
533table.stats { 536table.stats {
534 border: solid 1px black; 537 border: solid 1px black;
535 border-collapse: collapse; 538 border-collapse: collapse;
536} 539}
537 540
538table.stats th { 541table.stats th {
539 text-align: left; 542 text-align: left;
540 padding: 1px 0.5em; 543 padding: 1px 0.5em;
541 background-color: #eee; 544 background-color: #eee;
542 border: solid 1px black; 545 border: solid 1px black;
543} 546}
544 547
545table.stats td { 548table.stats td {
546 text-align: right; 549 text-align: right;
547 padding: 1px 0.5em; 550 padding: 1px 0.5em;
548 border: solid 1px black; 551 border: solid 1px black;
549} 552}
550 553
551table.stats td.total { 554table.stats td.total {
552 font-weight: bold; 555 font-weight: bold;
553 text-align: left; 556 text-align: left;
554} 557}
555 558
556table.stats td.sum { 559table.stats td.sum {
557 color: #c00; 560 color: #c00;
558 font-weight: bold; 561 font-weight: bold;
559 /*background-color: #eee; */ 562 /*background-color: #eee; */
560} 563}
561 564
562table.stats td.left { 565table.stats td.left {
563 text-align: left; 566 text-align: left;
564} 567}
565 568
566table.vgraph { 569table.vgraph {
567 border-collapse: separate; 570 border-collapse: separate;
568 border: solid 1px black; 571 border: solid 1px black;
569 height: 200px; 572 height: 200px;
570} 573}
571 574
572table.vgraph th { 575table.vgraph th {
573 background-color: #eee; 576 background-color: #eee;
574 font-weight: bold; 577 font-weight: bold;
575 border: solid 1px white; 578 border: solid 1px white;
576 padding: 1px 0.5em; 579 padding: 1px 0.5em;
577} 580}
578 581
579table.vgraph td { 582table.vgraph td {
580 vertical-align: bottom; 583 vertical-align: bottom;
581 padding: 0px 10px; 584 padding: 0px 10px;
582} 585}
583 586
584table.vgraph div.bar { 587table.vgraph div.bar {
585 background-color: #eee; 588 background-color: #eee;
586} 589}
587 590
588table.hgraph { 591table.hgraph {
589 border: solid 1px black; 592 border: solid 1px black;
590 width: 800px; 593 width: 800px;
591} 594}
592 595
593table.hgraph th { 596table.hgraph th {
594 background-color: #eee; 597 background-color: #eee;
595 font-weight: bold; 598 font-weight: bold;
596 border: solid 1px black; 599 border: solid 1px black;
597 padding: 1px 0.5em; 600 padding: 1px 0.5em;
598} 601}
599 602
600table.hgraph td { 603table.hgraph td {
601 vertical-align: center; 604 vertical-align: center;
602 padding: 2px 2px; 605 padding: 2px 2px;
603} 606}
604 607
605table.hgraph div.bar { 608table.hgraph div.bar {
606 background-color: #eee; 609 background-color: #eee;
607 height: 1em; 610 height: 1em;
608} 611}
609 612
610table.ssdiff { 613table.ssdiff {
611 width: 100%; 614 width: 100%;
612} 615}
613 616
614table.ssdiff td { 617table.ssdiff td {
615 font-size: 75%; 618 font-size: 75%;
616 font-family: monospace; 619 font-family: monospace;
617 white-space: pre; 620 white-space: pre;
618 padding: 1px 4px 1px 4px; 621 padding: 1px 4px 1px 4px;
619 border-left: solid 1px #aaa; 622 border-left: solid 1px #aaa;
620 border-right: solid 1px #aaa; 623 border-right: solid 1px #aaa;
621} 624}
622 625
623table.ssdiff td.add { 626table.ssdiff td.add {
624 color: black; 627 color: black;
625 background: #cfc; 628 background: #cfc;
626 min-width: 50%; 629 min-width: 50%;
627} 630}
628 631
629table.ssdiff td.add_dark { 632table.ssdiff td.add_dark {
630 color: black; 633 color: black;
631 background: #aca; 634 background: #aca;
632 min-width: 50%; 635 min-width: 50%;
633} 636}
634 637
635table.ssdiff span.add { 638table.ssdiff span.add {
636 background: #cfc; 639 background: #cfc;
637 font-weight: bold; 640 font-weight: bold;
638} 641}
639 642
640table.ssdiff td.del { 643table.ssdiff td.del {
641 color: black; 644 color: black;
642 background: #fcc; 645 background: #fcc;
643 min-width: 50%; 646 min-width: 50%;
644} 647}
645 648
646table.ssdiff td.del_dark { 649table.ssdiff td.del_dark {
647 color: black; 650 color: black;
648 background: #caa; 651 background: #caa;
649 min-width: 50%; 652 min-width: 50%;
650} 653}
651 654
652table.ssdiff span.del { 655table.ssdiff span.del {
653 background: #fcc; 656 background: #fcc;
654 font-weight: bold; 657 font-weight: bold;
655} 658}
656 659
657table.ssdiff td.changed { 660table.ssdiff td.changed {
658 color: black; 661 color: black;
659 background: #ffc; 662 background: #ffc;
660 min-width: 50%; 663 min-width: 50%;
661} 664}
662 665
663table.ssdiff td.changed_dark { 666table.ssdiff td.changed_dark {
664 color: black; 667 color: black;
665 background: #cca; 668 background: #cca;
666 min-width: 50%; 669 min-width: 50%;
667} 670}
668 671
669table.ssdiff td.lineno { 672table.ssdiff td.lineno {
670 color: black; 673 color: black;
671 background: #eee; 674 background: #eee;
672 text-align: right; 675 text-align: right;
673 width: 3em; 676 width: 3em;
674 min-width: 3em; 677 min-width: 3em;
675} 678}
676 679
677table.ssdiff td.hunk { 680table.ssdiff td.hunk {
678 color: #black; 681 color: #black;
679 background: #ccf; 682 background: #ccf;
680 border-top: solid 1px #aaa; 683 border-top: solid 1px #aaa;
681 border-bottom: solid 1px #aaa; 684 border-bottom: solid 1px #aaa;
682} 685}
683 686
684table.ssdiff td.head { 687table.ssdiff td.head {
685 border-top: solid 1px #aaa; 688 border-top: solid 1px #aaa;
686 border-bottom: solid 1px #aaa; 689 border-bottom: solid 1px #aaa;
687} 690}
688 691
689table.ssdiff td.head div.head { 692table.ssdiff td.head div.head {
690 font-weight: bold; 693 font-weight: bold;
691 color: black; 694 color: black;
692} 695}
693 696
694table.ssdiff td.foot { 697table.ssdiff td.foot {
695 border-top: solid 1px #aaa; 698 border-top: solid 1px #aaa;
696 border-left: none; 699 border-left: none;
697 border-right: none; 700 border-right: none;
698 border-bottom: none; 701 border-bottom: none;
699} 702}
700 703
701table.ssdiff td.space { 704table.ssdiff td.space {
702 border: none; 705 border: none;
703} 706}
704 707
705table.ssdiff td.space div { 708table.ssdiff td.space div {
706 min-height: 3em; 709 min-height: 3em;
707} \ No newline at end of file 710} \ No newline at end of file