From d26d8f53d9bee8bd8ebfe9dcf22a67b947378f2b Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Thu, 2 Mar 2017 15:50:03 +0100 Subject: [PATCH 1/4] (CSS) Fixed textarea being too large --- www/poll/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/www/poll/index.html b/www/poll/index.html index cdaf574f3..a6de75ade 100644 --- a/www/poll/index.html +++ b/www/poll/index.html @@ -92,6 +92,7 @@ margin: auto; min-width: 80%; + width: 80%; min-height: 5em; font-size: 20px; font-weight: bold; From e0d972674fa4f50be4217e6ae85a8d62b2d9bb9d Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Thu, 2 Mar 2017 16:22:32 +0100 Subject: [PATCH 2/4] Fix context menu in drive and rename textbox styling --- www/drive/file.css | 2 ++ www/drive/file.less | 2 ++ www/drive/main.js | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/www/drive/file.css b/www/drive/file.css index e80d6f98a..9f41d3839 100644 --- a/www/drive/file.css +++ b/www/drive/file.css @@ -66,6 +66,7 @@ li { .contextMenu { display: none; position: absolute; + z-index: 50; } .contextMenu li { padding: 0; @@ -247,6 +248,7 @@ span.fa-folder-open { } #content div.grid li input { width: 100%; + margin-top: 5px; } #content div.grid li .fa { display: block; diff --git a/www/drive/file.less b/www/drive/file.less index d5a7c1d73..cf874dad7 100644 --- a/www/drive/file.less +++ b/www/drive/file.less @@ -95,6 +95,7 @@ li { .contextMenu { display: none; position: absolute; + z-index: 50; li { padding: 0; font-size: 16px; @@ -292,6 +293,7 @@ span { } input { width: 100%; + margin-top: 5px; } .fa { display: block; diff --git a/www/drive/main.js b/www/drive/main.js index 1b6dd4a79..4836fe51c 100644 --- a/www/drive/main.js +++ b/www/drive/main.js @@ -1424,7 +1424,8 @@ define([ // Open the menu $iframe.find('.contextMenu').css({ top: ($context.offset().top + 32) + 'px', - right: '0px' + right: '0px', + left: '' }); $li.contextmenu(); }); From fa59f1000e7ea7c9404bb50a2b8bf2932b5d962b Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Thu, 2 Mar 2017 16:33:17 +0100 Subject: [PATCH 3/4] (CSS) Fix title input in pads --- customize.dist/src/less/toolbar.less | 3 +-- customize.dist/toolbar.css | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index 73cce9923..2a5b3b0d8 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -253,13 +253,12 @@ input { font-size: 1.5em; vertical-align: middle; - height: 100%; box-sizing: border-box; border: 1px solid black; background: #fff; cursor: auto; width: 300px; - padding: 0px 5px; + padding: 5px 5px; } } .cryptpad-link { diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css index de846b7bd..2ede62a9d 100644 --- a/customize.dist/toolbar.css +++ b/customize.dist/toolbar.css @@ -324,13 +324,12 @@ .cryptpad-toolbar-top .cryptpad-title input { font-size: 1.5em; vertical-align: middle; - height: 100%; box-sizing: border-box; border: 1px solid black; background: #fff; cursor: auto; width: 300px; - padding: 0px 5px; + padding: 5px 5px; } .cryptpad-toolbar-top .cryptpad-link { position: absolute; From e8a82c4c1004e10a98b70f5569f7d942d3449d56 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Thu, 2 Mar 2017 16:35:30 +0100 Subject: [PATCH 4/4] (CSS) Toolbar buttons are now always black on white independent of system theme --- customize.dist/src/less/toolbar.less | 1 + customize.dist/toolbar.css | 1 + 2 files changed, 2 insertions(+) diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index 2a5b3b0d8..3936b13f5 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -95,6 +95,7 @@ } button { + color: #000; background-color: inherit; background-image: linear-gradient(to bottom,#fff,#e4e4e4); border: 1px solid #A6A6A6; diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css index 2ede62a9d..5d81a1123 100644 --- a/customize.dist/toolbar.css +++ b/customize.dist/toolbar.css @@ -164,6 +164,7 @@ margin-right: 2px; } .cryptpad-toolbar button { + color: #000; background-color: inherit; background-image: linear-gradient(to bottom, #fff, #e4e4e4); border: 1px solid #A6A6A6;