diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less index 42de195d0..1f9c92457 100644 --- a/customize.dist/src/less2/include/sidebar-layout.less +++ b/customize.dist/src/less2/include/sidebar-layout.less @@ -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; } diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less index 9ec06de18..61b3bbbe6 100644 --- a/www/profile/app-profile.less +++ b/www/profile/app-profile.less @@ -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; diff --git a/www/profile/inner.js b/www/profile/inner.js index e9c142777..a1d070313 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -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 = $('
', {id: DESCRIPTION_ID}).appendTo($container); + var $block = $('
', {id: DESCRIPTION_ID, class:'cp-sidebarlayout-element'}).appendTo($container); APP.$description = $('
', {'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 = $('
', {id: HEADER_ID}).appendTo(APP.$rightside); + var $header = $('
', {id: HEADER_ID, class:'cp-sidebarlayout-element'}).appendTo(APP.$rightside); addAvatar($header); var $rightside = $('
', {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(); } diff --git a/www/teams/inner.js b/www/teams/inner.js index 4ba4cf2f4..402c424e3 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -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'),