Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.
He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.
As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.
')
]),
h('div.col-md-4', [
- h('img.bio-avatar', {'src': '/customize/images/avatar.png'}),
+ h('img.bio-avatar', {'src': '/customize/images/Catalin.jpg'}),
h('h3', "Catalin Scripcariu"),
- setHTML(h('div#bio'), '')
+ setHTML(h('div#bio'), ' Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.
At the beginning of 2017 he joined the Xwiki family, where he worked both on the business and the community side of XWiki, including the research team and CryptPad.
')
]),
h('div.col-md-4', [
h('img.bio-avatar', {'src': '/customize/images/ludovic.jpg'}),
@@ -285,7 +298,7 @@ define([
])
])
]),
- ])
+ ]),
];
};
@@ -336,20 +349,26 @@ define([
}),
h('div.checkbox-container', [
h('input#import-recent', {
+ name: 'import-recent',
type: 'checkbox',
checked: true
}),
- h('label', {
+ // hscript doesn't generate for on label for some
+ // reason... use jquery as a temporary fallback
+ setHTML($(' - needed to position the dropdown content */
.dropdown-bar {
@@ -36,7 +37,7 @@
z-index: 1000;
max-height: 300px;
overflow-y: auto;
- font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+ font-family: @colortheme_font;
font-size: 16px;
line-height: 1em;
diff --git a/customize.dist/src/less/footer.less b/customize.dist/src/less/footer.less
index 8862bf951..fdfc69d7a 100644
--- a/customize.dist/src/less/footer.less
+++ b/customize.dist/src/less/footer.less
@@ -1,8 +1,9 @@
@import "./variables.less";
+@import (once) "../less2/include/colortheme.less";
.cp footer {
background: @category-bg;
- font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+ font-family: @colortheme_font;
padding-top: 1em;
font-size: 1.2em;
a {
diff --git a/customize.dist/src/less/loading.less b/customize.dist/src/less/loading.less
index cf93330cb..e7cb8060a 100644
--- a/customize.dist/src/less/loading.less
+++ b/customize.dist/src/less/loading.less
@@ -1,4 +1,5 @@
@import "./variables.less";
+@import (once) "../less2/include/colortheme.less";
.cp #loading {
position: fixed;
@@ -51,7 +52,7 @@
text-align: center;
font-size: 1.5em;
opacity: 0.7;
- font-family: lato, Helvetica, sans-serif;
+ font-family: @colortheme_font;
padding: 15px;
max-width: 60%;
display: inline-block;
diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less
index f6ac5b1ac..91afca6ae 100644
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -2,6 +2,7 @@
@import "./mixins.less";
@import "./dropdown.less";
+@import (once) "../less2/include/colortheme.less";
.unselectable {
-webkit-touch-callout: none;
@@ -61,7 +62,7 @@
}
body .userlist-drawer {
- font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+ font: @main-font-size @colortheme_font;
min-width: 175px;
width: 175px;
display: block;
@@ -100,7 +101,7 @@ body .userlist-drawer {
}
& > p {
- font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+ font: @main-font-size @colortheme_font;
margin: 0;
padding: 0;
display: block;
diff --git a/customize.dist/src/less/topbar.less b/customize.dist/src/less/topbar.less
index 3e8812ddd..05472a605 100644
--- a/customize.dist/src/less/topbar.less
+++ b/customize.dist/src/less/topbar.less
@@ -1,4 +1,5 @@
@import "./variables.less";
+@import (once) "../less2/include/colortheme.less";
#cryptpadTopBar {
background: @topbar-back;
@@ -8,7 +9,7 @@
right: 0;
height: @topbar-height;
color: @topbar-color;
- font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: @colortheme_font;
padding: 5px;
box-sizing: border-box;
font-size: 30px;
diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less
index 87165c2b8..8469ec518 100644
--- a/customize.dist/src/less/variables.less
+++ b/customize.dist/src/less/variables.less
@@ -49,7 +49,7 @@
// Dropdown
-@dropdown-font: @main-font-size -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+@dropdown-font: @main-font-size @colortheme_font;
@dropdown-bg: #f9f9f9;
@dropdown-color: black;
@dropdown-bg-hover: #f1f1f1;
diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index cb3fd3621..1a791bc04 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -2,26 +2,25 @@
@import (once) "./browser.less";
.alertify_main () {
- @alertify-fore: @colortheme_old-fore;
- @alertify-base: @colortheme_old-base;
+ @alertify-fore: @colortheme_modal-fg;
+ @alertify-base: @colortheme_modal-bg;
- @alertify-dialog-bg: #444;
- @alertify-dialog-fg: @colortheme_old-fore;
+ @alertify-dialog-bg: @alertify-base;
+ @alertify-dialog-fg: @alertify-fore;
- @alertify-btn-fg: @colortheme_old-fore;
+ @alertify-btn-fg: @alertify-fore;
- @alertify-btn-bg: rgba(200, 200, 200, 0.05);
- @alertify-btn-bg-hover: rgba(200, 200, 200, .15);
+ @alertify-btn-bg: rgba(200, 200, 200, 0.1);
+ @alertify-btn-bg-hover: rgba(200, 200, 200, .3);
- @alertify-bg: rgba(0, 0, 0, .3);
- @alertify-fg: @colortheme_old-fore;
+ @alertify-bg: @colortheme_modal-dim;
+ @alertify-fg: @alertify-fore;
- @alertify-input-bg: @colortheme_old-base;
- @alertify-input-fg: @colortheme_old-fore;
+ @alertify-input-bg: @colortheme_modal-input;
+ @alertify-input-fg: @colortheme_modal-fg;
- @alertify_padding-base: 12px;
- @alertify_box-shadow: 0 2px 5px 0 rgba(0,0,0,.2);
- @alertify_border-radius: 1px;
+ @alertify_padding-base: @colortheme_modal-padding;
+ @alertify_box-shadow: @colortheme_modal-shadow;
// Logs to show that something has happened
// These show only once
@@ -34,20 +33,20 @@
padding: @alertify_padding-base @alertify_padding-base * 4;
color: @alertify-fore;
- font-weight: bold;
+ font-family: @colortheme_font;
font-size: large;
box-shadow: @alertify_box-shadow;
- border-radius: @alertify_border-radius;
&, &.default {
// FIXME
background: rgba(0, 0, 0, .8);
}
&.error {
+ font-weight: bold;
background: @colortheme_cp-red;
}
&.success {
- background: @colortheme_cp-green;
+ background: rgba(0, 0, 0, .8);
}
}
}
@@ -64,6 +63,10 @@
height: 100%;
z-index: 99999;
+ h1, h2, h3 {
+ margin-top: 0;
+ }
+
&.hide {
opacity: 0;
pointer-events: none;
@@ -89,7 +92,6 @@
& > div {
background-color: @alertify-dialog-bg;
- border-radius: 5px;
&.half {
width: 50%;
@media (max-width: @browser_media-medium-screen) {
@@ -106,10 +108,10 @@
> * {
width: 30%;
- width: 500px;
+ min-width: 500px;
max-width: 95%;
margin: 0 auto;
- text-align: center;
+ text-align: left;
padding: @alertify_padding-base;
background: #fff;
// FIXME
@@ -120,14 +122,12 @@
padding: @alertify_padding-base;
margin-bottom: @alertify_padding-base;
margin: 0;
- text-align: left;
}
- input:not(.form-control){
+ input:not(.form-control), textarea {
background-color: @alertify-input-bg;
color: @alertify-input-fg;
border: 0px;
- border-radius: 5px;
margin-bottom: 15px;
width: 100%;
@@ -137,6 +137,13 @@
//outline-offset: -2px;
}
}
+
+ input[type="checkbox"] {
+ padding: 0;
+ margin: 0;
+ margin-right: 0.5em;
+ }
+
nav {
text-align: right;
@@ -161,10 +168,10 @@
font-size: 14px;
text-decoration: none;
cursor: pointer;
+ border-radius: 0;
color: @alertify-btn-fg;
- border: 1px solid @alertify-base;
- border-radius: 5px;
+ border: 1px solid transparent;
&.safe, &.danger {
color: @colortheme_old-base;
@@ -172,16 +179,16 @@
font-weight: bold;
}
&.danger {
- background-color: @colortheme_cp-red;
+ background-color: @colortheme_alertify-red;
&:hover, &:active {
- background-color: lighten(@colortheme_cp-red, 5%);
+ background-color: lighten(@colortheme_alertify-red, 5%);
}
}
&.safe {
- background-color: @colortheme_cp-green;
+ background-color: @colortheme_alertify-green;
&:hover, &:active {
- background-color: lighten(@colortheme_cp-green, 10%);
+ background-color: lighten(@colortheme_alertify-green, 10%);
}
}
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 268a26922..a1e02d9d4 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -1,3 +1,5 @@
+@colortheme_font: 'Open Sans', 'Helvetica Neue', sans-serif;
+
@colortheme_link-color: #0275D8;
@colortheme_link-color-visited: #005999;
@colortheme_info-background: #fafafa;
@@ -11,6 +13,19 @@
@colortheme_cp-red: #FA5858; // remove red
@colortheme_cp-green: #46E981;
+@colortheme_modal-bg: #222;
+@colortheme_modal-fg: #fff;
+@colortheme_modal-dim: rgba(0, 0, 0, 0.4);
+@colortheme_modal-padding: 12px;
+@colortheme_modal-shadow: 0 8px 32px 0 rgba(0,0,0,.4);
+
+@colortheme_modal-input: #111;
+
+@colortheme_alertify-red: #E55236;
+@colortheme_alertify-green: #77C825;
+
+// Apps
+
@colortheme_pad-bg: #1c4fa0;
@colortheme_pad-color: #fff;
@@ -43,3 +58,6 @@
@colortheme_profile-bg: #0087ff;
@colortheme_profile-color: #fff;
+
+@cryptpad_color_blue: #4591C4;
+@cryptpad_color_grey: #999999;
diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less
index 73b68b40a..390877b40 100644
--- a/customize.dist/src/less2/include/infopages.less
+++ b/customize.dist/src/less2/include/infopages.less
@@ -8,10 +8,8 @@
background-color: @colortheme_info-background;
a {
- color: @colortheme_link-color;
- &:visited { color: @colortheme_link-color-visited; }
- //opacity: 0.8;
- //transition: opacity 0.2s;
+ color: @cryptpad_color_blue;
+ &:visited { color: darken(@cryptpad_color_blue, 10%); }
}
a:hover {
opacity: 1;
@@ -21,8 +19,8 @@
padding: 0;
margin: 0;
- font-size: 16pxt:;
- font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
+ font-size: 16px;
+ font-family: @colortheme_font;
.cp-container {
font-size: 16px;
@@ -76,25 +74,26 @@
}
footer {
- background-color: white;
-
+ background-color: @cryptpad_color_grey;
.container {
.col {
margin-top: 1em;
}
-
- width: 100%;
- text-align: center;
- margin-bottom: 1em;
-
- ul.list-unstyled {
+ a {
+ color: #fff;
+ &:visited {
+ color: darken(#fff, 20%);
+ };
+ }
+ margin-bottom: 1em;
+ ul.list-unstyled {
margin: 0;
}
}
.cp-version-footer {
- background-color: @colortheme_info-background;
- color: black;
+ background-color: #6C6C6C;
+ color: #fff;
text-align: center;
padding: 0.5em;
}
@@ -151,10 +150,71 @@
}
.cp-logo {
- img {
- height: @infopages_infobar-height / 2;
- }
margin-right: 0.5em;
}
}
}
+
+// navigation top bar
+.navbar {
+ background: #fff;
+ .navbar-brand {
+ display: block;
+ background-image: url(/customize/CryptPad_logo_color.svg);
+ background-repeat: no-repeat;
+ background-size: contain;
+ height: 50px;
+ width: 250px;
+ }
+ a {
+ border: 2px solid transparent;
+ }
+ .nav-link {
+ padding: 0.5em 0.7em;
+ &:hover {
+ transform: scale(1.05);
+ };
+ }
+ .cp-register-btn {
+ border: 2px solid #4591C4;
+ }
+ button:focus {
+ outline: none;
+ }
+ .navbar-toggler {
+ margin-top: 10px;
+ color: #4591C4;
+ }
+}
+@media (max-width: 991px) {
+ #menuCollapse {
+ text-align: right;
+ }
+ .navbar-nav a {
+ text-align: right !important;
+ }
+ .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
+
+.footer-title {
+ font-weight: bold;
+ font-size: 1.2em;
+ color: #1E1F1F;
+}
diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less
index 7e9cb81a4..66c72eec9 100644
--- a/customize.dist/src/less2/pages/page-about.less
+++ b/customize.dist/src/less2/pages/page-about.less
@@ -9,4 +9,4 @@
margin: 1em 0;
max-width: 300px;
max-height: 300px;
-}
+}
\ No newline at end of file
diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less
index 962a174f1..84ec8bab6 100644
--- a/customize.dist/src/less2/pages/page-index.less
+++ b/customize.dist/src/less2/pages/page-index.less
@@ -13,6 +13,7 @@
color: #FFF;
background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg');
background-size: cover;
+ background-position: center;
min-height: 100vh;
display: flex;
flex-direction: column;
@@ -63,24 +64,21 @@
}
}
.navbar {
+ background: transparent;
width: 100%;
@media only screen and (max-device-width: 991px) {
margin-top: 0;
}
.navbar-brand {
- background: url(/customize/CryptPad-white-logo.svg) no-repeat;
- width: 250px;
- height: 50px;
+ background-image: url(/customize/CryptPad-white-logo.svg);
}
a {
color: #fff;
- border: 2px solid transparent;
&:visited {
color: rgba(255,255,255,.8);
};
}
.nav-link {
- padding: 0.5em 0.7em;
&:hover {
transform: scale(1.05);
};
@@ -88,9 +86,6 @@
.cp-register-btn {
border: 2px solid #fff;
}
- button:focus {
- outline: none;
- }
.navbar-toggler {
margin-top: 10px;
color: #fff;
@@ -196,27 +191,4 @@ h4 {
left: 5px;
}
}
-@media (max-width: 991px) {
- #menuCollapse {
- text-align: right;
- }
- .navbar-nav a {
- text-align: right !important;
- }
- .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;
- }
-}
diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less
index fc54a3073..06a5207c6 100644
--- a/customize.dist/src/less2/pages/page-register.less
+++ b/customize.dist/src/less2/pages/page-register.less
@@ -23,3 +23,10 @@
}
}
}
+
+.alertify {
+ // workaround for alertify making empty p
+ p:empty {
+ display: none;
+ }
+}
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index a074faab7..437d91de6 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1397,23 +1397,42 @@ define([
}
};
+ // This is duplicated in drive/main.js, it should be unified
+ var getFileIcon = function (data) {
+ var $icon = common.getIcon();
+
+ if (!data) { return $icon; }
+
+ var href = data.href;
+ if (!href) { return $icon; }
+
+ if (href.indexOf('/pad/') !== -1) { $icon = common.getIcon('pad'); }
+ else if (href.indexOf('/code/') !== -1) { $icon = common.getIcon('code'); }
+ else if (href.indexOf('/slide/') !== -1) { $icon = common.getIcon('slide'); }
+ else if (href.indexOf('/poll/') !== -1) { $icon = common.getIcon('poll'); }
+ else if (href.indexOf('/whiteboard/') !== -1) { $icon = common.getIcon('whiteboard'); }
+ else if (href.indexOf('/file/') !== -1) { $icon = common.getIcon('file'); }
+
+ return $icon;
+ };
common.createFileDialog = function (cfg) {
var $body = cfg.$body || $('body');
- var $block = $body.find('#fileDialog');
- if (!$block.length) {
- $block = $('
', {id: "fileDialog"}).appendTo($body);
+ var $blockContainer = $body.find('#fileDialog');
+ if (!$blockContainer.length) {
+ $blockContainer = $('
', {id: "fileDialog"}).appendTo($body);
}
- $block.html('');
+ $blockContainer.html('');
+ var $block = $('
', {'class': 'cp-modal'}).appendTo($blockContainer);
$('
', {
'class': 'close fa fa-times',
'title': Messages.filePicker_close
}).click(function () {
- $block.hide();
+ $blockContainer.hide();
}).appendTo($block);
var $description = $('').text(Messages.filePicker_description);
$block.append($description);
- var $filter = $('
').appendTo($block);
+ var $filter = $('
', {'class': 'cp-form'}).appendTo($block);
var $container = $('', {'class': 'fileContainer'}).appendTo($block);
var updateContainer = function () {
$container.html('');
@@ -1426,11 +1445,15 @@ define([
if (filter && name.toLowerCase().indexOf(filter.toLowerCase()) === -1) {
return;
}
- var $span = $('', {'class': 'element'}).appendTo($container);
- var $inner = $('').text(name);
- $span.append($inner).click(function () {
+ var $span = $('', {
+ 'class': 'element',
+ 'title': name,
+ }).appendTo($container);
+ $span.append(getFileIcon(data));
+ $span.append(name);
+ $span.click(function () {
if (typeof cfg.onSelect === "function") { cfg.onSelect(data.href); }
- $block.hide();
+ $blockContainer.hide();
});
});
};
@@ -1446,13 +1469,13 @@ define([
//$filter.append(' '+Messages.or+' ');
var data = {FM: cfg.data.FM};
$filter.append(common.createButton('upload', false, data, function () {
- $block.hide();
+ $blockContainer.hide();
}));
updateContainer();
$body.keydown(function (e) {
- if (e.which === 27) { $block.hide(); }
+ if (e.which === 27) { $blockContainer.hide(); }
});
- $block.show();
+ $blockContainer.show();
};
diff --git a/www/common/file-dialog.less b/www/common/file-dialog.less
index 76840feeb..aac18f274 100644
--- a/www/common/file-dialog.less
+++ b/www/common/file-dialog.less
@@ -1,39 +1,101 @@
+@import (once) '../customize/src/less2/include/colortheme.less';
+
#fileDialog {
- position: absolute;
- background-color: rgba(200, 200, 200, 0.8);
- top: 15vh; bottom: 15vh;
- left: 10vw; right: 10vw;
- border: 1px solid black;
- z-index: 100000;
- overflow: auto;
display: none;
- font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
- font-size: 16px;
- text-align: center;
- .close {
+
+ z-index: 100000;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background-color: @colortheme_modal-dim;
+
+ .cp-modal {
+ background-color: @colortheme_modal-bg;
+ color: @colortheme_modal-fg;
+ box-shadow: @colortheme_modal-shadow;
+
+ padding: @colortheme_modal-padding;
+
position: absolute;
- top: 0;
- right: 0;
- padding: 5px;
- cursor: pointer;
- }
- .element {
- cursor: pointer;
- display: inline-flex;
- width: 100px;
- height: 100px;
- border: 1px solid #ccc;
- margin: 5px;
- overflow: hidden;
- word-wrap: break-word;
- background-color: white;
- padding: 5px;
- align-items: center;
- span {
- width: 100px;
- text-align: center;
+ top: 15vh; bottom: 15vh;
+ left: 10vw; right: 10vw;
+
+ overflow: auto;
+
+ font-family: @colortheme_font;
+ text-align: center;
+
+ & > p {
+ margin-bottom: 1em;
+ }
+
+ .cp-form {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
}
- }
-}
+ input {
+ background-color: @colortheme_modal-input;
+ color: @colortheme_modal-fg;
+ border: 0;
+ padding: 8px 12px;
+ margin: 1em;
+ }
+
+ .close {
+ text-shadow: none;
+ color: inherit;
+
+ position: absolute;
+ top: 0;
+ right: 0;
+ margin: @colortheme_modal-padding;
+ cursor: pointer;
+ }
+
+ .fileContainer {
+ display: flex;
+ flex-wrap: wrap;
+ overflow-y: auto;
+ }
+
+ .element {
+ @darker: darken(@colortheme_modal-fg, 30%);
+
+ width: 200px;
+ min-width: 200px;
+ height: 1em;
+ padding: 0.5em;
+ margin: 5px;
+ box-sizing: content-box;
+
+ text-align: left;
+ line-height: 1em;
+ cursor: pointer;
+ background-color: #111;
+ color: @darker;
+
+ transition: all 0.1s;
+
+ &:hover {
+ color: @colortheme_modal-fg;
+ }
+
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+
+ align-items: center;
+
+ .fa {
+ cursor: pointer;
+ margin-right: 0.5em;
+ }
+ }
+ }
+}
diff --git a/www/drive/main.js b/www/drive/main.js
index 098154ad0..b1b764336 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1146,6 +1146,7 @@ define([
$span.append($name).append($subfolders).append($files);
};
+ // This is duplicated in cryptpad-common, it should be unified
var getFileIcon = function (id) {
var $icon = Cryptpad.getIcon();
diff --git a/www/file/main.js b/www/file/main.js
index 11ec94650..f5e499f18 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -126,9 +126,14 @@ define([
}));
// make pdfs big
+ var toolbarHeight = $iframe.find('#toolbar').height();
$iframe.find('media-tag iframe').css({
- 'height': 'calc(100vh - 64px)',
- width: 'calc(100vw - 15px)',
+ 'height': 'calc(100vh - ' + toolbarHeight + 'px)',
+ 'width': '100vw',
+ 'position': 'absolute',
+ 'bottom': 0,
+ 'left': 0,
+ 'border': 0
});
})
.on('decryptionError', function (e) {
diff --git a/www/poll/main.js b/www/poll/main.js
index ecb308a36..7bef35e6d 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -621,6 +621,12 @@ var ready = function (info, userid, readOnly) {
.on('change', ['table'], change)
.on('remove', [], change);
+ var userInput = $('.uncommitted > input');
+ if (userInput.val() === '')
+ {
+ userInput.val(Cryptpad.getProxy()[Cryptpad.displayNameKey]);
+ }
+
UserList.addToUserData(APP.proxy.info.userData);
APP.ready = true;
diff --git a/www/poll/poll.less b/www/poll/poll.less
index 6153f320e..ddc0ea502 100644
--- a/www/poll/poll.less
+++ b/www/poll/poll.less
@@ -29,6 +29,7 @@ body {
flex: 1;
#poll {
flex: 1;
+ overflow-y: auto;
}
}