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

Merge branch 'soon'

Browse Source
This commit is contained in:
yflory 2017-10-11 16:38:13 +02:00
commit 00d88dd421
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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');