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

Merge branch 'sidebarlayout' into staging

Browse Source
This commit is contained in:
yflory
2020-02-10 16:35:47 +01:00
parent 4cd39f4f32 38ac562de2
commit 6a365da3d8
3 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
www/admin/app-admin.less
View File

@@ -27,12 +27,15 @@
.cp-support-list-actions {
margin: 10px 0px 10px 2px;
}
.cp-support-list-message {
&:last-child:not(.cp-support-fromadmin) {
color: @colortheme_cp-red;
background-color: lighten(@colortheme_cp-red, 25%);
.cp-support-showdata {
background-color: lighten(@colortheme_cp-red, 30%);
.cp-support-list-ticket:not(.cp-support-list-closed) {
.cp-support-list-message {
&:last-child:not(.cp-support-fromadmin) {
color: @colortheme_cp-red;
background-color: lighten(@colortheme_cp-red, 25%);
.cp-support-showdata {
background-color: lighten(@colortheme_cp-red, 30%);
}
}
}
}

10
www/settings/app-settings.less
View File

@@ -17,6 +17,10 @@
flex-flow: column;
font: @colortheme_app-font;
.cp-sidebarlayout-element {
max-width: 650px;
}
#cp-export-container {
font-size: 16px;
display: flex;
@@ -121,8 +125,13 @@
border: 1px solid black;
}
.cp-settings-language-selector {
#cp-language-selector {
display: inline;
}
button.btn {
width: @sidebar_button-width;
max-width: 100%;
margin: 0 !important;
background-color: @colortheme_sidebar-button-alt-bg;
border-color: #adadad;
color: black;
@@ -149,6 +158,7 @@
.cp-settings-info-block {
[type="text"] {
width: @sidebar_button-width;
max-width: 100%;
}
}