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

Merge branch 'master' of github.com:xwiki-labs/cryptpad

Browse Source
This commit is contained in:
ansuz 2017-10-12 14:09:55 +02:00
commit e317265594
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
readme.md
View File

@ -22,11 +22,11 @@ The most recent version and all past release notes can be found [here](https://g
## Setup using Docker ## Setup using Docker
See [Cryptpad-Docker](docs/cryptpad-docker.md) See [Cryptpad-Docker](docs/cryptpad-docker.md).
## Setup using Ansible ## 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 # Security
@ -79,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 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) 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 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 [ChainPad]: https://github.com/xwiki-contrib/chainpad
[active attack]: https://en.wikipedia.org/wiki/Attack_(computing)#Types_of_attacks [active attack]: https://en.wikipedia.org/wiki/Attack_(computing)#Types_of_attacks

37
www/poll/app-poll.less
View File

@ -28,7 +28,7 @@
@poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%); @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);
@poll-uncommitted-text: black; @poll-uncommitted-text: black;
@poll-placeholder: #666; @poll-placeholder: #fff;
@poll-border-color: #555; @poll-border-color: #555;
@poll-cover-color: #000; @poll-cover-color: #000;
@poll-fg: #000; @poll-fg: #000;
@ -77,12 +77,13 @@ input[type="text"][disabled], textarea[disabled] {
// The placeholder color only seems to effect Safari when not set // The placeholder color only seems to effect Safari when not set
input[type="text"][disabled]::placeholder { input[type="text"][disabled]::placeholder {
//color: @poll-placeholder; color: @poll-placeholder;
opacity: 1; opacity: 1;
} }
table#cp-app-poll-table { table#cp-app-poll-table {
margin: 0px; margin: 0px;
overflow: hidden;
} }
#cp-app-poll-table-container { #cp-app-poll-table-container {
position: relative; position: relative;
@ -235,22 +236,8 @@ div.cp-app-poll-realtime {
background-color: @poll-uncommitted-cell !important; background-color: @poll-uncommitted-cell !important;
} }
div.cp-app-poll-table-text-cell { div.cp-app-poll-table-text-cell {
display: flex;
align-items: center;
background-color: @poll-uncommitted-bg !important; background-color: @poll-uncommitted-bg !important;
color: @poll-uncommitted-text !important; color: @poll-uncommitted-text !important;
input {
order: 2;
flex: 1;
//width: ~"calc(100% - 80px)" !important;
//vertical-align: middle;
}
.cp-app-poll-table-remove {
order: 1;
}
.cp-app-poll-table-edit {
order: 3;
}
} }
text-align: center; text-align: center;
background-color: @poll-uncommitted-bg !important; background-color: @poll-uncommitted-bg !important;
@ -288,14 +275,22 @@ div.cp-app-poll-realtime {
margin: 0px; margin: 0px;
div.cp-app-poll-table-text-cell { div.cp-app-poll-table-text-cell {
height: 28px;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
height: 100%; display: flex;
align-items: center;
.cp-app-poll-table-remove {
order: 1;
}
.cp-app-poll-table-edit {
order: 3;
}
input { input {
width: 80%; min-width: 0;
width: 90%; order: 2;
height: 100%; flex: 1;
height: 24px;
border: 0px; border: 0px;
margin: 2px; margin: 2px;
&[disabled] { &[disabled] {

4
www/poll/inner.js
View File

@ -264,7 +264,7 @@ define([
}; };
var styleUncommittedColumn = function () { var styleUncommittedColumn = function () {
var $scroll = $('#cp-app-poll-table-scroll'); var $scroll = $('#cp-app-poll-table-scroll');
var hasScroll = $scroll.width() < $scroll[0].scrollWidth; var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
APP.uncommitted.content.colsOrder.forEach(function(id) { APP.uncommitted.content.colsOrder.forEach(function(id) {
// Enable the checkboxes for the uncommitted column // Enable the checkboxes for the uncommitted column
enableColumn(id); enableColumn(id);
@ -331,7 +331,7 @@ define([
}; };
var addCount = function () { var addCount = function () {
var $scroll = $('#cp-app-poll-table-scroll'); var $scroll = $('#cp-app-poll-table-scroll');
var hasScroll = $scroll.width() < $scroll[0].scrollWidth; var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100;
var $countCol = $('tr td:last-child'); var $countCol = $('tr td:last-child');
if (hasScroll) { if (hasScroll) {
$countCol.css('right', '0'); $countCol.css('right', '0');