mirror of
https://github.com/wekan/wekan.git
synced 2026-02-09 17:54:21 +01:00
Resolve merge conflicts by accepting PR #6131 changes
Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
parent
dc0b68ee80
commit
97dd5d2064
257 changed files with 9483 additions and 14103 deletions
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
.migration-progress-modal {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
border-radius: 0.8ch;
|
||||
box-shadow: 0 10px 30px rgba(0, 0, 0, 0.3);
|
||||
max-width: 500px;
|
||||
width: 90%;
|
||||
|
|
@ -46,13 +46,13 @@
|
|||
|
||||
.migration-progress-title {
|
||||
margin: 0;
|
||||
font-size: 18px;
|
||||
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.migration-progress-close {
|
||||
cursor: pointer;
|
||||
font-size: 16px;
|
||||
|
||||
opacity: 0.8;
|
||||
transition: opacity 0.2s ease;
|
||||
}
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
font-weight: 600;
|
||||
color: #333;
|
||||
margin-bottom: 8px;
|
||||
font-size: 14px;
|
||||
|
||||
}
|
||||
|
||||
.migration-progress-overall-bar {
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
|
||||
.migration-progress-overall-percentage {
|
||||
text-align: right;
|
||||
font-size: 12px;
|
||||
|
||||
color: #666;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
|
@ -123,12 +123,12 @@
|
|||
font-weight: 600;
|
||||
color: #333;
|
||||
margin-bottom: 8px;
|
||||
font-size: 14px;
|
||||
|
||||
}
|
||||
|
||||
.migration-progress-step-bar {
|
||||
background: #e9ecef;
|
||||
border-radius: 8px;
|
||||
border-radius: 0.8ch;
|
||||
height: 8px;
|
||||
overflow: hidden;
|
||||
margin-bottom: 5px;
|
||||
|
|
@ -137,13 +137,13 @@
|
|||
.migration-progress-step-fill {
|
||||
background: linear-gradient(90deg, #007bff, #0056b3);
|
||||
height: 100%;
|
||||
border-radius: 8px;
|
||||
border-radius: 0.8ch;
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
|
||||
.migration-progress-step-percentage {
|
||||
text-align: right;
|
||||
font-size: 12px;
|
||||
|
||||
color: #666;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
|
@ -160,12 +160,12 @@
|
|||
font-weight: 600;
|
||||
color: #333;
|
||||
margin-bottom: 5px;
|
||||
font-size: 13px;
|
||||
|
||||
}
|
||||
|
||||
.migration-progress-status-text {
|
||||
color: #555;
|
||||
font-size: 14px;
|
||||
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
|
|
@ -181,12 +181,12 @@
|
|||
font-weight: 600;
|
||||
color: #1976d2;
|
||||
margin-bottom: 5px;
|
||||
font-size: 13px;
|
||||
|
||||
}
|
||||
|
||||
.migration-progress-details-text {
|
||||
color: #1565c0;
|
||||
font-size: 13px;
|
||||
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
.migration-progress-note {
|
||||
text-align: center;
|
||||
color: #666;
|
||||
font-size: 13px;
|
||||
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
|
|
@ -209,17 +209,17 @@
|
|||
width: 95%;
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-content {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-header {
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-title {
|
||||
font-size: 16px;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -229,40 +229,40 @@
|
|||
background: #2d3748;
|
||||
color: #e2e8f0;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-overall-label,
|
||||
.migration-progress-step-label,
|
||||
.migration-progress-status-label {
|
||||
color: #e2e8f0;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-status {
|
||||
background: #4a5568;
|
||||
border-left-color: #63b3ed;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-status-text {
|
||||
color: #cbd5e0;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-details {
|
||||
background: #2b6cb0;
|
||||
border-left-color: #4299e1;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-details-label {
|
||||
color: #bee3f8;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-details-text {
|
||||
color: #90cdf4;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-footer {
|
||||
background: #4a5568;
|
||||
border-top-color: #718096;
|
||||
}
|
||||
|
||||
|
||||
.migration-progress-note {
|
||||
color: #a0aec0;
|
||||
}
|
||||
|
|
@ -285,7 +285,7 @@
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 10;
|
||||
border-radius: 4px;
|
||||
border-radius: 0.4ch;
|
||||
}
|
||||
|
||||
.migration-spinner {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue