Merge branch 'soon'

This commit is contained in:
yflory 2018-02-19 11:39:55 +01:00
commit 1b7b53a164
2 changed files with 11 additions and 2 deletions

View file

@ -512,7 +512,11 @@ span {
}
input {
width: 100%;
margin-top: 5px;
margin: 0;
padding: 0;
border-radius: 0;
border: 1px solid #ddd;
font-size: 14px;
}
.cp-app-drive-element-state {
position: absolute;
@ -568,6 +572,11 @@ span {
}
li {
display: table-row;
input {
border: 1px solid #ddd;
margin: 0;
padding: 0 4px;
}
&> span {
padding: 0 5px;
display: table-cell;

View file

@ -2232,7 +2232,7 @@ define([
// Only Trash and Root are available in not-owned files manager
if (!path || displayedCategories.indexOf(path[0]) === -1) {
log(Messages.categoryError);
log(Messages.fm_categoryError);
currentPath = [ROOT];
_displayDirectory(currentPath);
return;