infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Manual merge

pull/1/head
Caleb James DeLisle 2017-08-03 17:18:03 +02:00
parent bc15ce7de5 15fa801bc8
commit 5d70dd93b3
3 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/CryptPad-white-logo.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

54
customize.dist/pages.js
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;

55
customize.dist/src/less2/pages/page-index.less
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;
}