Merge branch 'responsive_modals' of github.com:xwiki-labs/cryptpad into responsive_modals

pull/1/head
yflory 4 years ago
commit 4a814e8051

@ -85,25 +85,26 @@
} }
// Access modal // Access modal
.cp-overlay-container { button.cp-access-add {
position: relative; i {
button.btn-primary { margin-right: 0px !important;
i { }
margin-right: 0px !important; i.fa-arrow-left {
display: inline;
@media (max-width: @browser_media-medium-screen) {
display:none;
} }
i.fa-arrow-left { }
i.fa-arrow-up {
display: none;
@media (max-width: @browser_media-medium-screen) {
display: inline; display: inline;
@media (max-width: @browser_media-medium-screen) {
display:none;
}
}
i.fa-arrow-up {
display: none;
@media (max-width: @browser_media-medium-screen) {
display: inline;
}
} }
} }
}
.cp-overlay-container {
position: relative;
.cp-overlay { .cp-overlay {
position: absolute; position: absolute;
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,0.5);

@ -33,7 +33,7 @@ define([
opts = opts || {}; opts = opts || {};
var redrawAll = function () {}; var redrawAll = function () {};
var addBtn = h('button.btn.btn-primary', [h('i.fa.fa-arrow-left'), h('i.fa.fa-arrow-up')]); var addBtn = h('button.btn.btn-primary.cp-access-add', [h('i.fa.fa-arrow-left'), h('i.fa.fa-arrow-up')]);
var div1 = h('div.cp-share-column.cp-ownership'); var div1 = h('div.cp-share-column.cp-ownership');
var divMid = h('div.cp-share-column-mid', addBtn); var divMid = h('div.cp-share-column-mid', addBtn);
@ -388,7 +388,7 @@ define([
var redrawAll = function () {}; var redrawAll = function () {};
var addBtn = h('button.btn.btn-primary', [h('i.fa.fa-arrow-left'), h('i.fa.fa-arrow-up')]); var addBtn = h('button.btn.btn-primary.cp-access-add', [h('i.fa.fa-arrow-left'), h('i.fa.fa-arrow-up')]);
var div1 = h('div.cp-share-column.cp-allowlist'); var div1 = h('div.cp-share-column.cp-allowlist');
var divMid = h('div.cp-share-column-mid.cp-overlay-container', [ var divMid = h('div.cp-share-column-mid.cp-overlay-container', [

@ -654,7 +654,7 @@ define([
var tabs = [{ var tabs = [{
getTab: getContactsTab, getTab: getContactsTab,
title: Messages.share_contactCategory, title: Messages.share_contactCategory,
icon: "fa fa-addessèbook", icon: "fa fa-addess-book",
active: hasFriends, active: hasFriends,
onShow: onShowContacts, onShow: onShowContacts,
onHide: resetTab onHide: resetTab
@ -834,7 +834,7 @@ define([
var tabs = [{ var tabs = [{
getTab: getFileContactsTab, getTab: getFileContactsTab,
title: Messages.share_contactCategory, title: Messages.share_contactCategory,
icon: "fa fa-addessèbook", icon: "fa fa-addess-book",
active: hasFriends, active: hasFriends,
}, { }, {
getTab: getFileLinkTab, getTab: getFileLinkTab,

Loading…
Cancel
Save