web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sidebar layout buttons in team drive

Browse Source
This commit is contained in:
yflory 2019-12-17 17:57:07 +01:00
parent 972f50052d
commit 215cabc053
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less2/include/sidebar-layout.less
View File

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

3
www/profile/app-profile.less
View File

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

10
www/profile/inner.js
View File

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

3
www/teams/inner.js
View File

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