dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ui-integration' into staging

This commit is contained in:
Caleb James DeLisle 2017-08-09 17:47:02 +02:00
parent 1f9bd866c3 41c2f9bd83
commit 1043e076a4
4 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
customize.dist/bkabout.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

21
customize.dist/pages.js
View File

@ -14,7 +14,7 @@ define([
};
var footerCol = function (title, L, literal) {
return h('div.col', [
return h('div.col-6.col-sm-3', [
h('ul.list-unstyled', [
h('li.footer-title', {
'data-localization': title,
@ -46,10 +46,13 @@ define([
h('div.container', [
h('div.row', [
footerCol(null, [
setHTML(h('div.cp-bio-foot'), '<p>With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.</p>'),
], ''),
/* footerCol(null, [
footLink('/about.html', 'about'),
footLink('/terms.html', 'terms'),
footLink('/privacy.html', 'privacy'),
], 'CryptPad'),
], 'CryptPad'),*/
footerCol('footer_applications', [
footLink('/drive/', 'main_drive'),
footLink('/pad/', 'main_richText'),
@ -109,13 +112,21 @@ define([
Pages['/about.html'] = function () {
return h('div#cp-main', [
infopageTopbar(),
h('div.container-fluid.cp-about-intro', [
h('div.container', [
h('center', [
h('h1', Msg.about),
setHTML(h('p'), 'CryptPad is created inside of the Research Team at <a href="http://xwiki.com">XWiki SAS</a>, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),
]),
]),
]),
h('div.container.cp-container', [
h('center', [
/*h('center', [
h('h1', Msg.about)
]),
setHTML(h('p'), 'CryptPad is created inside of the Research Team at <a href="http://xwiki.com">XWiki SAS</a>, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),
h('h2', 'Core Developers'),
setHTML(h('p'), 'CryptPad is created inside of the Research Team at <a href="http://xwiki.com">XWiki SAS</a>, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),*/
h('div.row', [
h('h2.col-12', 'Core Developers'),
h('div.col-md-4', [
h('img.bio-avatar', {'src': '/customize/images/aaron.jpg'}),
h('h3', "Aaron MacSween"),

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

@ -74,7 +74,7 @@
}
footer {
background-color: @cryptpad_color_grey;
background-color: @cryptpad_color_blue;
.container {
.col {
margin-top: 1em;
@ -82,20 +82,33 @@
a {
color: #fff;
&:visited {
color: darken(#fff, 20%);
color: darken(#fff, 10%);
};
}
margin-bottom: 1em;
ul.list-unstyled {
margin: 0;
margin-top: 1em;
text-align: center;
}
}
.cp-bio-foot {
background-image: url(/customize/CryptPad-white-logo.svg);
background-size: 100%;
background-repeat: no-repeat;
p {
color: #fff;
padding-top: 30%;
margin-bottom: 0;
}
}
.cp-version-footer {
background-color: #6C6C6C;
background-color: @cryptpad_color_blue;
color: #fff;
text-align: center;
padding: 0.5em;
border-top: 2px solid #fff;
}
}
};

23
customize.dist/src/less2/pages/page-about.less
View File

@ -9,4 +9,27 @@
margin: 1em 0;
max-width: 300px;
max-height: 300px;
}
.cp-about-intro {
padding-top: 3em;
padding-bottom: 3em;
background-image: url(/customize/bkabout.jpg);
background-size: cover;
background-repeat: no-repeat;
background-position: center;
.container {
color: #fff;
font-family: "Open Sans";
h1 {
font-weight: bold;
}
a {
color: #fff;
text-decoration: underline;
}
p {
padding-top: 1em;
}
}
}