Changed the favicon, added the boostrap js file, reconfigure the top menu

This commit is contained in:
CatalinScr 2017-08-01 15:20:29 +03:00
parent 896186d059
commit e609950977
6 changed files with 27 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

@ -241,15 +241,25 @@ define([
var infopageTopbar = function () { var infopageTopbar = function () {
return h('div.cp-topbar', return h('div.cp-topbar',
h('div.cp-left.navbar.navbar-toggleable-sm.navbar-light.navbar-inverse', 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('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('i.fa.fa-bars ')
]), ]),
h('div.collapse.navbar-collapse#menuCollapse', [ h('div.collapse.navbar-collapse#menuCollapse', [
h('a', { href: '/zeroknowledge.html'}, 'What is Zero Knowledge'), h('ul.navbar-nav', [
h('a', { href: 'https://blog.cryptpad.fr/'}, 'Blog'), h('li.nav-item', [
h('a', { href: '/contact.html'}, 'Contact'), h('a.nav-link', { href: '/what-is-cryptpad.html'}, 'What is CryptPad'),
h('a', { href: '/about.html'}, 'About') ]),
h('li.nav-item', [
h('a.nav-link', { href: 'https://blog.cryptpad.fr/'}, 'Blog'),
]),
h('li.nav-item', [
h('a.nav-link', { href: '/contact.html'}, 'Contact'),
]),
h('li.nav-item', [
h('a.nav-link', { href: '/about.html'}, 'About'),
]),
]),
]), ]),
), ),
h('div.cp-right', h('div.cp-right',

View File

@ -58,7 +58,7 @@
} }
p { p {
//font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; //font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-size: 21px; font-size: 20px;
//font-style: italic; //font-style: italic;
} }
} }
@ -67,6 +67,11 @@
button:focus { button:focus {
outline: none; outline: none;
} }
.collapse {
a {
display: block;
}
}
.navbar-toggler-left { .navbar-toggler-left {
top: -0.59rem; top: -0.59rem;
} }
@ -178,4 +183,9 @@ h4 {
div#cp-main.cp-page-index .cp-topbar .navbar-toggler-left { div#cp-main.cp-page-index .cp-topbar .navbar-toggler-left {
left: 5px; left: 5px;
} }
}
@media (max-width: 767px) {
.collapse.show {
margin-bottom: -12em;
}
} }

View File

@ -176,6 +176,7 @@ $(function () {
require([ require([
'less!/customize/src/less2/main.less', 'less!/customize/src/less2/main.less',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'/bower_components/bootstrap/dist/js/bootstrap.min.js'
], function () { ], function () {
if (pathname === '/') { if (pathname === '/') {
// TODO(cjd): This is a hack because the template system doesn't make it easy. // TODO(cjd): This is a hack because the template system doesn't make it easy.