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

pull/1/head
David Benqué 5 years ago
commit 9ae625e04a

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

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

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

Loading…
Cancel
Save