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

Merge branch 'password' into staging

Browse Source
This commit is contained in:
yflory
2018-05-03 15:16:03 +02:00
parent 67fd70b4c7 2451174870
commit 10ce95087a
37 changed files with 608 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
customize.dist/src/less2/include/creation.less
View File

@@ -145,16 +145,18 @@
max-height: 100px;
}
}
input, select {
font-size: 14px;
border: 1px solid @colortheme_form-border;
height: 26px;
background-color: @colortheme_form-bg;
color: @colortheme_form-color;
}
.cp-creation-expire {
.cp-creation-expire-picker {
text-align: center;
input, select {
font-size: 14px;
border: 1px solid @colortheme_form-border;
height: 26px;
background-color: @colortheme_form-bg;
color: @colortheme_form-color;
}
input {
width: 50px;
margin: 0 5px;
@@ -172,6 +174,22 @@
}
}
}
.cp-creation-password {
.cp-creation-password-picker {
text-align: center;
input {
width: 150px;
}
}
&.active {
label {
flex: unset;
}
.cp-creation-slider {
flex: 1;
}
}
}
.cp-creation-settings {
button {
margin: 0;
@@ -317,7 +335,7 @@
width: 95%;
margin: 10px auto;
}
.cp-creation-expire {
.cp-creation-expire, .cp-creation-password {
&.active {
label {
flex: 1;