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

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

Browse Source
This commit is contained in:
ansuz
2017-09-11 14:01:05 +02:00
parent 59d25b4c1a 8ef27dca08
commit 134c6057c1
35 changed files with 2863 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/src/less2/include/app-noscroll.less
View File

@@ -1,5 +1,5 @@
// html
.noscroll_main () {
.app-noscroll_main () {
height: 100%;
width: 100%;
padding: 0px;

46
customize.dist/src/less2/include/app-print.less Normal file
View File

@@ -0,0 +1,46 @@
.app-print_main () {
// Current scope is <html>
@media print {
height: auto;
max-height: none;
overflow: visible;
display:block;
@page {
margin: 0;
size: landscape;
}
// Slide app
body.cp-app-slide {
display: block;
.CodeMirror, #cme_toolbox {
display: none;
}
* {
visibility: hidden;
height: auto;
max-height: none;
}
.cp-app-slide-viewer #cp-app-slide-print {
display: block;
visibility: visible;
* {
visibility: visible;
}
}
.cp-app-slide-viewer #cp-app-slide-modal {
display: none !important;
}
.cp-app-slide-viewer {
flex: 1 !important;
overflow: visible !important;
}
.cp-toolbar-userlist-drawer {
display: none !important;
}
#cp-app-slide-editor {
height: auto;
display: block;
}
}
}
}

15
customize.dist/src/less2/include/infopages.less
View File

@@ -173,7 +173,8 @@
};
}
.cp-register-btn {
border: 2px solid #4591C4;
border: 2px solid #4591C4;
display: inline-block;
}
button:focus {
outline: none;
@@ -192,21 +193,9 @@
}
.cp-register-btn {
margin-right: 13px;
margin-left: 83vw;
text-align: center;
}
}
@media (max-width: 687px) {
.cp-register-btn {
margin-left: 75vw;
}
}
@media (max-width: 467px) {
.cp-register-btn {
margin-left: 63vw;
}
}
//footer general styles

5
customize.dist/src/less2/include/toolbar.less
View File

@@ -437,12 +437,15 @@
line-height: @toolbar_top-height;
margin: 0 10px;
.cp-toolbar-title-value {
border: 1px solid transparent;
padding: 5px;
font-size: 25px;
vertical-align: middle;
line-height: 25px;
white-space: nowrap;
}
.cp-toolbar-title-value-page {
border: 1px solid transparent;
padding: 0 5px;
}
.cp-toolbar-title-edit, .cp-toolbar-title-save {
@@ -485,8 +488,6 @@
.cp-toolbar-title-editable {
overflow: hidden;
text-overflow: ellipsis;
border: 1px solid transparent;
padding: 5px;
border-collapse: collapse;
}
input {

8
customize.dist/src/less2/main.less
View File

@@ -14,10 +14,16 @@ body.cp-page-terms { @import "./pages/page-terms.less"; }
// Set the HTML style for the apps which shouldn't have a body scrollbar
html.cp-app-noscroll {
@import "./include/app-noscroll.less";
.noscroll_main();
.app-noscroll_main();
}
// Set the HTML style for printing slides
html.cp-app-print {
@import "./include/app-print.less";
.app-print_main();
}
body.cp-app-pad { @import "../../../pad/app-pad.less"; }
body.cp-app-code { @import "../../../code/app-code.less"; }
body.cp-app-slide { @import "../../../slide/app-slide.less"; }
body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }