From 17b986a6cadf0a88fb7a26adc4571c9ea0e1b3b7 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 12:56:06 +0200 Subject: [PATCH 1/7] fix toolbar drive link (oops) --- www/common/toolbar2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js index 519700624..f641c0c9f 100644 --- a/www/common/toolbar2.js +++ b/www/common/toolbar2.js @@ -624,7 +624,7 @@ define([ }).appendTo(toolbar.$top); // We need to override the "a" tag action here because it is inside the iframe! - var inDrive = /^\/drive/; + var inDrive = /^\/drive/.test(window.location.pathname); var href = inDrive ? '/index.html' : '/drive/'; var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle; From c8d7675edef681b74149f23d1f3624a0d10d899d Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 12:56:42 +0200 Subject: [PATCH 2/7] remove z-index on splitter in code --- www/code/code.less | 1 - 1 file changed, 1 deletion(-) diff --git a/www/code/code.less b/www/code/code.less index ce7c7898e..7c39ead2b 100644 --- a/www/code/code.less +++ b/www/code/code.less @@ -84,7 +84,6 @@ body { width: 8px; top: 0; left: 0; - z-index: 9999; cursor: col-resize; } From 82fadde249604a55125cc7495e972b5c12f08d79 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 13:04:03 +0200 Subject: [PATCH 3/7] restyle info-box in drive --- www/drive/file.less | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/www/drive/file.less b/www/drive/file.less index 7e352c22c..ccf92651f 100644 --- a/www/drive/file.less +++ b/www/drive/file.less @@ -11,7 +11,7 @@ @content-bg: #fff; @content-bg-ro: darken(@content-bg, 10%); @content-fg: @tree-fg; -@info-box-bg: #ddddff; +@info-box-bg: #d2e1f2; @info-box-border: #bbb; @table-header-fg: #555; @table-header-bg: #e8e8e8; @@ -380,19 +380,16 @@ span { margin-top: 10px; } .info-box { - line-height: 40px; - padding-left: 10px; - margin: 10px auto; + line-height: 2em; + padding: 0.25em 0.75em; + margin: 1em; background: @info-box-bg; - border: 1px solid @info-box-border; - border-radius: 5px; span { cursor: pointer; - margin-left: 10px; float: right; + margin-top: 0.5em; } &.noclose { - padding-right: 10px; } } li { From a5f9b49bfbc388e879ea61c4fdf8e2cc08ee96dc Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 13:09:34 +0200 Subject: [PATCH 4/7] make poll box bigger so it show text in smaller windows --- www/poll/poll.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/poll/poll.less b/www/poll/poll.less index e3d5faffa..3774e0fd0 100644 --- a/www/poll/poll.less +++ b/www/poll/poll.less @@ -116,7 +116,7 @@ table#table { min-width: 80%; width: 80%; - min-height: 5em; + min-height: 7em; font-size: 20px; font-weight: bold; border: 1px solid black; From 92d3b1a9fc80164a417f37090258d8e14788118b Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 14:10:54 +0200 Subject: [PATCH 5/7] actually pull in open-sans, move fonts to own include --- customize.dist/src/less/cryptpad.less | 3 +++ customize.dist/src/less2/include/font.less | 9 +++++++++ customize.dist/src/less2/main.less | 8 +++----- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 customize.dist/src/less2/include/font.less diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 138ba5817..e7f81db51 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -4,6 +4,7 @@ @import "../less2/include/alertify.less"; @import "../less2/include/colortheme.less"; @import "../less2/include/modal.less"; +@import "../less2/include/font.less"; @import "./bar.less"; @import "./loading.less"; @import "./dropdown.less"; @@ -12,6 +13,8 @@ @toolbar-green: #5cb85c; +.font-open-sans(); + .alertify_main(); html.cp, .cp body { diff --git a/customize.dist/src/less2/include/font.less b/customize.dist/src/less2/include/font.less new file mode 100644 index 000000000..adb5c844f --- /dev/null +++ b/customize.dist/src/less2/include/font.less @@ -0,0 +1,9 @@ +.font-neuropolitical () { + @font-face { + font-family: Neuropolitical; + src: url(./customize/fonts/neuropolitical.ttf) + } +} +.font-open-sans () { + @import (once) '/customize/fonts/open-sans.less'; +} diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index 2524b6d0f..b26394425 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -1,8 +1,6 @@ -@font-face { - font-family: Neuropolitical; - src: url(./customize/fonts/neuropolitical.ttf) -} -@import (once) '/customize/fonts/open-sans.less'; +@import (once) './include/font.less'; +.font-neuropolitical(); +.font-open-sans(); body.cp-page-index { @import "./pages/page-index.less"; } body.cp-page-contact { @import "./pages/page-contact.less"; } From 0f74dffc480e54c71e2b0c2a00605d16909bab4a Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 14:11:50 +0200 Subject: [PATCH 6/7] fix register button being cut off --- customize.dist/src/less2/pages/page-register.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less index 06a5207c6..a8bfb9183 100644 --- a/customize.dist/src/less2/pages/page-register.less +++ b/customize.dist/src/less2/pages/page-register.less @@ -19,7 +19,7 @@ #register { margin-top: 16px; font-size: 1.25em; - width: 30%; + min-width: 30%; } } } From b00d37d9e7ea77a6b34d2cef85addda4c92f4f15 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 11 Aug 2017 14:14:58 +0200 Subject: [PATCH 7/7] proper namespace for font --- customize.dist/src/less/cryptpad.less | 2 +- customize.dist/src/less2/include/font.less | 4 ++-- customize.dist/src/less2/main.less | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index e7f81db51..ca1fab6c5 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -13,7 +13,7 @@ @toolbar-green: #5cb85c; -.font-open-sans(); +.font_open-sans(); .alertify_main(); diff --git a/customize.dist/src/less2/include/font.less b/customize.dist/src/less2/include/font.less index adb5c844f..b1fdd0b19 100644 --- a/customize.dist/src/less2/include/font.less +++ b/customize.dist/src/less2/include/font.less @@ -1,9 +1,9 @@ -.font-neuropolitical () { +.font_neuropolitical () { @font-face { font-family: Neuropolitical; src: url(./customize/fonts/neuropolitical.ttf) } } -.font-open-sans () { +.font_open-sans () { @import (once) '/customize/fonts/open-sans.less'; } diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index b26394425..3cab13fbb 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -1,6 +1,6 @@ @import (once) './include/font.less'; -.font-neuropolitical(); -.font-open-sans(); +.font_neuropolitical(); +.font_open-sans(); body.cp-page-index { @import "./pages/page-index.less"; } body.cp-page-contact { @import "./pages/page-contact.less"; }