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

Merge branch 'staging' into communities-trim

Browse Source
This commit is contained in:
yflory
2020-02-11 11:10:12 +01:00
parent 872896543f 93abdff397
commit 0f697ac865
47 changed files with 1525 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@
@colortheme_oocell-bg: #40865c;
@colortheme_oocell-color: #FFF;
@colortheme_oocell-warn: #cd2532;
@colortheme_oocell-warn: #ffbcc0;
@colortheme_kanban-bg: #8C4;
@colortheme_kanban-color: #000;

7
customize.dist/src/less2/include/fileupload.less
View File

@@ -14,9 +14,11 @@
right: 10vw;
bottom: 10vh;
box-sizing: border-box;
z-index: 1000000; //Z file upload table container
z-index: 100000; //Z file upload table container
display: none;
color: darken(@colortheme_drive-bg, 10%);
max-height: 180px;
overflow-y: auto;
@media screen and (max-width: @browser_media-medium-screen) {
left: 5vw; right: 5vw; bottom: 5vw;
@@ -26,6 +28,9 @@
display: flex;
background-color: darken(@colortheme_modal-bg, 10%);
font-weight: bold;
position: sticky;
top: 0;
z-index: 1;
.cp-fileupload-header-title {
padding: 0.25em 0.5em;
flex-grow: 1;

25
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/leftside-menu.less";
@import (reference) "/customize/src/less2/include/buttons.less";
@import (reference) "/customize/src/less2/include/browser.less";
@sidebar_button-width: 400px;
@@ -73,6 +74,7 @@
padding: 5px 20px;
color: @rightside-color;
overflow: auto;
padding-bottom: 200px;
// Following rules are only in settings
.cp-sidebarlayout-element {
@@ -96,7 +98,7 @@
}
}
margin-bottom: 20px;
.buttons_main();
.buttons_main();
}
[type="text"], [type="password"], button {
vertical-align: middle;
@@ -107,6 +109,7 @@
.cp-sidebarlayout-input-block {
display: inline-flex;
width: @sidebar_button-width;
max-width: 100%;
input {
flex: 1;
//border-radius: 0.25em 0 0 0.25em;
@@ -118,6 +121,7 @@
//border: 1px solid #adadad;
border-left: 0px;
height: @variables_input-height;
margin: 0 !important;
}
}
&>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;
}
}
}
}