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

Merge branch 'design_dialogs' into staging

Browse Source
This commit is contained in:
yflory
2019-11-22 17:26:53 +01:00
parent be7b184d97 0429859c26
commit 7e45f597c9
12 changed files with 298 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
@alertify-btn-fg: @alertify-fore;
@alertify-light-bg: fade(@alertify-fore, 25%);
@alertify-bg: @colortheme_modal-dim;
@alertify-fg: @alertify-fore;
@@ -164,27 +165,29 @@
display: flex;
flex-flow: column;
.alertify-tabs-titles {
height: 30px;
height: 40px;
display: flex;
border-bottom: 1px solid @alertify-fore;
margin-bottom: 20px;
margin-bottom: 10px;
box-sizing: content-box;
span {
font-size: 20px;
height: 30px;
line-height: 30px;
height: 40px;
line-height: 40px;
box-sizing: border-box;
padding: 0 15px;
border-left: 1px solid lighten(@alertify-base, 10%);
border-right: 1px solid lighten(@alertify-base, 10%);
cursor: pointer;
&:hover {
background-color: @alertify-light-bg;
}
}
span.alertify-tabs-active {
background-color: @alertify-fore;
border-left: 1px solid @alertify-fore;
border-right: 1px solid @alertify-fore;
color: @alertify-base;
font-weight: bold;
cursor: default;
}
}
@@ -206,24 +209,28 @@
}
::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
color: darken(@alertify-input-fg, 15%);
color: @cryptpad_color_grey;
opacity: 1; /* Firefox */
}
:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: darken(@alertify-input-fg, 15%);
color: @cryptpad_color_grey;
}
::-ms-input-placeholder { /* Microsoft Edge */
color: darken(@alertify-input-fg, 15%);
color: @cryptpad_color_grey;
}
input:not(.form-control), textarea {
background-color: @alertify-input-bg;
color: @alertify-input-fg;
border: 0px;
background-color: @alertify-input-fg;
color: @cryptpad_text_col;
border: 1px solid @alertify-input-bg;
margin-bottom: 15px;
width: 100%;
font-size: 100%;
padding: @alertify_padding-base;
&[readonly] {
background-color: @alertify-light-bg;
color: @cryptpad_text_col;
border-color: @alertify-input-fg;
}
}
span.cp-password-container {
@@ -239,6 +246,7 @@
}
}
input[type="checkbox"], input[type="radio"] {
width: auto;
padding: 0;
@@ -337,12 +345,15 @@
}
}
button.btn {
margin: 6px 4px;
}
nav {
padding: @alertify_padding-base;
text-align: right;
button {
margin: 0px !important;
&:not(:last-child) {
margin-right: @alertify_padding-base !important;
}
}
}
}
}

2
customize.dist/src/less2/include/colortheme.less
View File

@@ -23,7 +23,7 @@
@colortheme_form-bg: @colortheme_logo-2;
@colortheme_form-color: #ffffff;
@colortheme_form-bg-alt: #ffffff;
@colortheme_form-color-alt: @colortheme_logo-1;
@colortheme_form-color-alt: @colortheme_logo-2;
@colortheme_form-warning: #f49842;
@colortheme_form-warning-hov: darken(@colortheme_form-warning, 5%);

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

@@ -15,6 +15,7 @@
@import (reference) "./messenger.less";
@import (reference) "./cursor.less";
@import (reference) "./usergrid.less";
@import (reference) "./modals-ui-elements.less";
.framework_main(@bg-color, @warn-color, @color) {
--LessLoader_require: LessLoader_currentFile();
@@ -32,6 +33,7 @@
@color: @color
);
.alertify_main();
.modals-ui-elements_main();
.corner_main();
.contextmenu_main();
.fileupload_main();
@@ -70,6 +72,7 @@
);
.fileupload_main();
.alertify_main();
.modals-ui-elements_main();
.corner_main();
.contextmenu_main();
.tippy_main();

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

@@ -66,6 +66,11 @@
padding: 8px 12px;
margin: 1em;
width: 300px;
&[type="text"] {
background-color: @colortheme_modal-input-fg;
color: @cryptpad_text_col;
border: 1px solid @colortheme_modal-input;
}
}
.cp-modal-close {

18
customize.dist/src/less2/include/modals-ui-elements.less Normal file
View File

@@ -0,0 +1,18 @@
@import (reference) "./colortheme-all.less";
.modals-ui-elements_main() {
--LessLoader_require: LessLoader_currentFile();
}
& {
// Share modal
.msg.cp-inline-radio-group {
.radio-group {
display: flex;
flex-direction: row;
.cp-radio {
margin-right: 30px;
}
}
}
}

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

@@ -24,7 +24,7 @@
min-width: 0;
margin-bottom: 0 !important;
&::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
color: @colortheme_alertify-primary-text;
color: @cryptpad_color_grey;
opacity: 1; /* Firefox */
}
}