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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
yflory
2017-10-11 16:58:45 +02:00
parent 00e8d32d60 00d88dd421
commit a5a08176fb
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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] {

6
www/poll/inner.js
View File

@@ -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;
}