diff --git a/customize.dist/alt-favicon.png b/customize.dist/alt-favicon.png index 169ce4ef2..94e0b237f 100644 Binary files a/customize.dist/alt-favicon.png and b/customize.dist/alt-favicon.png differ diff --git a/customize.dist/cryptpad-new-logo-colors-logoonly.png b/customize.dist/cryptpad-new-logo-colors-logoonly.png index c686f4dcd..6ad292df0 100644 Binary files a/customize.dist/cryptpad-new-logo-colors-logoonly.png and b/customize.dist/cryptpad-new-logo-colors-logoonly.png differ diff --git a/customize.dist/main-favicon.png b/customize.dist/main-favicon.png index 54169c07e..354d88ece 100644 Binary files a/customize.dist/main-favicon.png and b/customize.dist/main-favicon.png differ diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 2d231f7aa..a3da6746b 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -241,15 +241,25 @@ define([ var infopageTopbar = function () { 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('i.fa.fa-bars ') ]), 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('ul.navbar-nav', [ + h('li.nav-item', [ + h('a.nav-link', { href: '/what-is-cryptpad.html'}, 'What is CryptPad'), + ]), + 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', diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 9b68d70f5..557712820 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -58,7 +58,7 @@ } p { //font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; - font-size: 21px; + font-size: 20px; //font-style: italic; } } @@ -67,6 +67,11 @@ button:focus { outline: none; } + .collapse { + a { + display: block; + } + } .navbar-toggler-left { top: -0.59rem; } @@ -178,4 +183,9 @@ h4 { div#cp-main.cp-page-index .cp-topbar .navbar-toggler-left { left: 5px; } +} +@media (max-width: 767px) { + .collapse.show { + margin-bottom: -12em; + } } \ No newline at end of file diff --git a/customize.dist/template.js b/customize.dist/template.js index a8445615e..d9e6e1a7f 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -176,6 +176,7 @@ $(function () { require([ 'less!/customize/src/less2/main.less', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + '/bower_components/bootstrap/dist/js/bootstrap.min.js' ], function () { if (pathname === '/') { // TODO(cjd): This is a hack because the template system doesn't make it easy.