From 1b83e15796e4c8ed89164923f4b7e89a16d48720 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 10:49:18 +0200 Subject: [PATCH 1/3] sorry jpg, i forgot you existed --- customize.dist/pages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 4d838bf3c..42957d740 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -105,7 +105,7 @@ define([ h('h2', 'Key Contributors'), h('div.row', [ h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/pierre.png'}), + h('img.bio-avatar', {'src': '/customize/images/pierre.jpg'}), h('h3', "Pierre Bondoerffer"), setHTML(h('div#bio'), '

Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.

He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.

As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.

') ]), From f6d45d05f6a8c8fd60cf22472bf1ce604a574b9a Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 11:01:26 +0200 Subject: [PATCH 2/3] use logo in toolbar --- customize.dist/images/logo_white.svg | 1 + customize.dist/src/less/toolbar.less | 13 ++++++++----- www/common/toolbar2.js | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 customize.dist/images/logo_white.svg diff --git a/customize.dist/images/logo_white.svg b/customize.dist/images/logo_white.svg new file mode 100644 index 000000000..d1cd2bc73 --- /dev/null +++ b/customize.dist/images/logo_white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index f38a92c66..247f5302b 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -815,13 +815,16 @@ body .cryptpad-toolbar { } a.cryptpad-logo { cursor: pointer; - font-size: 1em; - height: auto; - padding: 0px 5px; + display: inline-flex; text-decoration: none; + height: auto; + padding: 10px; - // hack because of whiteboard and poll - color: white !important; + img { + cursor: pointer; + height: 100%; + width: 100%; + } } } .cryptpad-user { diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js index 34dca996e..d16557958 100644 --- a/www/common/toolbar2.js +++ b/www/common/toolbar2.js @@ -625,8 +625,10 @@ define([ var $aTag = $('', { href: "/drive/", title: Messages.header_logoTitle, - 'class': "cryptpad-logo fa fa-hdd-o" - }); + 'class': "cryptpad-logo" + }).append($('', { + src: '/customize/images/logo_white.svg' + })); var onClick = function (e) { e.preventDefault(); if (e.ctrlKey) { From f8c7140eece3458dcc0b3795c57e96db81d97fb6 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 11:10:30 +0200 Subject: [PATCH 3/3] make fonts big --- customize.dist/src/less2/include/infopages.less | 1 + 1 file changed, 1 insertion(+) diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index a6149b2cd..dfc4108ba 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -25,6 +25,7 @@ font-family: 'Open Sans', 'Helvetica Neue', sans-serif; .cp-container { + font-size: 16px; margin-top: @infopages_infobar-height; padding-top: @infopages_padding; padding-bottom: @infopages_padding;