mirror of
https://github.com/wekan/wekan.git
synced 2026-02-05 16:11:47 +01:00
Merge branch 'master' of https://github.com/wekan/wekan into feature/direct_login_from_oidc
This commit is contained in:
commit
05a98fa88b
32 changed files with 6361 additions and 276 deletions
|
|
@ -14,6 +14,7 @@ template(name="archivedBoards")
|
|||
i.fa.fa-undo
|
||||
| {{_ 'restore-board'}}
|
||||
= title
|
||||
span {{ moment archivedAt 'LLL' }}
|
||||
else
|
||||
li.no-items-message {{_ 'no-archived-boards'}}
|
||||
|
||||
|
|
|
|||
|
|
@ -1141,7 +1141,7 @@
|
|||
color: rgba(0,0,0,0.5);
|
||||
position: absolute;
|
||||
margin-top: -34px;
|
||||
margin-let: -11px;
|
||||
margin-left: -11px;
|
||||
}
|
||||
.board-color-clearblue a.fa,
|
||||
.board-color-clearblue a i.fa {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@import url("css/reset.css") print, screen;
|
||||
/* @import url("css/reset.css") print, screen; */
|
||||
|
||||
.board-list {
|
||||
margin: 0 8px;
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ BlazeComponent.extendComponent({
|
|||
},
|
||||
boardLists(boardId) {
|
||||
let boardLists = [];
|
||||
const lists = Lists.find({'boardId' : boardId})
|
||||
const lists = Lists.find({'boardId' : boardId, 'archived': false})
|
||||
lists.forEach(list => {
|
||||
let cardCount = Cards.find({'boardId':boardId, 'listId':list._id}).count()
|
||||
boardLists.push(`${list.title}: ${cardCount}`);
|
||||
|
|
|
|||
|
|
@ -839,7 +839,7 @@ Template.moveCardPopup.events({
|
|||
this.swimlaneId = swimlaneId;
|
||||
this.listId = listId;
|
||||
|
||||
Popup.back();
|
||||
Popup.back(2);
|
||||
},
|
||||
});
|
||||
BlazeComponent.extendComponent({
|
||||
|
|
@ -975,7 +975,7 @@ Template.copyCardPopup.events({
|
|||
// See https://github.com/wekan/wekan/issues/80
|
||||
Filter.addException(_id);
|
||||
|
||||
Popup.back();
|
||||
Popup.back(2);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@
|
|||
border-left: 1px solid #ccc;
|
||||
padding: 0;
|
||||
float: left;
|
||||
min-width: 270px;
|
||||
max-width: 270px;
|
||||
width: 270px; /* Orinal width: 270px. Changes not saved yet: */
|
||||
resize: both; /* - List width and height resizeable */
|
||||
overflow: auto; /* - List width and height resizeable */
|
||||
}
|
||||
.list:first-child {
|
||||
margin-left: 5px;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ head
|
|||
meta(name="application-name" content="Wekan")
|
||||
meta(name="msapplication-TileColor" content="#00aba9")
|
||||
meta(name="theme-color" content="#ffffff")
|
||||
link(rel='stylesheet', href='css/html5-default-theme.css', type='text/css')
|
||||
//link(rel="stylesheet" type="text/css" class="__meteor-css__" href="css/html5-default-theme.css")
|
||||
|
||||
template(name="userFormsLayout")
|
||||
section.auth-layout
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
.my-cards-card-title-table {
|
||||
font-weight: bold;
|
||||
padding-left: 2px;
|
||||
max-width: 243px;
|
||||
}
|
||||
.my-cards-board-badge {
|
||||
width: 36px;
|
||||
|
|
|
|||
|
|
@ -80,6 +80,8 @@ function initSortable(boardComponent, $listsDom) {
|
|||
Lists.update(list._id, {
|
||||
$set: {
|
||||
sort: sortIndex.base,
|
||||
width: list._id.width(),
|
||||
height: list._id.height(),
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue