mirror of
https://github.com/wekan/wekan.git
synced 2026-02-09 09:44:22 +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
|
|
@ -80,7 +80,7 @@
|
|||
.triggers-content .triggers-body .triggers-side-menu {
|
||||
background-color: #f7f7f7;
|
||||
border: 1px solid #f0f0f0;
|
||||
border-radius: 4px;
|
||||
border-radius: 0.4ch;
|
||||
height: intrinsic;
|
||||
box-shadow: inset -1px -1px 3px rgba(0,0,0,0.05);
|
||||
}
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
width: 50px;
|
||||
height: 50px;
|
||||
text-align: center;
|
||||
font-size: 25px;
|
||||
|
||||
position: relative;
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-side-menu ul li i {
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
width: 95%;
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-side-menu ul li a span {
|
||||
font-size: 13px;
|
||||
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-main-body {
|
||||
padding: 0.1em 1em;
|
||||
|
|
@ -134,15 +134,15 @@
|
|||
left: 10px;
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-main-body .trigger-item .trigger-content .trigger-text {
|
||||
font-size: 16px;
|
||||
|
||||
display: inline-block;
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-main-body .trigger-item .trigger-content .trigger-inline-button {
|
||||
font-size: 16px;
|
||||
|
||||
display: inline;
|
||||
padding: 6px;
|
||||
border: 1px solid #eee;
|
||||
border-radius: 4px;
|
||||
border-radius: 0.4ch;
|
||||
box-shadow: inset -1px -1px 3px rgba(0,0,0,0.05);
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-main-body .trigger-item .trigger-content .trigger-inline-button:hover,
|
||||
|
|
@ -179,10 +179,10 @@
|
|||
width: 30px;
|
||||
height: 30px;
|
||||
border: 1px solid #eee;
|
||||
border-radius: 4px;
|
||||
border-radius: 0.4ch;
|
||||
box-shadow: inset -1px -1px 3px rgba(0,0,0,0.05);
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
|
||||
right: 10px;
|
||||
}
|
||||
.triggers-content .triggers-body .triggers-main-body .trigger-item .trigger-button i {
|
||||
|
|
@ -206,7 +206,7 @@
|
|||
top: unset;
|
||||
position: unset;
|
||||
transform: unset;
|
||||
font-size: 16px;
|
||||
|
||||
width: auto;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue