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:
copilot-swe-agent[bot]
parent
dc0b68ee80
commit
97dd5d2064
257 changed files with 9483 additions and 14103 deletions
|
|
@ -1,22 +1,18 @@
|
|||
.datepicker-container .fields .left {
|
||||
width: 56%;
|
||||
}
|
||||
.datepicker-container .fields .right {
|
||||
width: 38%;
|
||||
}
|
||||
.datepicker-container .datepicker {
|
||||
width: 100%;
|
||||
}
|
||||
.datepicker-container .datepicker table {
|
||||
width: 100%;
|
||||
border: none;
|
||||
border-spacing: 0;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.datepicker-container .datepicker table thead {
|
||||
background: none;
|
||||
}
|
||||
.datepicker-container .datepicker table td,
|
||||
.datepicker-container .datepicker table th {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.datepicker-container {
|
||||
form {
|
||||
display: flex;
|
||||
gap: 0.3lh;
|
||||
padding: 0.3lh 1ch;
|
||||
}
|
||||
.fields {
|
||||
display: flex;
|
||||
justify-content: stretch;
|
||||
gap: 1ch;
|
||||
.left, .right {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,16 @@
|
|||
select, button, input {
|
||||
font-size: 1rem !important;
|
||||
}
|
||||
|
||||
form {
|
||||
/* 🛑 remove me if it causes a significant issue.
|
||||
this can be overidden and otherwise allow forms to
|
||||
scale with their parent. */
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
select,
|
||||
textarea,
|
||||
input:not([type=file]),
|
||||
|
|
@ -7,9 +20,8 @@ button {
|
|||
border: 1px solid #ccc;
|
||||
border-radius: 0.4vw;
|
||||
display: block;
|
||||
margin-bottom: 1.5vh;
|
||||
min-height: 4.5vh;
|
||||
padding: 1vh 1vw;
|
||||
padding: 0.3lh 1ch;
|
||||
max-width: clamp(30vw, 100%, 800px);
|
||||
}
|
||||
select.full,
|
||||
textarea.full,
|
||||
|
|
@ -42,18 +54,6 @@ input[type="text"],
|
|||
input[type="password"],
|
||||
input[type="email"] {
|
||||
transition: background 85ms ease-in, border-color 85ms ease-in;
|
||||
width: min(250px, 30vw);
|
||||
}
|
||||
input[type="text"].inline-input,
|
||||
input[type="password"].inline-input,
|
||||
input[type="email"].inline-input {
|
||||
background: none;
|
||||
border: 0;
|
||||
margin: 0;
|
||||
padding: 0.3vh;
|
||||
min-height: 0;
|
||||
height: 2.5vh;
|
||||
width: min(200px, 25vw);
|
||||
}
|
||||
input[type="text"].full-line,
|
||||
input[type="password"].full-line,
|
||||
|
|
@ -102,11 +102,6 @@ textarea:disabled {
|
|||
-webkit-user-select: none;
|
||||
user-select: none;
|
||||
}
|
||||
select {
|
||||
max-height: 40vh;
|
||||
width: min(256px, 32vw);
|
||||
margin-bottom: 1vh;
|
||||
}
|
||||
select.inline {
|
||||
width: 100%;
|
||||
}
|
||||
|
|
@ -114,14 +109,11 @@ option[disabled] {
|
|||
color: #222;
|
||||
}
|
||||
textarea {
|
||||
height: 20vh;
|
||||
transition: background 85ms ease-in, border-color 85ms ease-in;
|
||||
resize: vertical;
|
||||
width: 100%;
|
||||
}
|
||||
textarea.editor {
|
||||
resize: none;
|
||||
padding-bottom: 3vh;
|
||||
width: auto;
|
||||
font-size: 0.9em;
|
||||
min-height: 3lh;
|
||||
}
|
||||
.button {
|
||||
border-radius: 3px;
|
||||
|
|
@ -137,9 +129,16 @@ button {
|
|||
display: inline-block;
|
||||
font-weight: 700;
|
||||
line-height: 1.3;
|
||||
padding: 1vh 2.5vw;
|
||||
/* in flex layouts, padding often disturbs computations. rather rarely have
|
||||
two lines, so setting relative-unit min-height works better */
|
||||
min-height: 1.8lh;
|
||||
padding: 0 2ch;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
z-index: 1;
|
||||
:not(.password-toggle-btn) {
|
||||
margin-top: 0.1lh;
|
||||
}
|
||||
}
|
||||
input[type="submit"] .wide,
|
||||
button .wide {
|
||||
|
|
@ -241,9 +240,9 @@ input[type="hidden"] {
|
|||
}
|
||||
.radio-div,
|
||||
.check-div {
|
||||
display: block;
|
||||
margin: 0 0 0.5vh 2.5vw;
|
||||
min-height: 2.5vh;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.2lh;
|
||||
position: relative;
|
||||
}
|
||||
.radio-div input,
|
||||
|
|
@ -260,9 +259,10 @@ input[type="hidden"] {
|
|||
font-weight: 400;
|
||||
}
|
||||
label {
|
||||
display: block;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
font-weight: 700;
|
||||
margin-bottom: 0.5vh;
|
||||
}
|
||||
label.form-error {
|
||||
color: #d32f2f;
|
||||
|
|
@ -274,11 +274,32 @@ textarea::-moz-placeholder {
|
|||
color: #333 !important;
|
||||
}
|
||||
.edit-controls,
|
||||
.add-controls {
|
||||
.add-controls,
|
||||
.links-controls {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 1.5vh;
|
||||
gap: 1ch;
|
||||
button {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
.edit-controls {
|
||||
grid-area: main-controls;
|
||||
}
|
||||
|
||||
.add-controls {
|
||||
grid-area: main-controls;
|
||||
}
|
||||
|
||||
.links-controls {
|
||||
grid-area: links-controls
|
||||
}
|
||||
|
||||
.links-controls span.quiet {
|
||||
margin: auto;
|
||||
}
|
||||
@media print {
|
||||
.add-controls {
|
||||
|
|
@ -289,14 +310,7 @@ textarea::-moz-placeholder {
|
|||
.add-controls button[type=submit],
|
||||
.edit-controls input[type=button],
|
||||
.add-controls input[type=button] {
|
||||
float: left;
|
||||
height: 4.5vh;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.edit-controls .fa-times-thin,
|
||||
.add-controls .fa-times-thin {
|
||||
font-size: clamp(20px, 4vw, 26px);
|
||||
margin: 0.5vh 1.5vw;
|
||||
margin: 0;
|
||||
}
|
||||
[type="checkbox"]:not(:checked),
|
||||
[type="checkbox"]:checked {
|
||||
|
|
@ -306,6 +320,18 @@ textarea::-moz-placeholder {
|
|||
display: none;
|
||||
}
|
||||
.materialCheckBox {
|
||||
position: relative;
|
||||
width: 0.5lh;
|
||||
height: 0.5lh;
|
||||
z-index: 0;
|
||||
border: 0.2ch solid #5a5a5a;
|
||||
border-radius: 1px;
|
||||
transition: 0.2s;
|
||||
margin: 0;
|
||||
margin-left: 0px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.materialCheckBox:is(.active) {
|
||||
position: relative;
|
||||
width: 13px;
|
||||
height: 13px;
|
||||
|
|
@ -317,19 +343,33 @@ textarea::-moz-placeholder {
|
|||
cursor: pointer;
|
||||
}
|
||||
.materialCheckBox.is-checked {
|
||||
top: -4px;
|
||||
left: -3px;
|
||||
width: 7px;
|
||||
height: 15px;
|
||||
margin-right: 6px;
|
||||
border-top: 2px solid transparent;
|
||||
border-left: 2px solid transparent;
|
||||
border-bottom: 2px solid #3cb500;
|
||||
border-right: 2px solid #3cb500;
|
||||
transform: rotate(40deg);
|
||||
top: 0.3lh;
|
||||
left: 0.25lh;
|
||||
width: 0.25lh;
|
||||
height: 0.5lh;
|
||||
margin-right: 0.6lh;
|
||||
border-top: 0 solid transparent;
|
||||
border-left: 0 solid transparent;
|
||||
border-bottom: 0.3ch solid #3cb500;
|
||||
border-right: 0.3ch solid #3cb500;
|
||||
-webkit-backface-visibility: hidden;
|
||||
backface-visibility: hidden;
|
||||
transform-origin: 100% 100%;
|
||||
transform: rotate(50deg);
|
||||
backface-visibility: hidden;
|
||||
transform-origin: 0.5lh 0;
|
||||
}
|
||||
|
||||
form .form-buttons {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
align-self: stretch;
|
||||
justify-content: stretch;
|
||||
gap: 0.5ch;
|
||||
&>button {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
/* Grey checkmarks when grey icons setting is enabled */
|
||||
body.grey-icons-enabled .materialCheckBox.is-checked {
|
||||
|
|
@ -362,7 +402,7 @@ body.grey-icons-enabled .materialCheckBox.is-checked {
|
|||
border-radius: 3px;
|
||||
color: #fff;
|
||||
display: none;
|
||||
font-size: 12px;
|
||||
|
||||
font-weight: 700;
|
||||
height: 17px;
|
||||
line-height: 17px;
|
||||
|
|
@ -419,7 +459,7 @@ body.grey-icons-enabled .materialCheckBox.is-checked {
|
|||
.button-link.setting .label {
|
||||
color: #222;
|
||||
display: block;
|
||||
font-size: 12px;
|
||||
|
||||
line-height: 14px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
|
@ -428,7 +468,7 @@ body.grey-icons-enabled .materialCheckBox.is-checked {
|
|||
}
|
||||
.button-link.setting .value {
|
||||
display: block;
|
||||
font-size: 18px;
|
||||
|
||||
line-height: 24px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
|
@ -572,7 +612,7 @@ button.loud-text-button:hover {
|
|||
padding: 11px;
|
||||
position: relative;
|
||||
text-decoration: none;
|
||||
font-size: 16px;
|
||||
|
||||
line-height: 20px;
|
||||
}
|
||||
.big-link .text {
|
||||
|
|
@ -615,7 +655,7 @@ button.loud-text-button:hover {
|
|||
width: 40px;
|
||||
}
|
||||
.big-link.avatar-changer .member .member-initials {
|
||||
font-size: 16px;
|
||||
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
max-height: 40px;
|
||||
|
|
@ -655,7 +695,7 @@ button.loud-text-button:hover {
|
|||
left: 0;
|
||||
width: 100%;
|
||||
z-index: 2;
|
||||
font-size: 23px;
|
||||
|
||||
}
|
||||
.uploader .realfile input[type="file"] {
|
||||
cursor: pointer;
|
||||
|
|
@ -666,7 +706,7 @@ button.loud-text-button:hover {
|
|||
padding: 0;
|
||||
width: 100%;
|
||||
z-index: 2;
|
||||
font-size: 23px;
|
||||
|
||||
}
|
||||
.uploader:hover .fakefile {
|
||||
background: #318ec4;
|
||||
|
|
@ -705,13 +745,13 @@ button.loud-text-button:hover {
|
|||
color: #fff;
|
||||
}
|
||||
.material-toggle-switch {
|
||||
display: flex;
|
||||
padding: 0.2rlh 1ch;
|
||||
align-self: center;
|
||||
}
|
||||
.toggle-label {
|
||||
height: 0.6rlh;
|
||||
width: 1.3rlh;
|
||||
position: relative;
|
||||
display: block;
|
||||
height: 20px;
|
||||
width: 44px;
|
||||
background-color: #a6a6a6;
|
||||
border-radius: 100px;
|
||||
cursor: pointer;
|
||||
|
|
@ -719,11 +759,13 @@ button.loud-text-button:hover {
|
|||
}
|
||||
.toggle-label:after {
|
||||
position: absolute;
|
||||
left: -2px;
|
||||
top: -3px;
|
||||
display: block;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
/* ensure vertical centering */
|
||||
margin: auto;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: -0.2rlh;
|
||||
width: .8rlh;
|
||||
height: .8rlh;
|
||||
border-radius: 100px;
|
||||
background-color: #fff;
|
||||
box-shadow: 0px 3px 3px rgba(0,0,0,0.05);
|
||||
|
|
@ -737,7 +779,7 @@ button.loud-text-button:hover {
|
|||
background-color: #6fbeb5;
|
||||
}
|
||||
.toggle-switch:checked ~ .toggle-label:after {
|
||||
left: 20px;
|
||||
left: 1.5ch;
|
||||
background-color: #179588;
|
||||
}
|
||||
.toggle-switch:checked:disabled ~ .toggle-label {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue