Manual merge

customize.dist/pages.js

@@ -170,13 +170,9 @@ define([
     };
 
     Pages['/contact.html'] = function () {
-        return h('div#cp-main.cp-page-contact', [
+        return h('div#main_other', [
-            infopageTopbar(),
+            h('center', h('h1', Msg.contact)),
-            h('div.container.cp-container', [
+            setHTML(h('p'), Msg.main_about_p2)
-                h('center', h('h1', Msg.contact)),
-                setHTML(h('p'), Msg.main_about_p2)
-            ]),
-            infopageFooter(),
         ]);
     };
 
@@ -236,36 +232,26 @@ define([
 
     var infopageTopbar = function () {
         return h('div.cp-topbar',
-            h('div.navbar.navbar-toggleable-sm.navbar-light.navbar-inverse',
+            h('div.cp-left',
-            	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.navbar-brand', { href: 'index.html'}, [
-            		[h('i.fa.fa-bars ')
+                    h( 'img', { src: '/customize/CryptPad-white-logo.svg' })
-            		]),
+            ])
-            	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-right',
+            h('div.cp-right.navbar.navbar-toggleable-md.navbar-light.navbar-inverse',
-                h('a.cp-register-btn', { href: '/register'}, Msg.login_register),
+                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('a.cp-login-btn', { href: '/login'}, Msg.login_login)
+                    [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

@@ -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,7 +34,6 @@
 	}
 	.cp-login-btn {
 		color: #fff;
-		margin-left: 0.6em;
 		padding: 0.5em 1em 0.7em 1em;
 		&:hover {
 			transform: scale(1.05);
@@ -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) {
+@media (max-width: 991px) {
-    .collapse.show {
+    #menuCollapse {
-        margin-bottom: -12em;
+        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;
+}