Merge branch 'sprint/182_tianshujie_18666' into 'master'
* Fix bug #18666. See merge request easycorp/zentaopms!1485
This commit is contained in:
@@ -299,6 +299,7 @@ function findDropColumns($element, $root)
|
||||
{
|
||||
if(!colRules) return false;
|
||||
if(colRules === true) return true;
|
||||
if($.cookie('isFullScreen') == 1) return false;
|
||||
|
||||
var $newCol = $(this);
|
||||
var newCol = $newCol.data();
|
||||
|
||||
@@ -499,6 +499,7 @@ function findDropColumns($element, $root)
|
||||
{
|
||||
if(!colRules) return false;
|
||||
if(colRules === true) return true;
|
||||
if($.cookie('isFullScreen') == 1) return false;
|
||||
|
||||
var $newCol = $(this);
|
||||
var newCol = $newCol.data();
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#archivedCards .kanban-item > .info > .user {position: absolute; right: 0; top: 0}
|
||||
#archivedCards .card-actions {position: relative; padding: 15px 10px; padding-top: 0px;}
|
||||
#archivedCards .card-actions > .btn {display: block;}
|
||||
[lang^='en'] #archivedCards .card-actions > .btn {width: 55px;}
|
||||
#archivedCards .card-actions > .btn + .btn {margin-top: 10px;}
|
||||
#archivedCards .info > .time {background-color: rgba(0, 0, 0, 0.15);}
|
||||
#archivedCards .info > .users > span {display: inline-block; color: transparent; width: 2px; height: 2px; background-color: #8990a2; position:sticky; top: 3px; margin: 0 7px; border-radius: 50%; line-height: 32px;}
|
||||
|
||||
Reference in New Issue
Block a user