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

Merge branch 'staging' into soon

Browse Source
This commit is contained in:
ansuz
2018-05-17 11:00:37 +02:00
parent cfe8b67142 534d5ae006
commit 57f2e26d8a
45 changed files with 1045 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
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,21 @@
}
}
}
.cp-creation-password {
.cp-creation-password-picker {
text-align: center;
width: 100%;
.cp-password-container {
input {
width: 150px;
padding: 0 5px;
}
label {
flex: unset;
}
}
}
}
.cp-creation-settings {
button {
margin: 0;

5
customize.dist/src/less2/include/framework.less
View File

@@ -6,6 +6,7 @@
@import (once) './creation.less';
@import (once) './tippy.less';
@import (once) "./checkmark.less";
@import (once) "./password-input.less";
.framework_main(@bg-color, @warn-color, @color) {
.toolbar_main(
@@ -18,11 +19,13 @@
.tokenfield_main();
.tippy_main();
.checkmark_main(20px);
.password_main();
.creation_main(
@bg-color: @bg-color,
@warn-color: @warn-color,
@color: @color
);
font: @colortheme_app-font;
}
.framework_min_main(
@@ -39,6 +42,8 @@
.alertify_main();
.tippy_main();
.checkmark_main(20px);
.password_main();
font: @colortheme_app-font;
}

13
customize.dist/src/less2/include/password-input.less Normal file
View File

@@ -0,0 +1,13 @@
.password_main() {
.cp-password-container {
display: flex;
align-items: center;
input {
flex: 1;
min-width: 0;
}
label, .fa {
margin-left: 10px;
}
}
}