Merge branch 'staging' into responsive_modals

pull/1/head
yflory 4 years ago
commit 7257039943

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

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

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

Loading…
Cancel
Save