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

try to get rid of vertical scroll

Browse Source
This commit is contained in:
David Benqué 2019-12-03 09:38:39 +00:00
parent 1da5e8ac3c
commit ee1371c8ba
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less2/include/usergrid.less
View File

@ -13,7 +13,7 @@
margin: -3px; margin: -3px;
margin-bottom: 6px; margin-bottom: 6px;
max-height: 130px; max-height: 130px;
overflow: auto; overflow-y: auto;
@media screen and (max-height: 515px) { @media screen and (max-height: 515px) {
max-height: unset; // remove double scrollbar max-height: unset; // remove double scrollbar
} }

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

@ -4187,7 +4187,16 @@ define([
} }
getProperties(el, function (e, $prop) { getProperties(el, function (e, $prop) {
if (e) { return void logError(e); } if (e) { return void logError(e); }
UI.alert($prop[0], undefined, true); var modal = UI.dialog.customModal($prop[0], {
buttons: [{
className: 'secondary',
name: Messages.okButton,
onClick: function () {},
keys: [13]
}],
onClose: config.onClose,
});
UI.openCustomModal(modal);
}); });
} }
else if ($this.hasClass("cp-app-drive-context-hashtag")) { else if ($this.hasClass("cp-app-drive-context-hashtag")) {

2
www/common/toolbar3.js
View File

@ -533,7 +533,7 @@ MessengerUI, Messages) {
Common.getSframeChannel().event('EV_SHARE_OPEN', { Common.getSframeChannel().event('EV_SHARE_OPEN', {
hidden: true hidden: true
}); });
$shareBlock.ready(function () { // XXX temporary open share modal on load $shareBlock.click(function () {
var title = (config.title && config.title.getTitle && config.title.getTitle()) var title = (config.title && config.title.getTitle && config.title.getTitle())
|| (config.title && config.title.defaultName) || (config.title && config.title.defaultName)
|| ""; || "";