web/cryptpad
Archived
5
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

Manual merge

Browse Source
This commit is contained in:
Caleb James DeLisle committed 2017-08-03 17:18:03 +02:00
2 parents bc15ce7de5 15fa801bc8
commit 5d70dd93b3
3 files changed
+62 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

customize.dist/CryptPad-white-logo.svg
+1
View File
@@ -0,0 +1 @@
<svg id="svg2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360.4 94.7"><defs><style>.cls-1{fill:#fff;}</style></defs><title>CryptPad white logo</title><g id="g4864"><path id="path4866" class="cls-1" d="M450.4,411.6a24.8,24.8,0,0,1-5.9-.6,8.5,8.5,0,0,1-3.8-1.9,7.1,7.1,0,0,1-2-3.4,19.4,19.4,0,0,1-.6-5.2V390.4a19.4,19.4,0,0,1,.6-5.1,7.1,7.1,0,0,1,2-3.4,8.5,8.5,0,0,1,3.8-1.9,24.8,24.8,0,0,1,5.9-.6h22.3v6.2h-22a11.8,11.8,0,0,0-2.7.3,3.5,3.5,0,0,0-1.7.9,3.3,3.3,0,0,0-.9,1.6,11.1,11.1,0,0,0-.2,2.5v9.4a11.1,11.1,0,0,0,.2,2.5,3.3,3.3,0,0,0,.9,1.6,3.3,3.3,0,0,0,1.7.8l2.7.2h22v6.1Z" transform="translate(-350.9 -348)"/><path id="path4868" class="cls-1" d="M477.4,411.6V396.8a16,16,0,0,1,.7-4.9,7.5,7.5,0,0,1,2.1-3.3,8.9,8.9,0,0,1,3.7-1.9,21.4,21.4,0,0,1,5.5-.6H494v5.7h-4.4l-2.5.2a3.3,3.3,0,0,0-1.6.8,3.2,3.2,0,0,0-.8,1.6,10.1,10.1,0,0,0-.3,2.5v14.8Z" transform="translate(-350.9 -348)"/><path id="path4870" class="cls-1" d="M505,399.3a3.8,3.8,0,0,0,.9,3,4.6,4.6,0,0,0,3.1.8h15.7V386h6.8v25.1q0,4.3-2.1,6.2t-6.9,1.9H512.3v-5.8h9.6a3.3,3.3,0,0,0,2.1-.6,2.7,2.7,0,0,0,.7-2.2v-2.1H508.6a19,19,0,0,1-4.9-.5,7.8,7.8,0,0,1-3.3-1.7,6.5,6.5,0,0,1-1.8-2.8,12.7,12.7,0,0,1-.6-4V386H505Z" transform="translate(-350.9 -348)"/><path id="path4872" class="cls-1" d="M558.3,386a25.1,25.1,0,0,1,5.9.6,8.5,8.5,0,0,1,3.8,1.9,7.1,7.1,0,0,1,2,3.4,19.7,19.7,0,0,1,.6,5.2v3.4a19.4,19.4,0,0,1-.6,5.2,7.1,7.1,0,0,1-2,3.4,8.5,8.5,0,0,1-3.8,1.9,25.1,25.1,0,0,1-5.9.6H544.1v7.6h-7V397.1a19.7,19.7,0,0,1,.6-5.2,7.1,7.1,0,0,1,2-3.4,8.6,8.6,0,0,1,3.8-1.9,25.1,25.1,0,0,1,5.9-.6Zm5.3,11.3a11.7,11.7,0,0,0-.3-2.7,2.9,2.9,0,0,0-1-1.6,4,4,0,0,0-1.9-.8l-3-.2h-7.8l-2.7.2a3.5,3.5,0,0,0-1.7.8,3.2,3.2,0,0,0-.8,1.6,11.7,11.7,0,0,0-.2,2.6v8.4h13.4l3-.2a3.8,3.8,0,0,0,1.9-.7,2.9,2.9,0,0,0,1-1.6,11.9,11.9,0,0,0,.3-2.8Z" transform="translate(-350.9 -348)"/><path id="path4874" class="cls-1" d="M577.4,411.6V391.7h-3.6V386h3.6v-7.2h7.2V386h8.1v5.7h-8.1v19.9Z" transform="translate(-350.9 -348)"/><path id="path4876" class="cls-1" d="M603.2,402.4v9.2h-7.2V379.4h25.8a25.7,25.7,0,0,1,5.8.5,8.4,8.4,0,0,1,3.7,1.8,6.8,6.8,0,0,1,2,3.2,17.1,17.1,0,0,1,.6,4.8v2.8a16.9,16.9,0,0,1-.6,4.8,6,6,0,0,1-2,3,8.3,8.3,0,0,1-3.7,1.6,31.6,31.6,0,0,1-5.9.4Zm23.5-12.3q0-2.6-1.1-3.5t-4-.9H603.2v11h18.5a6.5,6.5,0,0,0,3.9-.9q1.1-.9,1.1-3.4Z" transform="translate(-350.9 -348)"/><path id="path4878" class="cls-1" d="M647.1,411.6a18.4,18.4,0,0,1-4.6-.5,7.4,7.4,0,0,1-2.9-1.3,4.6,4.6,0,0,1-1.5-2.1,8.7,8.7,0,0,1-.4-2.8v-2.4a9.3,9.3,0,0,1,.4-2.9,4.7,4.7,0,0,1,1.4-2.1,6.5,6.5,0,0,1,2.7-1.3,17.7,17.7,0,0,1,4.4-.4h18.9v-.6q0-2.5-1-3.3a5.3,5.3,0,0,0-3.4-.8h-7v-5h7a20.7,20.7,0,0,1,5.2.6,8.9,8.9,0,0,1,3.5,1.7,6.7,6.7,0,0,1,2,2.9,12.5,12.5,0,0,1,.6,4.2v6.2a17.2,17.2,0,0,1-.5,4.7,6.3,6.3,0,0,1-1.9,3.1,7.9,7.9,0,0,1-3.6,1.7,26.8,26.8,0,0,1-5.6.5ZM665.6,400H647.4a3.1,3.1,0,0,0-1.9.5,2.5,2.5,0,0,0-.7,2.1v1.7a2.1,2.1,0,0,0,.8,1.9,3.7,3.7,0,0,0,2.1.5h13.2l2.1-.2a3.2,3.2,0,0,0,1.5-.7,3,3,0,0,0,.9-1.4,7.8,7.8,0,0,0,.3-2.3Z" transform="translate(-350.9 -348)"/><path id="path4880" class="cls-1" d="M690,411.6a25.4,25.4,0,0,1-6-.6,8.6,8.6,0,0,1-3.8-1.9,7.1,7.1,0,0,1-2-3.4,19.4,19.4,0,0,1-.6-5.2v-3.4a19.7,19.7,0,0,1,.6-5.2,7.1,7.1,0,0,1,2-3.4,8.6,8.6,0,0,1,3.8-1.9,25.4,25.4,0,0,1,6-.6h14.2v-8.3h7v22.8a19.4,19.4,0,0,1-.6,5.2,7.1,7.1,0,0,1-2,3.4,8.5,8.5,0,0,1-3.8,1.9,25.1,25.1,0,0,1-5.9.6Zm-5.3-11.2a11.7,11.7,0,0,0,.3,2.7,2.9,2.9,0,0,0,1,1.6,4,4,0,0,0,1.9.8l3.1.2h7.8l2.7-.2a3.3,3.3,0,0,0,1.7-.8,3.2,3.2,0,0,0,.9-1.6,11.9,11.9,0,0,0,.2-2.6v-8.4H690.9l-3,.2a4,4,0,0,0-1.9.8,2.9,2.9,0,0,0-1,1.6,11.7,11.7,0,0,0-.3,2.7Z" transform="translate(-350.9 -348)"/><path id="path4882" class="cls-1" d="M390,348l-29.2,5.4a6.3,6.3,0,1,0-6.7,10.6v42.1c0,4,1.8,8.3,5.3,12.7A65.5,65.5,0,0,0,372.5,431,128.2,128.2,0,0,0,390,441.4,128.1,128.1,0,0,0,407.6,431a65.4,65.4,0,0,0,13.1-12.1c3.5-4.5,5.3-8.8,5.3-12.7V363.9a6.3,6.3,0,0,0-3.1-11.7,6.2,6.2,0,0,0-3.6,1.2Zm-.1,6.2,26.7,4.9a5.9,5.9,0,0,0,.2,1.1l-15.7,10.2a15.3,15.3,0,0,0-22.6.1l-15.5-10a6.3,6.3,0,0,0,.3-1.4Zm28.8,9a6.5,6.5,0,0,0,1.8,1.1v41a10.4,10.4,0,0,1-.1,1.7,21.5,21.5,0,0,1-4.1,7.8,56.1,56.1,0,0,1-11.2,10.3,110.6,110.6,0,0,1-15,9,110.8,110.8,0,0,1-15-9,55.8,55.8,0,0,1-11.2-10.3,19.8,19.8,0,0,1-4.4-9.3c0-.1,0-.2,0-.3V364.3a6.3,6.3,0,0,0,1.7-1L381,376.1a10.1,10.1,0,0,1,9-5.4,10,10,0,0,1,9,5.4Z" transform="translate(-350.9 -348)"/><g id="g4884"><path id="path4886" class="cls-1" d="M373.9,402.8a4.6,4.6,0,1,0,0,9.3,4.6,4.6,0,0,0,0-9.3Z" transform="translate(-350.9 -348)"/><path id="path4888" class="cls-1" d="M375.2,376.5a14.9,14.9,0,0,0,4.2,15.4L372,406.7a2.8,2.8,0,0,0,2.3,3.8h11v-5.2h-6.8l6.4-12.8a2.7,2.7,0,0,0-.8-3.3,9.7,9.7,0,0,1-4.2-9.6Z" transform="translate(-350.9 -348)"/></g><g id="g4890"><path id="path4892" class="cls-1" d="M406.2,402.8a4.6,4.6,0,1,0,0,9.3,4.6,4.6,0,0,0,0-9.3Z" transform="translate(-350.9 -348)"/><path id="path4894" class="cls-1" d="M404.6,376.5l-4.7,3.1a10.2,10.2,0,0,1,.1,1.2,10,10,0,0,1-4.3,8.3,2.7,2.7,0,0,0-.8,3.3l6.3,12.8h-6.8v5.2h11a2.8,2.8,0,0,0,2.3-3.8l-7.4-14.8a15.2,15.2,0,0,0,4.8-Line truncated
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

customize.dist/pages.js
+20 -34
View File
@@ -170,13 +170,9 @@ define([
};
Pages['/contact.html'] = function () {
return h('div#cp-main.cp-page-contact', [
infopageTopbar(),
h('div.container.cp-container', [
h('center', h('h1', Msg.contact)),
setHTML(h('p'), Msg.main_about_p2)
]),
infopageFooter(),
return h('div#main_other', [
h('center', h('h1', Msg.contact)),
setHTML(h('p'), Msg.main_about_p2)
]);
};
@@ -236,36 +232,26 @@ define([
var infopageTopbar = function () {
return h('div.cp-topbar',
h('div.navbar.navbar-toggleable-sm.navbar-light.navbar-inverse',
h('button.navbar-toggler.navbar-toggler-left', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'},
[h('i.fa.fa-bars ')
]),
h('div.collapse.navbar-collapse#menuCollapse', [
h('ul.navbar-nav', [
h('a.cp-logo', { href: '/' }, [
h('img', { src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs })
]),
h('li.nav-item', [
h('a.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad),
]),
h('li.nav-item', [
h('a.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
]),
h('li.nav-item', [
h('a.nav-link', { href: '/contact.html'}, Msg.contact),
]),
h('li.nav-item', [
h('a.nav-link', { href: '/about.html'}, Msg.about),
]),
]),
]),
h('div.cp-left',
h('a.navbar-brand', { href: 'index.html'}, [
h( 'img', { src: '/customize/CryptPad-white-logo.svg' })
])
),
h('div.cp-right',
h('a.cp-register-btn', { href: '/register'}, Msg.login_register),
h('a.cp-login-btn', { href: '/login'}, Msg.login_login)
h('div.cp-right.navbar.navbar-toggleable-md.navbar-light.navbar-inverse',
h('button.navbar-toggler.navbar-toggler-right', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'},
[h('i.fa.fa-bars ')
]),
h('div.collapse.navbar-collapse#menuCollapse', [
h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad),
h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
h('a.cp-login-btn', { href: '/login'}, Msg.login_login),
h('a.cp-register-btn', { href: '/register'}, Msg.login_register)
])
)
);
}
};
Pages['/'] = Pages['/index.html'] = function () {
var showingMore = false;
customize.dist/src/less2/pages/page-index.less
+41 -14
View File
@@ -1,3 +1,5 @@
//@import (once) "./variables.less";
@import (once) "../include/infopages.less";
@import (once) "../include/colortheme.less";
@@ -5,15 +7,6 @@
.infopages_main();
.infopages_topbar();
.cp-topbar {
background: transparent;
position: fixed;
a {
color: #fff;
}
}
@background_lighter: rgba(0,0,0,0.1);
@background_darker: rgba(0,0,0,0.4);
&#cp-main {
@@ -41,12 +34,11 @@
}
.cp-login-btn {
color: #fff;
margin-left: 0.6em;
padding: 0.5em 1em 0.7em 1em;
&:hover {
transform: scale(1.05);
}
}
}
}
.cp-title {
display: flex;
@@ -72,6 +64,11 @@
}
.cp-topbar {
position: absolute;
background: transparent;
a {
color: #fff;
padding: 0.5em 0.5em 0.5em 0.5em;
}
button:focus {
outline: none;
}
@@ -91,6 +88,18 @@
a.cp-logo {
display: none;
}
img {
height: 5vh;
margin-top: -4px;
}
&:hover {
img {
transform: none;
}
};
a.cp-logo {
display: none;
}
}
@callout-padding: 15px;
a:hover {
@@ -185,6 +194,8 @@ h4 {
}
.navbar-inverse .navbar-toggler {
border-color: transparent;
margin-top: -12px;
padding: 0;
}
@media (min-width: 576px) and (max-width: 767px) {
.container {
@@ -195,8 +206,24 @@ h4 {
left: 5px;
}
}
@media (max-width: 767px) {
.collapse.show {
margin-bottom: -12em;
@media (max-width: 991px) {
#menuCollapse {
position: absolute;
left: -131px;
margin-top: 0.5em;
text-align: right;
}
#menuCollapse a {
width: 100%;
text-align: right;
}
.navbar-nav a {
text-align: right !important;
}
.cp-right .cp-login-btn {
padding: 0.5em;
}
}
.collapsing a {
text-align: right !important;
}