You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

merge.css 3.3KB

2 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119
  1. .CodeMirror-merge {
  2. position: relative;
  3. border: 1px solid #ddd;
  4. white-space: pre;
  5. }
  6. .CodeMirror-merge, .CodeMirror-merge .CodeMirror {
  7. height: 350px;
  8. }
  9. .CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
  10. .CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
  11. .CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
  12. .CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
  13. .CodeMirror-merge-pane {
  14. display: inline-block;
  15. white-space: normal;
  16. vertical-align: top;
  17. }
  18. .CodeMirror-merge-pane-rightmost {
  19. position: absolute;
  20. right: 0px;
  21. z-index: 1;
  22. }
  23. .CodeMirror-merge-gap {
  24. z-index: 2;
  25. display: inline-block;
  26. height: 100%;
  27. -moz-box-sizing: border-box;
  28. box-sizing: border-box;
  29. overflow: hidden;
  30. border-left: 1px solid #ddd;
  31. border-right: 1px solid #ddd;
  32. position: relative;
  33. background: #f8f8f8;
  34. }
  35. .CodeMirror-merge-scrolllock-wrap {
  36. position: absolute;
  37. bottom: 0; left: 50%;
  38. }
  39. .CodeMirror-merge-scrolllock {
  40. position: relative;
  41. left: -50%;
  42. cursor: pointer;
  43. color: #555;
  44. line-height: 1;
  45. }
  46. .CodeMirror-merge-scrolllock:after {
  47. content: "\21db\00a0\00a0\21da";
  48. }
  49. .CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
  50. content: "\21db\21da";
  51. }
  52. .CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
  53. position: absolute;
  54. left: 0; top: 0;
  55. right: 0; bottom: 0;
  56. line-height: 1;
  57. }
  58. .CodeMirror-merge-copy {
  59. position: absolute;
  60. cursor: pointer;
  61. color: #44c;
  62. z-index: 3;
  63. }
  64. .CodeMirror-merge-copy-reverse {
  65. position: absolute;
  66. cursor: pointer;
  67. color: #44c;
  68. }
  69. .CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
  70. .CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
  71. .CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
  72. background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
  73. background-position: bottom left;
  74. background-repeat: repeat-x;
  75. }
  76. .CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
  77. background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
  78. background-position: bottom left;
  79. background-repeat: repeat-x;
  80. }
  81. .CodeMirror-merge-r-chunk { background: #ffffe0; }
  82. .CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
  83. .CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
  84. .CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
  85. .CodeMirror-merge-l-chunk { background: #eef; }
  86. .CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
  87. .CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
  88. .CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
  89. .CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
  90. .CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
  91. .CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
  92. .CodeMirror-merge-collapsed-widget:before {
  93. content: "(...)";
  94. }
  95. .CodeMirror-merge-collapsed-widget {
  96. cursor: pointer;
  97. color: #88b;
  98. background: #eef;
  99. border: 1px solid #ddf;
  100. font-size: 90%;
  101. padding: 0 3px;
  102. border-radius: 4px;
  103. }
  104. .CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }