Fix sidebar layout buttons in team drive

pull/1/head
yflory 5 years ago
parent 972f50052d
commit 215cabc053

@ -96,6 +96,7 @@
}
}
margin-bottom: 20px;
.buttons_main();
}
[type="text"], [type="password"], button {
vertical-align: middle;
@ -121,7 +122,6 @@
&>div {
margin: 10px 0;
}
.buttons_main();
button.btn {
margin: 0 5px 0 0;
}

@ -140,8 +140,7 @@
}
.cp-app-profile-viewprofile-button {
margin-bottom: 20px;
float: right;
margin-left: 5px;
width: 300px;
}
#cp-app-profile-description {
position: relative;

@ -286,7 +286,7 @@ define([
]);
$(unmuteButton).click(function () {
module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
if (e) { return void UI.warn(Messages.error); }
if (e) { console.error(e); return void UI.warn(Messages.error); }
refreshMute(data);
});
}).appendTo($mute);
@ -302,7 +302,7 @@ define([
name: data.displayName || data.name,
avatar: data.avatar
}, function (e) {
if (e) { return void UI.warn(Messages.error); }
if (e) { console.error(e); return void UI.warn(Messages.error); }
refreshMute(data);
});
}).appendTo($mute);
@ -383,7 +383,7 @@ define([
};
var addDescription = function ($container) {
var $block = $('<div>', {id: DESCRIPTION_ID}).appendTo($container);
var $block = $('<div>', {id: DESCRIPTION_ID, class:'cp-sidebarlayout-element'}).appendTo($container);
APP.$description = $('<div>', {'class': 'cp-app-profile-description-rendered'}).appendTo($block);
APP.$descriptionEdit = $();
@ -469,7 +469,7 @@ define([
APP.$container.find('#'+CREATE_ID).remove();
if (!APP.initialized) {
var $header = $('<div>', {id: HEADER_ID}).appendTo(APP.$rightside);
var $header = $('<div>', {id: HEADER_ID, class:'cp-sidebarlayout-element'}).appendTo(APP.$rightside);
addAvatar($header);
var $rightside = $('<div>', {id: HEADER_RIGHT_ID}).appendTo($header);
addDisplayName($rightside);
@ -477,7 +477,7 @@ define([
addFriendRequest($rightside);
addMuteButton($rightside);
addDescription(APP.$rightside);
addViewButton(APP.$rightside);
addViewButton($rightside);
APP.initialized = true;
createLeftside();
}

@ -479,8 +479,9 @@ define([
refreshCreate(common, cb);
});
makeBlock('drive', function (common, cb) {
makeBlock('drive', function (common, cb, $div) {
$('div.cp-team-drive').empty();
$div.removeClass('cp-sidebarlayout-element'); // Don't apply buttons and input styles from sidebarlayout
var content = [
h('div.cp-app-drive-container', {tabindex:0}, [
h('div#cp-app-drive-tree'),

Loading…
Cancel
Save