Merge branch 'master' into staging

readme.md

@@ -16,13 +16,17 @@ Installing CryptPad is pretty straightforward. You can read all about it in the
 
 It also contains information on keeping your instance of CryptPad up to date.
 
+## Current version
+
+The most recent version and all past release notes can be found [here](https://github.com/xwiki-labs/cryptpad/releases/).
+
 ## Setup using Docker
 
-See [Cryptpad-Docker](docs/cryptpad-docker.md)
+See [Cryptpad-Docker](docs/cryptpad-docker.md).
 
 ## Setup using Ansible
 
-See [Ansible Role for Cryptpad](https://github.com/systemli/ansible-role-cryptpad)
+See [Ansible Role for Cryptpad](https://github.com/systemli/ansible-role-cryptpad).
 
 # Security
 
@@ -75,7 +79,7 @@ If you have any questions or comments, or if you're interested in contributing t
 This software is and will always be available under the GNU Affero General Public License as
 published by the Free Software Foundation, either version 3 of the License, or (at your option)
 any later version. If you wish to use this technology in a proprietary product, please contact
-sales@xwiki.com
+sales@xwiki.com.
 
 [ChainPad]: https://github.com/xwiki-contrib/chainpad
 [active attack]: https://en.wikipedia.org/wiki/Attack_(computing)#Types_of_attacks

www/poll/app-poll.less

@@ -28,7 +28,7 @@
 @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);
 @poll-uncommitted-text: black;
 
-@poll-placeholder: #666;
+@poll-placeholder: #fff;
 @poll-border-color: #555;
 @poll-cover-color: #000;
 @poll-fg: #000;
@@ -77,7 +77,7 @@ input[type="text"][disabled], textarea[disabled] {
 // The placeholder color only seems to effect Safari when not set
 
 input[type="text"][disabled]::placeholder {
-    //color: @poll-placeholder;
+    color: @poll-placeholder;
     opacity: 1;
 }
 
@@ -284,10 +284,9 @@ div.cp-app-poll-realtime {
                 margin: 0px;
 
                 div.cp-app-poll-table-text-cell {
+                    height: 28px;
                     padding: 0px;
                     margin: 0px;
-                    height: 100%;
-
                     display: flex;
                     align-items: center;
                     .cp-app-poll-table-remove {
@@ -297,9 +296,10 @@ div.cp-app-poll-realtime {
                         order: 3;
                     }
                     input {
+                        min-width: 0;
                         order: 2;
                         flex: 1;
-                        height: 100%;
+                        height: 24px;
                         border: 0px;
                         margin: 2px;
                         &[disabled] {

www/poll/inner.js

@@ -268,9 +268,9 @@ define([
     };
     var addScrollClass = function () {
         var $scroll = $('#cp-app-poll-table-scroll');
-        var hasScroll = $scroll.width() < $scroll[0].scrollWidth;
-        var noColumn = $scroll.width() < 100;
-        if (hasScroll && !noColumn) {
+        var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
+        var $countCol = $('tr td:last-child');
+        if (hasScroll) {
             $scroll.addClass('cp-app-poll-table-scrolled');
             return;
         }