blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ui-integration' into staging2

Browse source
This commit is contained in:
Caleb James DeLisle 2017-08-24 13:54:55 +02:00
commit 35e7341f4d
5 changed files with 81 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
customize.dist/bkabout.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 66 KiB

BIN
customize.dist/bkwhat.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 102 KiB

44
customize.dist/pages.js
View file

@ -188,10 +188,10 @@ define([
h('h3', "Pierre Bondoerffer"), h('h3', "Pierre Bondoerffer"),
h('hr'), h('hr'),
setHTML(h('div#bioPierre'), '<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.<br/>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.<br/>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#bioPierre'), '<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.<br/>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.<br/>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>'),
h('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [ h('a.cp-soc-media', { href : 'https://twitter.com/pbondoer'}, [
h('i.fa.fa-twitter') h('i.fa.fa-twitter')
]), ]),
h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [ h('a.cp-soc-media', { href : 'https://github.com/pbondoer'}, [
h('i.fa.fa-github') h('i.fa.fa-github')
]) ])
]), ]),
@ -291,33 +291,55 @@ define([
Pages['/what-is-cryptpad.html'] = function () { Pages['/what-is-cryptpad.html'] = function () {
return h('div#cp-main', [ return h('div#cp-main', [
infopageTopbar(), infopageTopbar(),
h('div.container-fluid.cp-what-is',[
h('div.container',[
h('div.row',[
h('div.col-12.text-center', h('h1', Msg.whatis_title)),
]),
]),
]),
h('div.container.cp-container', [ h('div.container.cp-container', [
h('center', h('h1', Msg.whatis_title)), h('div.row.align-items-center', [
h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
setHTML(h('h2'), Msg.whatis_collaboration), setHTML(h('h2'), Msg.whatis_collaboration),
setHTML(h('p'), Msg.whatis_collaboration_p1), setHTML(h('p'), Msg.whatis_collaboration_p1),
h('img', { src: '/customize/images/pad_screenshot.png?' + urlArgs }),
setHTML(h('p'), Msg.whatis_collaboration_p2), setHTML(h('p'), Msg.whatis_collaboration_p2),
setHTML(h('p'), Msg.whatis_collaboration_p3), setHTML(h('p'), Msg.whatis_collaboration_p3),
setHTML(h('h2'), Msg.whatis_zeroknowledge),
h('div.row', [
h('div.col-md-4.align-self-center', [
h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }),
]), ]),
h('div.col-md-8', [ h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
h('img', { src: '/customize/images/pad_screenshot.png?' + urlArgs }),
]),
]),
h('div.row.align-items-center', [
h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6', [
setHTML(h('h2'), Msg.whatis_zeroknowledge),
setHTML(h('p'), Msg.whatis_zeroknowledge_p1), setHTML(h('p'), Msg.whatis_zeroknowledge_p1),
setHTML(h('p'), Msg.whatis_zeroknowledge_p2), setHTML(h('p'), Msg.whatis_zeroknowledge_p2),
setHTML(h('p'), Msg.whatis_zeroknowledge_p3), setHTML(h('p'), Msg.whatis_zeroknowledge_p3),
]), ]),
h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6', [
h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }),
]), ]),
]),
h('div.row.align-items-center', [
h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
setHTML(h('h2'), Msg.whatis_drive), setHTML(h('h2'), Msg.whatis_drive),
setHTML(h('p'), Msg.whatis_drive_p1), setHTML(h('p'), Msg.whatis_drive_p1),
h('img', { src: '/customize/images/drive_screenshot.png?' + urlArgs }),
setHTML(h('p'), Msg.whatis_drive_p2), setHTML(h('p'), Msg.whatis_drive_p2),
setHTML(h('p'), Msg.whatis_drive_p3), setHTML(h('p'), Msg.whatis_drive_p3),
setHTML(h('h2'), Msg.whatis_business), ]),
h('div.col-12.col-sm-12.col-md-12.col-lg-6', [
h('img', { src: '/customize/images/drive_screenshot.png?' + urlArgs }),
]),
]),
h('div.row.align-items-center', [
h('div.col-12', [
setHTML(h('h2.text-center'), Msg.whatis_business),
setHTML(h('p'), Msg.whatis_business_p1), setHTML(h('p'), Msg.whatis_business_p1),
setHTML(h('p'), Msg.whatis_business_p2), setHTML(h('p'), Msg.whatis_business_p2),
]), ]),
]),
]),
infopageFooter(), infopageFooter(),
]); ]);
}; };

2
customize.dist/src/less2/pages/page-login.less
View file

@ -73,6 +73,6 @@
} }
} }
.cp-container { .cp-container {
padding-top: 0; padding-top: 3em;
min-height: 66vh; min-height: 66vh;
} }

38
customize.dist/src/less2/pages/page-what-is-cryptpad.less
View file

@ -4,6 +4,40 @@
.infopages_main(); .infopages_main();
.infopages_topbar(); .infopages_topbar();
img#zeroknowledge { .cp-what-is {
width: 100%; padding-top: 3em;
padding-bottom: 3em;
background-image: url(/customize/bkwhat.jpg);
background-size: cover;
background-repeat: no-repeat;
background-position: center;
color: #fff;
h1 {
font-weight: 700;
}
}
#cp-main {
background: #fff;
}
.cp-container {
padding-top: 3em;
padding-bottom: 3em;
h2 {
margin-top: 0;
font-weight: 700;
color: @cryptpad_header_col;
}
p {
color: @cryptpad_text_col
}
#zeroknowledge {
width: 65%;
}
.row {
margin-bottom: 1.5em;
}
img {
display: block;
margin: 0 auto;
}
} }