Changed the logo, uploaded the new font, repaired responsive

This commit is contained in:
CatalinScr 2017-07-31 17:04:37 +03:00
parent 428bee6306
commit 6862bda454
5 changed files with 53 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

View File

@ -241,11 +241,16 @@ define([
var infopageTopbar = function () { var infopageTopbar = function () {
return h('div.cp-topbar', return h('div.cp-topbar',
h('div.cp-left', h('div.cp-left.navbar.navbar-toggleable-sm.navbar-light.navbar-inverse',
h('a', { href: '/zeroknowledge.html'}, 'What is Zero Knowledge'), 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('a', { href: 'https://blog.cryptpad.fr/'}, 'Blog'), [h('i.fa.fa-bars')
h('a', { href: '/contact.html'}, 'Contact'), ]),
h('a', { href: '/about.html'}, 'About') h('div.collapse.navbar-collapse#menuCollapse', [
h('a', { href: '/zeroknowledge.html'}, 'What is Zero Knowledge'),
h('a', { href: 'https://blog.cryptpad.fr/'}, 'Blog'),
h('a', { href: '/contact.html'}, 'Contact'),
h('a', { href: '/about.html'}, 'About')
]),
), ),
h('div.cp-right', h('div.cp-right',
h('a.cp-register-btn', { href: '/register'}, 'Register'), h('a.cp-register-btn', { href: '/register'}, 'Register'),
@ -261,13 +266,13 @@ define([
infopageTopbar(), infopageTopbar(),
h('div.container.cp-container', [ h('div.container.cp-container', [
h('div.row', [ h('div.row', [
h('div.cp-title.col-6.col-xs-6', [ h('div.cp-title.col-12.col-sm-6', [
h('img', { src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs }), h('img', { src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs }),
h('h1', 'CryptPad'), h('h1', 'CryptPad'),
h('p', Msg.main_catch_phrase) h('p', Msg.main_catch_phrase)
]), ]),
/*userForm(),*/ /*userForm(),*/
h('div.col-6.col-xs-6', [ h('div.col-12.col-sm-6', [
[ [
[ 'pad', '/pad/', 'Rich Text Pad', 'fa-file-word-o' ], [ 'pad', '/pad/', 'Rich Text Pad', 'fa-file-word-o' ],
[ 'code', '/code/', 'Markdown/Code Pad', 'fa-file-code-o' ], [ 'code', '/code/', 'Markdown/Code Pad', 'fa-file-code-o' ],

View File

@ -1,2 +1,6 @@
@import url('https://fonts.googleapis.com/css?family=Roboto'); @import url('https://fonts.googleapis.com/css?family=Roboto');
@font-face {
font-family: Neuropolitical;
src: url(../customize.dist/fonts/neuropolitical.ttf)
}
div#cp-main.cp-page-index { @import "./pages/page-index.less"; } div#cp-main.cp-page-index { @import "./pages/page-index.less"; }

View File

@ -16,6 +16,11 @@
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
.container {
@media only screen and (max-device-width : 576px) {
margin-top: 6em;
}
}
} }
.cp-right { .cp-right {
.cp-register-btn { .cp-register-btn {
@ -51,11 +56,23 @@
p { p {
//font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; //font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-size: 20px; font-size: 20px;
font-style: italic; //font-style: italic;
}
}
.cp-topbar {
position: absolute;
button:focus {
outline: none;
}
.navbar-toggler-left {
top: -0.59rem;
}
.cp-left {
.fa-bars {
font-size: 1.6rem;
}
} }
} }
.cp-topbar { position: absolute; }
@callout-padding: 15px; @callout-padding: 15px;
.bs-callout { .bs-callout {
@ -72,6 +89,11 @@
color: black; color: black;
&:hover { text-decoration-line: none; } &:hover { text-decoration-line: none; }
} }
div {
@media only screen and (min-device-width : 576px) and (max-device-width : 767px) {
left: 4.5em !important;
}
}
} }
h4 { h4 {
margin: 0; margin: 0;
@ -141,3 +163,15 @@ h4 {
} }
} }
} }
.navbar-inverse .navbar-toggler {
border-color: transparent;
}
@media (min-width: 576px) and (max-width: 767px) {
.container {
padding-left: 0;
padding-right: 0;
}
div#cp-main.cp-page-index .cp-topbar .navbar-toggler-left {
left: 5px;
}
}