Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menupull/1/head
commit
e7d09c1ddb
File diff suppressed because one or more lines are too long
After Width: | Height: | Size: 83 KiB |
|
@ -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'), '<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>')
|
||||
]),
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -625,8 +625,10 @@ define([
|
|||
var $aTag = $('<a>', {
|
||||
href: "/drive/",
|
||||
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) {
|
||||
e.preventDefault();
|
||||
if (e.ctrlKey) {
|
||||
|
|
Loading…
Reference in New Issue