infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge remote-tracking branch 'origin/toolbarUI' into toolbarUI

pull/1/head
David Benqué 2020-05-15 13:10:39 +01:00
parent e6112d27ee fb10d65a4f
commit 9ae625e04a
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/src/less2/include/drive.less
View File

@ -891,6 +891,9 @@
.fa-history { order: 50; }
.fa-list, .fa-th-large { order: 25; }
#cp-app-drive-toolbar-context-mobile, #cp-app-drive-toolbar-contextbuttons { order: 0; }
#cp-app-drive-toolbar-context-mobile {
.fa { margin: 0 !important; }
}
#cp-app-drive-toolbar-contextbuttons {
height: @variables_bar-height;
display: flex;

1
customize.dist/src/less2/include/toolbar.less
View File

@ -124,7 +124,6 @@
box-sizing: border-box;
position: relative;
order: 99;
resize: horizontal;
z-index: 1;
#cp-app-contacts-container {
height: 100%;

2
www/common/drive-ui.js
View File

@ -1378,6 +1378,7 @@ define([
return;
}
// Non mobile
/*
var $container = $driveToolbar.find('#cp-app-drive-toolbar-contextbuttons');
if (!$container.length) { return; }
$container.html('');
@ -1404,6 +1405,7 @@ define([
$container.append($a);
$a.click(function() { $(el).click(); });
});
*/
};
var scrollTo = function ($element) {