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

changed the menu
This commit is contained in:
CatalinScr committed 2017-08-04 12:16:33 +03:00
commit e7d09c1ddb
5 files changed
+15 -8

No files matched your search

+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><defs><linearGradient id="bt" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9080.407 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bs" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9493.767 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="br" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9183.814 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bq" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 -25.2612 -25.2612 0 9217.845 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bp" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 -25.2612 -25.2612 0 9424.095 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bo" gradientUnits="userSpaceOnUse" y1="354.003" x2="1" y2="354.003" gradientTransform="matrix(0 -27.3335 -27.3335 0 9703.824 38.634)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bn" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9044.204 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bm" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9286.907 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bl" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9253.017 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bk" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9388.673 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bj" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -28 -28 0 9976.164 39.336)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bi" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9116.298 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bh" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9321.157 42.484)"><stop offset="0" stop-color="#2a2929"/><stop offset=".648" stop-color="#2a2929"/><stop offset=".681" stop-color="#4d4d4d"/><stop offset="1" stop-color="#4d4d4d"/></linearGradient><linearGradient id="bg" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9149.845 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bf" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9459.626 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="be" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9353.923 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bd" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10444.907 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradientLine truncated

After

Width:  |  Height:  |  Size: 83 KiB

+1 -1
View File
@@ -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>')
]),
+8 -5
View File
@@ -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;
+4 -2
View File
@@ -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) {