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

Merge branch 'filePassword' into staging

Browse Source
This commit is contained in:
yflory
2019-11-08 15:28:50 +01:00
parent 7259301e99 8e403c4f46
commit 553f68fce8
35 changed files with 2126 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
customize.dist/src/less2/include/alertify.less
View File

@@ -116,7 +116,7 @@
}*/
}
.dialog, .alert {
.dialog {
& > div {
background-color: @alertify-dialog-bg;
&.half {
@@ -205,6 +205,16 @@
}
}
::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
color: darken(@alertify-input-fg, 15%);
opacity: 1; /* Firefox */
}
:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: darken(@alertify-input-fg, 15%);
}
::-ms-input-placeholder { /* Microsoft Edge */
color: darken(@alertify-input-fg, 15%);
}
input:not(.form-control), textarea {
background-color: @alertify-input-bg;
color: @alertify-input-fg;

24
customize.dist/src/less2/include/drive.less
View File

@@ -466,6 +466,7 @@
padding: 0.25em 0.75em;
margin: 1em;
background: @drive_info-box-bg;
cursor: default;
span {
cursor: pointer;
float: right;
@@ -978,5 +979,28 @@
flex: 1;
}
}
#cp-app-drive-edition-state {
height: @variables_bar-height;
display: flex;
align-items: center;
justify-content: center;
background-color: lighten(@colortheme_drive-bg, 32%);
color: black;
font-weight: bold;
text-transform: uppercase;
cursor: default;
}
#cp-app-drive-connection-state {
height: @variables_bar-height;
display: flex;
align-items: center;
justify-content: center;
background-color: #eb675e;
color: white;
font-weight: bold;
text-transform: uppercase;
cursor: default;
}
}