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

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

Browse Source
This commit is contained in:
ansuz 2019-11-25 20:59:42 -05:00
commit b246fc73a7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/src/less2/include/modals-ui-elements.less
View File

@ -6,6 +6,7 @@
& { & {
// Share modal // Share modal
.msg.cp-inline-radio-group { .msg.cp-inline-radio-group {
overflow: unset !important;
.radio-group { .radio-group {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

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

@ -12,6 +12,12 @@
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 6px; margin-bottom: 6px;
} }
&:not(.large) {
.cp-usergrid-grid {
margin: -3px;
margin-bottom: 6px;
}
}
&.cp-usergrid-empty { &.cp-usergrid-empty {
.cp-usergrid-grid, .cp-usergrid-filter { .cp-usergrid-grid, .cp-usergrid-filter {
display: none; display: none;
@ -42,17 +48,12 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 5px; padding: 5px;
margin-bottom: 6px; margin: 3px;
margin-right: 6px;
cursor: default; cursor: default;
transition: order 0.5s, background-color 0.5s; transition: order 0.5s, background-color 0.5s;
margin-top: 1px; margin-top: 1px;
.tools_unselectable(); .tools_unselectable();
&:nth-child(6n) {
margin-right: 0;
}
&.cp-selected { &.cp-selected {
background-color: @colortheme_alertify-primary; background-color: @colortheme_alertify-primary;
color: @colortheme_alertify-primary-text; color: @colortheme_alertify-primary-text;
@ -79,6 +80,7 @@
width: 140px; width: 140px;
height: 35px; height: 35px;
flex-flow: row; flex-flow: row;
margin: 0;
margin-right: 15px; margin-right: 15px;
margin-bottom: 1px; margin-bottom: 1px;
&:nth-child(3n) { &:nth-child(3n) {

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

@ -788,8 +788,8 @@ define([
placeholder: Messages.share_filterFriend placeholder: Messages.share_filterFriend
}); });
var div = h('div.cp-usergrid-container' + noOthers, [ var div = h('div.cp-usergrid-container' + noOthers + (config.large?'.large':''), [
h('label', label), label ? h('label', label) : undefined,
h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [ h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [
inputFilter, inputFilter,
buttonSelect, buttonSelect,