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

Fix style issues in poll (Chrome)

Browse Source
This commit is contained in:
yflory 2017-10-11 16:01:26 +02:00
parent 86767184da
commit 54b5a2d654
2 changed files with 7 additions and 7 deletions
Show Stats 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-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,7 +77,7 @@ 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;
} }
@ -275,10 +275,9 @@ 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; display: flex;
align-items: center; align-items: center;
.cp-app-poll-table-remove { .cp-app-poll-table-remove {
@ -288,9 +287,10 @@ div.cp-app-poll-realtime {
order: 3; order: 3;
} }
input { input {
min-width: 0;
order: 2; order: 2;
flex: 1; flex: 1;
height: 100%; 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');