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

Fix small UI issues with the new colortheme

Browse Source
This commit is contained in:
yflory
2018-04-16 15:46:19 +02:00
parent ec0fc85b9f
commit e2b9cf1c40
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,6 +254,7 @@
&.danger { &.danger {
background-color: @colortheme_alertify-red; background-color: @colortheme_alertify-red;
border-color: @colortheme_alertify-red-border; border-color: @colortheme_alertify-red-border;
color: @colortheme_alertify-red-color;
&:hover, &:active { &:hover, &:active {
background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%)); background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
} }
@@ -262,6 +263,7 @@
&.safe { &.safe {
background-color: @colortheme_alertify-green; background-color: @colortheme_alertify-green;
border-color: @colortheme_alertify-green-border; border-color: @colortheme_alertify-green-border;
color: @colortheme_alertify-green-color;
&:hover, &:active { &:hover, &:active {
background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-green, 10%), lighten(@colortheme_alertify-green, 10%)); background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-green, 10%), lighten(@colortheme_alertify-green, 10%));
} }

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

@@ -41,8 +41,10 @@
// TODO modals buttons // TODO modals buttons
@colortheme_alertify-red: #E55236; @colortheme_alertify-red: #E55236;
@colortheme_alertify-red-color: #FFF;
@colortheme_alertify-red-border: transparent; @colortheme_alertify-red-border: transparent;
@colortheme_alertify-green: #77C825; @colortheme_alertify-green: #77C825;
@colortheme_alertify-green-color: #FFF;
@colortheme_alertify-green-border: transparent; @colortheme_alertify-green-border: transparent;
@colortheme_alertify-primary: @colortheme_form-bg; @colortheme_alertify-primary: @colortheme_form-bg;
@colortheme_alertify-primary-text: @colortheme_form-color; @colortheme_alertify-primary-text: @colortheme_form-color;

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

@@ -103,7 +103,7 @@
display: flex; display: flex;
flex-flow: column; flex-flow: column;
align-items: center; align-items: center;
flex: 1; flex: 1 0 auto;
& > div { & > div {
width: 400px; width: 400px;
max-width: 100%; max-width: 100%;
@@ -191,7 +191,7 @@
} }
div.cp-creation-template { div.cp-creation-template {
width: 100%; width: 100%;
flex: 1; flex: 1 0 auto;
} }
.cp-creation-template-container { .cp-creation-template-container {
width: 100%; width: 100%;

2
www/filepicker/app-filepicker.less
View File

@@ -3,10 +3,12 @@
@import (once) '../../customize/src/less2/include/icon-colors.less'; @import (once) '../../customize/src/less2/include/icon-colors.less';
@import (once) '../../customize/src/less2/include/fileupload.less'; @import (once) '../../customize/src/less2/include/fileupload.less';
@import (once) '../../customize/src/less2/include/alertify.less'; @import (once) '../../customize/src/less2/include/alertify.less';
@import (once) '../../customize/src/less2/include/tippy.less';
.iconColors_main(); .iconColors_main();
.fileupload_main(); .fileupload_main();
.alertify_main(); .alertify_main();
.tippy_main();
#cp-filepicker-dialog { #cp-filepicker-dialog {
display: none; display: none;