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

Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page

Browse Source 
changed the menu
This commit is contained in:
CatalinScr 2017-08-04 12:16:33 +03:00
commit e7d09c1ddb
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/images/logo_white.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

2
customize.dist/pages.js
View File

@ -105,7 +105,7 @@ define([
h('h2', 'Key Contributors'), h('h2', 'Key Contributors'),
h('div.row', [ h('div.row', [
h('div.col-md-4', [ 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"), h('h3', "Pierre Bondoerffer"),
setHTML(h('div#bio'), '<p>Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.</p><p>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.</p><p>As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.</p>') setHTML(h('div#bio'), '<p>Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.</p><p>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.</p><p>As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.</p>')
]), ]),

13
customize.dist/src/less/toolbar.less
View File

@ -815,13 +815,16 @@ body .cryptpad-toolbar {
} }
a.cryptpad-logo { a.cryptpad-logo {
cursor: pointer; cursor: pointer;
font-size: 1em; display: inline-flex;
height: auto;
padding: 0px 5px;
text-decoration: none; text-decoration: none;
height: auto;
padding: 10px;
// hack because of whiteboard and poll img {
color: white !important; cursor: pointer;
height: 100%;
width: 100%;
}
} }
} }
.cryptpad-user { .cryptpad-user {

1
customize.dist/src/less2/include/infopages.less
View File

@ -25,6 +25,7 @@
font-family: 'Open Sans', 'Helvetica Neue', sans-serif; font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
.cp-container { .cp-container {
font-size: 16px;
margin-top: @infopages_infobar-height; margin-top: @infopages_infobar-height;
padding-top: @infopages_padding; padding-top: @infopages_padding;
padding-bottom: @infopages_padding; padding-bottom: @infopages_padding;

6
www/common/toolbar2.js
View File

@ -625,8 +625,10 @@ define([
var $aTag = $('<a>', { var $aTag = $('<a>', {
href: "/drive/", href: "/drive/",
title: Messages.header_logoTitle, title: Messages.header_logoTitle,
'class': "cryptpad-logo fa fa-hdd-o" 'class': "cryptpad-logo"
}); }).append($('<img>', {
src: '/customize/images/logo_white.svg'
}));
var onClick = function (e) { var onClick = function (e) {
e.preventDefault(); e.preventDefault();
if (e.ctrlKey) { if (e.ctrlKey) {