Revert "Add version control system functionality with branch management, history tracking, and merge operations"

This reverts commit f3d28817a5.
This commit is contained in:
pacnpal
2025-02-08 17:37:30 -05:00
parent 03f9df4bab
commit 71b73522ae
125 changed files with 617 additions and 15830 deletions

View File

@@ -1,332 +0,0 @@
/* Approval Panel Styles */
.approval-panel {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 0.5rem;
overflow: hidden;
}
.approval-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 1rem;
border-bottom: 1px solid #e5e7eb;
background: #f9fafb;
}
.approval-title {
font-size: 1.125rem;
font-weight: 600;
color: #111827;
margin: 0;
}
.approval-status {
display: inline-flex;
align-items: center;
padding: 0.25rem 0.75rem;
border-radius: 9999px;
font-size: 0.875rem;
font-weight: 500;
}
/* Status Colors */
.status-draft {
background-color: #f3f4f6;
color: #6b7280;
}
.status-pending {
background-color: #fef3c7;
color: #92400e;
}
.status-approved {
background-color: #dcfce7;
color: #166534;
}
.status-rejected {
background-color: #fee2e2;
color: #991b1b;
}
.status-applied {
background-color: #dbeafe;
color: #1e40af;
}
.status-failed {
background-color: #fee2e2;
color: #991b1b;
}
.status-reverted {
background-color: #f3f4f6;
color: #6b7280;
}
/* Stages */
.approval-stages {
padding: 1rem;
}
.approval-stage {
border: 1px solid #e5e7eb;
border-radius: 0.375rem;
margin-bottom: 1rem;
overflow: hidden;
}
.approval-stage:last-child {
margin-bottom: 0;
}
.stage-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.75rem 1rem;
background: #f9fafb;
border-bottom: 1px solid #e5e7eb;
}
.stage-name {
font-weight: 500;
color: #374151;
}
.stage-status {
font-size: 0.875rem;
font-weight: 500;
}
.stage-status.pending {
color: #92400e;
}
.stage-status.approved {
color: #166534;
}
.stage-status.rejected {
color: #991b1b;
}
.stage-details {
padding: 1rem;
}
.required-roles {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
margin-bottom: 1rem;
}
.role-badge {
background: #f3f4f6;
color: #4b5563;
padding: 0.25rem 0.5rem;
border-radius: 0.25rem;
font-size: 0.75rem;
font-weight: 500;
}
/* Approvers */
.approvers-list {
display: flex;
flex-direction: column;
gap: 0.75rem;
}
.approver {
padding: 0.75rem;
background: #f9fafb;
border-radius: 0.375rem;
}
.approver-info {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 0.5rem;
}
.approver-name {
font-weight: 500;
color: #374151;
}
.approval-date {
font-size: 0.75rem;
color: #6b7280;
}
.approver-decision {
font-size: 0.875rem;
font-weight: 500;
margin-bottom: 0.5rem;
}
.approver-decision.approved {
color: #166534;
}
.approver-decision.rejected {
color: #991b1b;
}
.approver-comment {
font-size: 0.875rem;
color: #4b5563;
padding: 0.5rem;
background: #fff;
border-radius: 0.25rem;
}
/* Approval Actions */
.approval-actions {
padding: 1rem;
border-top: 1px solid #e5e7eb;
background: #f9fafb;
}
.approval-comment {
width: 100%;
min-height: 5rem;
padding: 0.75rem;
margin-bottom: 1rem;
border: 1px solid #d1d5db;
border-radius: 0.375rem;
resize: vertical;
font-size: 0.875rem;
}
.approval-comment:focus {
outline: none;
border-color: #3b82f6;
ring: 2px solid rgba(59, 130, 246, 0.5);
}
.action-buttons {
display: flex;
justify-content: flex-end;
gap: 0.75rem;
}
.approve-button,
.reject-button {
padding: 0.5rem 1rem;
border-radius: 0.375rem;
font-size: 0.875rem;
font-weight: 500;
cursor: pointer;
transition: all 0.2s;
}
.approve-button {
background-color: #059669;
color: white;
}
.approve-button:hover {
background-color: #047857;
}
.reject-button {
background-color: #dc2626;
color: white;
}
.reject-button:hover {
background-color: #b91c1c;
}
/* History */
.approval-history {
padding: 1rem;
border-top: 1px solid #e5e7eb;
}
.approval-history-list {
display: flex;
flex-direction: column;
gap: 1rem;
}
.history-entry {
padding: 0.75rem;
background: #f9fafb;
border-radius: 0.375rem;
}
.entry-header {
display: flex;
justify-content: space-between;
margin-bottom: 0.5rem;
}
.entry-user {
font-weight: 500;
color: #374151;
}
.entry-date {
font-size: 0.75rem;
color: #6b7280;
}
.entry-action {
font-size: 0.875rem;
margin-bottom: 0.5rem;
}
.entry-action.submit {
color: #6b7280;
}
.entry-action.approve {
color: #166534;
}
.entry-action.reject {
color: #991b1b;
}
.entry-action.revert {
color: #4b5563;
}
.entry-comment {
font-size: 0.875rem;
color: #4b5563;
padding: 0.5rem;
background: #fff;
border-radius: 0.25rem;
}
/* Responsive Design */
@media (max-width: 640px) {
.approval-header {
flex-direction: column;
align-items: flex-start;
gap: 0.5rem;
}
.action-buttons {
flex-direction: column;
}
.approve-button,
.reject-button {
width: 100%;
}
.approver-info {
flex-direction: column;
align-items: flex-start;
}
}

View File

@@ -1,195 +0,0 @@
/* Diff Viewer Styles */
.diff-viewer {
font-family: ui-monospace, monospace;
margin: 1rem 0;
border: 1px solid #e5e7eb;
border-radius: 0.375rem;
overflow: hidden;
background: #fff;
}
.diff-viewer.side-by-side .diff-blocks {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 1px;
background: #e5e7eb;
}
.diff-header {
padding: 1rem;
border-bottom: 1px solid #e5e7eb;
background: #f9fafb;
}
.diff-metadata {
display: flex;
gap: 1rem;
font-size: 0.875rem;
color: #4b5563;
}
.diff-controls {
margin-top: 0.5rem;
display: flex;
gap: 0.5rem;
}
.diff-controls button {
padding: 0.25rem 0.75rem;
border: 1px solid #d1d5db;
border-radius: 0.25rem;
background: #fff;
font-size: 0.875rem;
color: #374151;
cursor: pointer;
transition: all 0.2s;
}
.diff-controls button:hover {
background: #f3f4f6;
}
.diff-section {
border-bottom: 1px solid #e5e7eb;
}
.diff-field-header {
padding: 0.5rem 1rem;
background: #f9fafb;
border-bottom: 1px solid #e5e7eb;
font-weight: 500;
cursor: pointer;
}
.diff-field-header .syntax-type {
font-size: 0.75rem;
color: #6b7280;
margin-left: 0.5rem;
}
.diff-block {
display: grid;
grid-template-columns: auto 1fr;
background: #fff;
}
.line-numbers {
padding: 0.5rem;
background: #f9fafb;
border-right: 1px solid #e5e7eb;
text-align: right;
color: #6b7280;
user-select: none;
}
.line-number {
display: block;
padding: 0 0.5rem;
font-size: 0.875rem;
}
.diff-block pre {
margin: 0;
padding: 0.5rem;
overflow-x: auto;
}
.diff-block code {
font-family: ui-monospace, monospace;
font-size: 0.875rem;
line-height: 1.5;
}
/* Inline diff styles */
.diff-removed {
background-color: #fee2e2;
text-decoration: line-through;
color: #991b1b;
}
.diff-added {
background-color: #dcfce7;
color: #166534;
}
/* Syntax highlighting */
.language-json .json-key {
color: #059669;
}
.language-python .keyword {
color: #7c3aed;
}
.language-python .string {
color: #059669;
}
.language-python .comment {
color: #6b7280;
font-style: italic;
}
/* Comment threads */
.comment-thread {
border-top: 1px solid #e5e7eb;
padding: 1rem;
background: #f9fafb;
}
.comment {
margin-bottom: 1rem;
padding: 0.5rem;
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 0.25rem;
}
.comment:last-child {
margin-bottom: 0;
}
.comment-header {
display: flex;
justify-content: space-between;
font-size: 0.75rem;
color: #6b7280;
margin-bottom: 0.25rem;
}
.comment-content {
font-size: 0.875rem;
color: #374151;
}
/* Navigation */
.diff-navigation {
padding: 1rem;
display: flex;
justify-content: space-between;
align-items: center;
border-top: 1px solid #e5e7eb;
background: #f9fafb;
}
.position-indicator {
font-size: 0.875rem;
color: #6b7280;
}
/* Collapsed state */
.diff-section.collapsed .diff-blocks {
display: none;
}
/* Performance warning */
.performance-warning {
padding: 0.5rem;
background: #fffbeb;
border: 1px solid #fcd34d;
color: #92400e;
font-size: 0.875rem;
margin: 0.5rem 1rem;
border-radius: 0.25rem;
}

View File

@@ -1,229 +0,0 @@
/* Inline Comment Panel Styles */
.comment-panel {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 0.5rem;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
margin: 1rem 0;
}
.comment-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.75rem 1rem;
border-bottom: 1px solid #e5e7eb;
background: #f9fafb;
}
.thread-info {
display: flex;
align-items: center;
gap: 0.75rem;
}
.anchor-info {
font-family: ui-monospace, monospace;
font-size: 0.875rem;
color: #4b5563;
}
.resolution-badge {
display: inline-flex;
align-items: center;
gap: 0.25rem;
padding: 0.25rem 0.5rem;
background: #dcfce7;
color: #166534;
border-radius: 9999px;
font-size: 0.75rem;
font-weight: 500;
}
.resolve-button {
padding: 0.375rem 0.75rem;
background: #059669;
color: white;
border-radius: 0.375rem;
font-size: 0.875rem;
font-weight: 500;
transition: all 0.2s;
}
.resolve-button:hover {
background: #047857;
}
.comments-container {
padding: 1rem;
}
.comment {
margin-bottom: 1rem;
padding-bottom: 1rem;
border-bottom: 1px solid #e5e7eb;
}
.comment:last-child {
margin-bottom: 0;
padding-bottom: 0;
border-bottom: none;
}
.comment.reply {
margin-left: 2rem;
padding: 0.75rem;
background: #f9fafb;
border-radius: 0.375rem;
border: none;
}
.comment-author {
display: flex;
align-items: center;
gap: 0.5rem;
margin-bottom: 0.5rem;
}
.author-avatar {
width: 2rem;
height: 2rem;
border-radius: 9999px;
}
.author-name {
font-weight: 500;
color: #111827;
}
.comment-date {
font-size: 0.75rem;
color: #6b7280;
}
.comment-content {
font-size: 0.875rem;
line-height: 1.5;
color: #374151;
margin-bottom: 0.5rem;
}
.comment-content .mention {
color: #2563eb;
font-weight: 500;
}
.comment-content a {
color: #2563eb;
text-decoration: none;
}
.comment-content a:hover {
text-decoration: underline;
}
.comment-actions {
display: flex;
gap: 0.75rem;
}
.action-button {
font-size: 0.75rem;
color: #6b7280;
background: none;
border: none;
padding: 0;
cursor: pointer;
transition: color 0.2s;
}
.action-button:hover {
color: #374151;
}
.reply-form {
padding: 1rem;
border-top: 1px solid #e5e7eb;
background: #f9fafb;
}
.reply-form.nested {
margin-top: 0.75rem;
padding: 0.75rem;
border: 1px solid #e5e7eb;
border-radius: 0.375rem;
}
.reply-input,
.edit-input {
width: 100%;
padding: 0.5rem;
border: 1px solid #d1d5db;
border-radius: 0.375rem;
font-size: 0.875rem;
resize: vertical;
margin-bottom: 0.5rem;
}
.reply-input:focus,
.edit-input:focus {
outline: none;
border-color: #3b82f6;
ring: 2px solid rgba(59, 130, 246, 0.5);
}
.form-actions {
display: flex;
justify-content: flex-end;
gap: 0.5rem;
}
.reply-button,
.save-button {
padding: 0.375rem 0.75rem;
background: #3b82f6;
color: white;
border-radius: 0.375rem;
font-size: 0.875rem;
font-weight: 500;
transition: all 0.2s;
}
.reply-button:hover,
.save-button:hover {
background: #2563eb;
}
.cancel-button {
padding: 0.375rem 0.75rem;
background: #fff;
color: #4b5563;
border: 1px solid #d1d5db;
border-radius: 0.375rem;
font-size: 0.875rem;
font-weight: 500;
transition: all 0.2s;
}
.cancel-button:hover {
background: #f3f4f6;
}
/* Responsive Design */
@media (max-width: 640px) {
.comment.reply {
margin-left: 1rem;
}
.comment-header {
flex-direction: column;
align-items: flex-start;
gap: 0.5rem;
}
.resolve-button {
width: 100%;
text-align: center;
}
}

View File

@@ -1,353 +0,0 @@
/* Version Comparison Tool Styles */
.version-comparison-tool {
background: #fff;
border: 1px solid #e5e7eb;
border-radius: 0.5rem;
overflow: hidden;
}
/* Header Styles */
.comparison-header {
padding: 1rem;
border-bottom: 1px solid #e5e7eb;
background: #f9fafb;
}
.comparison-header h3 {
margin: 0 0 1rem 0;
font-size: 1.125rem;
font-weight: 600;
color: #111827;
}
.selected-versions {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
margin-bottom: 1rem;
}
.selected-version {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.375rem 0.75rem;
background: #f3f4f6;
border-radius: 0.375rem;
font-size: 0.875rem;
}
.version-label {
font-weight: 500;
color: #374151;
}
.version-value {
color: #4b5563;
}
.remove-version {
border: none;
background: none;
color: #6b7280;
cursor: pointer;
padding: 0.125rem 0.25rem;
font-size: 1rem;
line-height: 1;
}
.remove-version:hover {
color: #ef4444;
}
/* Timeline Styles */
.version-timeline {
position: relative;
padding: 2rem 1rem;
overflow-x: auto;
cursor: grab;
user-select: none;
}
.version-timeline.active {
cursor: grabbing;
}
.timeline-track {
position: relative;
height: 2px;
background: #e5e7eb;
margin: 0 2rem;
}
.timeline-point {
position: absolute;
top: 50%;
transform: translate(-50%, -50%);
cursor: pointer;
}
.timeline-point::before {
content: '';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 12px;
height: 12px;
background: #fff;
border: 2px solid #6b7280;
border-radius: 50%;
transition: all 0.2s;
}
.timeline-point.selected::before {
background: #3b82f6;
border-color: #3b82f6;
}
.impact-indicator {
position: absolute;
top: -24px;
left: 50%;
transform: translateX(-50%);
border-radius: 50%;
background: rgba(59, 130, 246, 0.1);
border: 2px solid rgba(59, 130, 246, 0.2);
transition: all 0.2s;
}
.timeline-labels {
display: flex;
position: absolute;
bottom: 0.5rem;
left: 0;
right: 0;
padding: 0 2rem;
}
.timeline-label {
position: absolute;
transform: translateX(-50%);
text-align: center;
min-width: 100px;
}
.version-name {
font-weight: 500;
font-size: 0.875rem;
color: #374151;
margin-bottom: 0.25rem;
}
.version-date {
font-size: 0.75rem;
color: #6b7280;
}
/* Comparison Actions */
.comparison-actions {
display: flex;
gap: 0.75rem;
}
.compare-button,
.rollback-button {
padding: 0.5rem 1rem;
border-radius: 0.375rem;
font-size: 0.875rem;
font-weight: 500;
cursor: pointer;
transition: all 0.2s;
}
.compare-button {
background-color: #3b82f6;
color: white;
}
.compare-button:hover {
background-color: #2563eb;
}
.rollback-button {
background-color: #6b7280;
color: white;
}
.rollback-button:hover {
background-color: #4b5563;
}
/* Comparison Results */
.comparison-content {
padding: 1rem;
}
.comparison-placeholder {
text-align: center;
padding: 2rem;
color: #6b7280;
font-size: 0.875rem;
}
.results-loading {
text-align: center;
padding: 2rem;
color: #6b7280;
}
.diff-section {
border: 1px solid #e5e7eb;
border-radius: 0.375rem;
margin-bottom: 1rem;
overflow: hidden;
}
.diff-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.75rem 1rem;
background: #f9fafb;
border-bottom: 1px solid #e5e7eb;
}
.diff-header h4 {
margin: 0;
font-size: 0.875rem;
font-weight: 600;
color: #374151;
}
.diff-stats {
display: flex;
gap: 1rem;
font-size: 0.75rem;
color: #6b7280;
}
.change-item {
padding: 1rem;
border-bottom: 1px solid #e5e7eb;
}
.change-item:last-child {
border-bottom: none;
}
.change-header {
display: flex;
align-items: center;
gap: 0.5rem;
margin-bottom: 0.75rem;
}
.change-type {
padding: 0.25rem 0.5rem;
background: #f3f4f6;
border-radius: 0.25rem;
font-size: 0.75rem;
font-weight: 500;
color: #374151;
}
.change-file {
font-family: ui-monospace, monospace;
font-size: 0.875rem;
color: #4b5563;
}
.change-content {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 1rem;
}
.old-value,
.new-value {
background: #f9fafb;
border-radius: 0.375rem;
overflow: hidden;
}
.value-header {
padding: 0.5rem;
background: #f3f4f6;
font-size: 0.75rem;
font-weight: 500;
color: #4b5563;
border-bottom: 1px solid #e5e7eb;
}
.change-content pre {
margin: 0;
padding: 0.75rem;
font-size: 0.875rem;
line-height: 1.5;
overflow-x: auto;
}
/* Warning/Error Messages */
.comparison-warning,
.comparison-error {
position: fixed;
top: 1rem;
right: 1rem;
padding: 0.75rem 1rem;
border-radius: 0.375rem;
font-size: 0.875rem;
animation: slideIn 0.3s ease-out;
}
.comparison-warning {
background: #fef3c7;
color: #92400e;
border: 1px solid #f59e0b;
}
.comparison-error {
background: #fee2e2;
color: #991b1b;
border: 1px solid #ef4444;
}
@keyframes slideIn {
from {
transform: translateX(100%);
opacity: 0;
}
to {
transform: translateX(0);
opacity: 1;
}
}
/* Responsive Design */
@media (max-width: 768px) {
.comparison-header {
padding: 0.75rem;
}
.selected-versions {
flex-direction: column;
}
.comparison-actions {
flex-direction: column;
}
.compare-button,
.rollback-button {
width: 100%;
}
.change-content {
grid-template-columns: 1fr;
}
.timeline-label {
min-width: 80px;
}
}

View File

@@ -1,290 +0,0 @@
/* Version Control System Styles */
.version-control-ui {
--vcs-primary: #3b82f6;
--vcs-success: #10b981;
--vcs-warning: #f59e0b;
--vcs-error: #ef4444;
--vcs-gray: #6b7280;
}
/* Branch Status Indicators */
.branch-indicator {
display: inline-flex;
align-items: center;
padding: 0.25rem 0.75rem;
border-radius: 9999px;
font-size: 0.875rem;
font-weight: 500;
}
.branch-indicator.active {
background-color: rgba(16, 185, 129, 0.1);
color: var(--vcs-success);
}
.branch-indicator.inactive {
background-color: rgba(107, 114, 128, 0.1);
color: var(--vcs-gray);
}
/* Change Status Tags */
.change-status {
display: inline-flex;
align-items: center;
padding: 0.25rem 0.75rem;
border-radius: 0.375rem;
font-size: 0.75rem;
font-weight: 500;
}
.change-status.applied {
background-color: rgba(16, 185, 129, 0.1);
color: var(--vcs-success);
}
.change-status.pending {
background-color: rgba(245, 158, 11, 0.1);
color: var(--vcs-warning);
}
.change-status.failed {
background-color: rgba(239, 68, 68, 0.1);
color: var(--vcs-error);
}
/* Change History */
.change-history {
border-left: 2px solid #e5e7eb;
margin-left: 1rem;
padding-left: 1rem;
}
.change-history-item {
position: relative;
padding: 1rem 0;
}
.change-history-item::before {
content: '';
position: absolute;
left: -1.25rem;
top: 1.5rem;
height: 0.75rem;
width: 0.75rem;
border-radius: 9999px;
background-color: white;
border: 2px solid var(--vcs-primary);
}
/* Merge Interface */
.merge-conflict {
border: 1px solid #e5e7eb;
border-radius: 0.5rem;
margin: 1rem 0;
padding: 1rem;
}
.merge-conflict-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 1rem;
}
.merge-conflict-content {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 1rem;
}
.merge-version {
background-color: #f9fafb;
padding: 1rem;
border-radius: 0.375rem;
}
/* Branch Selection */
.branch-selector {
position: relative;
}
.branch-list {
max-height: 24rem;
overflow-y: auto;
}
.branch-item {
display: flex;
align-items: center;
padding: 0.5rem;
border-radius: 0.375rem;
transition: background-color 0.2s;
}
.branch-item:hover {
background-color: #f9fafb;
}
.branch-item.active {
background-color: rgba(59, 130, 246, 0.1);
}
/* Version Tags */
.version-tag {
display: inline-flex;
align-items: center;
padding: 0.25rem 0.75rem;
border-radius: 9999px;
background-color: #f3f4f6;
color: var(--vcs-gray);
font-size: 0.875rem;
margin: 0.25rem;
}
/* Branch Lock Status */
.lock-status {
display: inline-flex;
align-items: center;
gap: 0.5rem;
padding: 0.25rem 0.75rem;
border-radius: 0.375rem;
font-size: 0.875rem;
margin-left: 0.5rem;
}
.lock-status.locked {
background-color: rgba(239, 68, 68, 0.1);
color: var(--vcs-error);
}
.lock-status.unlocked {
background-color: rgba(16, 185, 129, 0.1);
color: var(--vcs-success);
}
.lock-status .lock-icon {
width: 1rem;
height: 1rem;
}
.lock-info {
display: flex;
flex-direction: column;
font-size: 0.75rem;
color: var(--vcs-gray);
}
.lock-info .user {
font-weight: 500;
color: inherit;
}
.lock-info .expiry {
opacity: 0.8;
}
/* Lock Controls */
.lock-controls {
display: flex;
gap: 0.5rem;
margin-top: 0.5rem;
}
.lock-button {
display: inline-flex;
align-items: center;
gap: 0.25rem;
padding: 0.375rem 0.75rem;
border-radius: 0.375rem;
font-size: 0.875rem;
font-weight: 500;
cursor: pointer;
transition: all 0.2s;
}
.lock-button.lock {
background-color: var(--vcs-error);
color: white;
}
.lock-button.unlock {
background-color: var(--vcs-success);
color: white;
}
.lock-button:hover {
opacity: 0.9;
}
.lock-button:disabled {
opacity: 0.5;
cursor: not-allowed;
}
/* Lock History */
.lock-history {
margin-top: 1rem;
border-top: 1px solid #e5e7eb;
padding-top: 1rem;
}
.lock-history-item {
display: flex;
align-items: flex-start;
gap: 1rem;
padding: 0.5rem 0;
font-size: 0.875rem;
}
.lock-history-item .action {
font-weight: 500;
}
.lock-history-item .timestamp {
color: var(--vcs-gray);
}
.lock-history-item .reason {
margin-top: 0.25rem;
color: var(--vcs-gray);
font-style: italic;
}
/* Loading States */
.vcs-loading {
position: relative;
pointer-events: none;
opacity: 0.7;
}
.vcs-loading::after {
content: '';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 1.5rem;
height: 1.5rem;
border: 2px solid #e5e7eb;
border-top-color: var(--vcs-primary);
border-radius: 50%;
animation: vcs-spin 1s linear infinite;
}
@keyframes vcs-spin {
to {
transform: translate(-50%, -50%) rotate(360deg);
}
}
/* Responsive Design */
@media (max-width: 640px) {
.merge-conflict-content {
grid-template-columns: 1fr;
}
.branch-selector {
width: 100%;
}
}