Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 4 years ago
commit 77f12a95cf

@ -332,10 +332,10 @@
// Admin // Admin
@cp_admin-isadmin-fg: @cryptpad_color_brand; @cp_admin-isadmin-fg: @cryptpad_color_brand;
@cp_admin-isadmin-bg: @cryptpad_color_white; @cp_admin-isadmin-bg: @cryptpad_color_white;
@cp_admin-premium-fg: @cryptpad_color_warn_red; @cp_admin-premium-fg: @cryptpad_color_light_red;
@cp_admin-premium-bg: lighten(@cryptpad_color_warn_red, 25%); @cp_admin-premium-bg: @cryptpad_color_red_fader;
@cp_admin-last-fg: @cryptpad_color_warn_red; @cp_admin-last-fg: @cryptpad_color_light_red;
@cp_admin-last-bg: lighten(@cryptpad_color_orange, 25%); @cp_admin-last-bg: @cryptpad_color_red_fader;
// Code // Code
@cp_preview-bg: @cryptpad_color_grey_900; @cp_preview-bg: @cryptpad_color_grey_900;
@ -392,6 +392,7 @@
@cp_comments-fg: @cryptpad_text_col; @cp_comments-fg: @cryptpad_text_col;
@cp_comments-bg: @cryptpad_color_grey_800; @cp_comments-bg: @cryptpad_color_grey_800;
@cp_comments-header: @cryptpad_color_grey_500; @cp_comments-header: @cryptpad_color_grey_500;
@cp_comments-notif: @cryptpad_color_light_red;
// Poll // Poll
@cp_poll-th-bg: @cryptpad_color_brand_fadest; @cp_poll-th-bg: @cryptpad_color_brand_fadest;

@ -391,6 +391,7 @@
@cp_comments-fg: @cryptpad_text_col; @cp_comments-fg: @cryptpad_text_col;
@cp_comments-bg: @cryptpad_color_white; @cp_comments-bg: @cryptpad_color_white;
@cp_comments-header: @cryptpad_color_grey_600; @cp_comments-header: @cryptpad_color_grey_600;
@cp_comments-notif: @cryptpad_color_red;
// Poll // Poll
@cp_poll-th-bg: @cryptpad_color_lighter_blue; @cp_poll-th-bg: @cryptpad_color_lighter_blue;

@ -101,7 +101,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
color: #666; color: fade(@cryptpad_text_col, 80%);
.cp-support-ispremium { .cp-support-ispremium {
padding: 0 5px; padding: 0 5px;
color: @cp_admin-premium-fg; color: @cp_admin-premium-fg;

@ -53,7 +53,8 @@ body.cp-app-pad {
#cp-app-pad-comments { #cp-app-pad-comments {
&.hidden { &.hidden {
.cp-pad-show.notif { .cp-pad-show.notif {
color: red; color: @cp_comments-notif;
border-color: @cryptpad_color_red;
} }
} }
.cp-pad-show { .cp-pad-show {

Loading…
Cancel
Save