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
commit 6a365da3d8
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
customize.dist/src/less2/include/sidebar-layout.less
View File

@ -1,6 +1,7 @@
@import (reference) "/customize/src/less2/include/colortheme-all.less"; @import (reference) "/customize/src/less2/include/colortheme-all.less";
@import (reference) "/customize/src/less2/include/leftside-menu.less"; @import (reference) "/customize/src/less2/include/leftside-menu.less";
@import (reference) "/customize/src/less2/include/buttons.less"; @import (reference) "/customize/src/less2/include/buttons.less";
@import (reference) "/customize/src/less2/include/browser.less";
@sidebar_button-width: 400px; @sidebar_button-width: 400px;
@ -73,6 +74,7 @@
padding: 5px 20px; padding: 5px 20px;
color: @rightside-color; color: @rightside-color;
overflow: auto; overflow: auto;
padding-bottom: 200px;
// Following rules are only in settings // Following rules are only in settings
.cp-sidebarlayout-element { .cp-sidebarlayout-element {
@ -107,6 +109,7 @@
.cp-sidebarlayout-input-block { .cp-sidebarlayout-input-block {
display: inline-flex; display: inline-flex;
width: @sidebar_button-width; width: @sidebar_button-width;
max-width: 100%;
input { input {
flex: 1; flex: 1;
//border-radius: 0.25em 0 0 0.25em; //border-radius: 0.25em 0 0 0.25em;
@ -118,6 +121,7 @@
//border: 1px solid #adadad; //border: 1px solid #adadad;
border-left: 0px; border-left: 0px;
height: @variables_input-height; height: @variables_input-height;
margin: 0 !important;
} }
} }
&>div { &>div {
@ -162,6 +166,25 @@
} }
*/ */
} }
@media screen and (max-width: @browser_media-medium-screen) {
flex-flow: column;
overflow: auto;
#cp-sidebarlayout-leftside {
width: 100% !important; // Override "narrow" mode
padding-bottom: 20px;
.cp-sidebarlayout-categories {
.cp-sidebarlayout-category {
margin: 0;
span.cp-sidebar-layout-category-name {
display: inline !important; // override "narrow" mode
}
}
}
}
#cp-sidebarlayout-rightside {
overflow: unset;
}
}
} }
} }

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

@ -27,6 +27,8 @@
.cp-support-list-actions { .cp-support-list-actions {
margin: 10px 0px 10px 2px; margin: 10px 0px 10px 2px;
} }
.cp-support-list-ticket:not(.cp-support-list-closed) {
.cp-support-list-message { .cp-support-list-message {
&:last-child:not(.cp-support-fromadmin) { &:last-child:not(.cp-support-fromadmin) {
color: @colortheme_cp-red; color: @colortheme_cp-red;
@ -36,6 +38,7 @@
} }
} }
} }
}
.cp-support-fromadmin { .cp-support-fromadmin {
color: @colortheme_logo-2; color: @colortheme_logo-2;

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

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