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

Merge branch 'staging' into design_dialogs_usergrid

Browse Source
This commit is contained in:
David Benqué
2019-11-25 17:05:00 +00:00
parent 53b29ced05 77ee1b02dc
commit 01d7d21754
78 changed files with 1269 additions and 123 deletions
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
.msg.cp-inline-radio-group {
overflow: unset !important;
.radio-group {
display: flex;
flex-direction: row;

23
customize.dist/src/less2/include/password-input.less
View File

@@ -9,8 +9,27 @@
flex: 1;
min-width: 0;
}
label, .fa {
margin-left: 10px;
.fa {
width: 30px;
height: 30px;
display: inline-flex;
align-items: center;
justify-content: center;
cursor: pointer;
&:hover {
background-color: rgba(0,0,0,0.1);
}
}
}
.cp-password-change-container {
display: flex;
align-items: center;
.cp-password-container {
margin-bottom: 0 !important;
flex: 1;
}
button {
margin: 0 !important;
}
}
}

3
customize.dist/src/less2/include/toolbar.less
View File

@@ -507,7 +507,8 @@
}
}
.cp-toolbar-top {
@media screen and (max-width: @browser_media-medium-screen) {
@media screen and (max-width: @browser_media-medium-screen),
screen and (max-height: 500px) {
flex-wrap: wrap;
height: @toolbar_line-height;
.cp-pad-not-pinned {

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

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