|
32 | 32 | --codiff-font-sans: |
33 | 33 | Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; |
34 | 34 | --codiff-link: var(--tree-selection-focus); |
| 35 | + --codiff-tree-color-scheme: light; |
35 | 36 | --danger: #a33a3a; |
36 | 37 | --diff-addition: rgb(31 122 68); |
37 | 38 | --diff-deletion: rgb(184 49 47); |
|
60 | 61 | --app-bg: #141414; |
61 | 62 | --code-bg: #1c1c1c; |
62 | 63 | --codiff-link: var(--tree-selection-focus); |
| 64 | + --codiff-tree-color-scheme: dark; |
63 | 65 | --danger: #e07878; |
64 | 66 | --diff-addition: rgb(111 208 148); |
65 | 67 | --diff-deletion: rgb(238 126 126); |
|
82 | 84 | } |
83 | 85 | } |
84 | 86 |
|
85 | | - :root[data-theme='light'] { |
| 87 | + :root[data-theme='light'], |
| 88 | + .app-shell[data-theme='light'], |
| 89 | + .plan-shell[data-theme='light'] { |
86 | 90 | --app-bg: #f8f8f6; |
87 | 91 | --code-bg: #ffffff; |
88 | 92 | --codiff-link: var(--tree-selection-focus); |
| 93 | + --codiff-tree-color-scheme: light; |
89 | 94 | --danger: #a33a3a; |
90 | 95 | --diff-addition: rgb(31 122 68); |
91 | 96 | --diff-deletion: rgb(184 49 47); |
|
107 | 112 | color-scheme: light; |
108 | 113 | } |
109 | 114 |
|
110 | | - :root[data-theme='dark'] { |
| 115 | + :root[data-theme='dark'], |
| 116 | + .app-shell[data-theme='dark'], |
| 117 | + .plan-shell[data-theme='dark'] { |
111 | 118 | --app-bg: #141414; |
112 | 119 | --code-bg: #1c1c1c; |
113 | 120 | --codiff-link: var(--tree-selection-focus); |
| 121 | + --codiff-tree-color-scheme: dark; |
114 | 122 | --danger: #e07878; |
115 | 123 | --diff-addition: rgb(111 208 148); |
116 | 124 | --diff-deletion: rgb(238 126 126); |
@@ -359,7 +367,6 @@ html[data-codiff-platform='darwin'] .plan-header { |
359 | 367 | .plan-comment-add:hover { |
360 | 368 | background: color-mix(in srgb, var(--sidebar-ref) 12%, var(--code-bg)); |
361 | 369 | box-shadow: |
362 | | - 0 0 0 1px rgb(255 255 255 / 0.2) inset, |
363 | 370 | 0 10px 32px -24px rgb(0 0 0 / 0.92), |
364 | 371 | 0 8px 20px -16px rgb(0 0 0 / 0.82); |
365 | 372 | transform: translateY(-2px) scale(1.08); |
@@ -1092,6 +1099,16 @@ html[data-codiff-platform='darwin'] .sidebar { |
1092 | 1099 | opacity: 0.45; |
1093 | 1100 | } |
1094 | 1101 |
|
| 1102 | +.sidebar-settings-bar { |
| 1103 | + align-items: center; |
| 1104 | + border-top: 1px solid var(--sidebar-border); |
| 1105 | + display: flex; |
| 1106 | + flex: none; |
| 1107 | + height: 38px; |
| 1108 | + min-height: 38px; |
| 1109 | + padding: 4px 8px; |
| 1110 | +} |
| 1111 | + |
1095 | 1112 | .sidebar-search { |
1096 | 1113 | -webkit-app-region: no-drag; |
1097 | 1114 | background: rgb(127 127 127 / 0.1); |
@@ -1454,7 +1471,6 @@ html[data-codiff-platform='darwin'] .sidebar { |
1454 | 1471 | .commit-details-copy:hover { |
1455 | 1472 | background: rgb(127 127 127 / 0.11); |
1456 | 1473 | box-shadow: |
1457 | | - 0 0 0 1px rgb(255 255 255 / 0.2) inset, |
1458 | 1474 | 0 10px 32px -24px rgb(0 0 0 / 0.92), |
1459 | 1475 | 0 8px 20px -16px rgb(0 0 0 / 0.82); |
1460 | 1476 | color: var(--sidebar-ref); |
@@ -1720,6 +1736,25 @@ html[data-codiff-platform='darwin'] .sidebar { |
1720 | 1736 | padding: 0 8px 8px 50px; |
1721 | 1737 | } |
1722 | 1738 |
|
| 1739 | +.codiff-source-description-footer-row { |
| 1740 | + align-items: stretch; |
| 1741 | + display: grid; |
| 1742 | + gap: 8px; |
| 1743 | + grid-template-columns: minmax(0, 1fr) minmax(260px, 320px); |
| 1744 | +} |
| 1745 | + |
| 1746 | +.codiff-source-description-footer-main, |
| 1747 | +.codiff-source-description-footer-aside { |
| 1748 | + display: flex; |
| 1749 | + flex-direction: column; |
| 1750 | + min-width: 0; |
| 1751 | +} |
| 1752 | + |
| 1753 | +.codiff-source-description-footer-main > *, |
| 1754 | +.codiff-source-description-footer-aside > * { |
| 1755 | + flex: 1; |
| 1756 | +} |
| 1757 | + |
1723 | 1758 | .source-description-comment-anonymous + .codiff-source-description-footer { |
1724 | 1759 | padding-left: 8px; |
1725 | 1760 | } |
@@ -1778,12 +1813,16 @@ html[data-codiff-platform='darwin'] .sidebar { |
1778 | 1813 | } |
1779 | 1814 |
|
1780 | 1815 | .pull-request-merge-panel { |
1781 | | - display: block; |
| 1816 | + display: flex; |
| 1817 | + flex-direction: column; |
| 1818 | + min-height: 0; |
1782 | 1819 | } |
1783 | 1820 |
|
1784 | 1821 | .pull-request-merge-content { |
1785 | 1822 | display: flex; |
| 1823 | + flex: 1; |
1786 | 1824 | flex-direction: column; |
| 1825 | + min-height: 0; |
1787 | 1826 | min-width: 0; |
1788 | 1827 | } |
1789 | 1828 |
|
@@ -1861,6 +1900,7 @@ html[data-codiff-platform='darwin'] .sidebar { |
1861 | 1900 | .pull-request-merge-controls { |
1862 | 1901 | border-top: 1px solid var(--file-border); |
1863 | 1902 | justify-content: flex-end; |
| 1903 | + margin-top: auto; |
1864 | 1904 | padding: 8px; |
1865 | 1905 | } |
1866 | 1906 |
|
@@ -1917,7 +1957,11 @@ html[data-codiff-platform='darwin'] .sidebar { |
1917 | 1957 | color: var(--text); |
1918 | 1958 | } |
1919 | 1959 |
|
1920 | | -@media (max-width: 760px) { |
| 1960 | +@media (max-width: 1024px) { |
| 1961 | + .codiff-source-description-footer-row { |
| 1962 | + grid-template-columns: minmax(0, 1fr); |
| 1963 | + } |
| 1964 | + |
1921 | 1965 | .pull-request-merge-controls, |
1922 | 1966 | .pull-request-merge-actions { |
1923 | 1967 | justify-content: flex-start; |
@@ -2936,7 +2980,6 @@ html[data-codiff-platform='darwin'] .sidebar { |
2936 | 2980 |
|
2937 | 2981 | .codiff-open-button:hover:not(:disabled) { |
2938 | 2982 | box-shadow: |
2939 | | - 0 0 0 1px rgb(255 255 255 / 0.2) inset, |
2940 | 2983 | 0 10px 32px -24px rgb(0 0 0 / 0.92), |
2941 | 2984 | 0 8px 20px -16px rgb(0 0 0 / 0.82); |
2942 | 2985 | transform: scale(1.05); |
@@ -3178,7 +3221,6 @@ diffs-container .review-comment-thread { |
3178 | 3221 | .review-comment-action:not(:disabled):hover { |
3179 | 3222 | background: rgb(127 127 127 / 0.12); |
3180 | 3223 | box-shadow: |
3181 | | - 0 0 0 1px rgb(255 255 255 / 0.2) inset, |
3182 | 3224 | 0 10px 32px -24px rgb(0 0 0 / 0.92), |
3183 | 3225 | 0 8px 20px -16px rgb(0 0 0 / 0.82); |
3184 | 3226 | transform: scale(1.05); |
@@ -3461,7 +3503,6 @@ diffs-container .review-comment-thread { |
3461 | 3503 |
|
3462 | 3504 | .copy-comments-button:hover { |
3463 | 3505 | box-shadow: |
3464 | | - 0 0 0 1px rgb(255 255 255 / 0.2) inset, |
3465 | 3506 | 0 0 0 1px var(--file-border), |
3466 | 3507 | 0 26px 96px -48px rgb(0 0 0 / 0.92), |
3467 | 3508 | 0 22px 62px -30px rgb(0 0 0 / 0.82), |
@@ -3596,7 +3637,6 @@ diffs-container .review-comment-thread { |
3596 | 3637 |
|
3597 | 3638 | .empty-panel-actions button:hover:not(:disabled) { |
3598 | 3639 | box-shadow: |
3599 | | - 0 0 0 1px rgb(255 255 255 / 0.2) inset, |
3600 | 3640 | 0 10px 32px -24px rgb(0 0 0 / 0.92), |
3601 | 3641 | 0 8px 20px -16px rgb(0 0 0 / 0.82); |
3602 | 3642 | transform: scale(1.05); |
|
0 commit comments