infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into responsive_modals

pull/1/head
yflory 2020-09-15 11:14:18 +02:00
parent 5132e2baae 0f004419b7
commit 7257039943
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
customize.dist/ckeditor-contents.css
View File

@ -205,3 +205,11 @@ a > img {
.cp-link-clicked a {
cursor: pointer;
}
media-tag {
display: inline-block;
}
media-tag * {
width: 100%;
height: 100%;
}

2
www/common/common-ui-elements.js
View File

@ -418,7 +418,7 @@ define([
var localStore = window.cryptpadStore;
localStore.get('hide-alert-teamInvite', function (val) {
if (val === '1') { return; }
$(linkWarning).show();
$(linkWarning).css('display', 'flex');
$(dismissButton).on('click', function () {
localStore.put('hide-alert-teamInvite', '1');

4
www/common/inner/share.js
View File

@ -341,7 +341,7 @@ define([
localStore.get('hide-alert-shareLinkWarning', function (val) {
if (val === '1') { return; }
$(shareLinkWarning).show();
$(shareLinkWarning).css('display', 'flex');
$(dismissButton).on('click', function () {
localStore.put('hide-alert-shareLinkWarning', '1');
@ -737,7 +737,7 @@ define([
localStore.get('hide-alert-shareLinkWarning', function (val) {
if (val === '1') { return; }
$(shareLinkWarning).show();
$(shareLinkWarning).css('display', 'flex');
$(dismissButton).on('click', function () {
localStore.put('hide-alert-shareLinkWarning', '1');