Repaired the menu, clead the code

pull/1/head
CatalinScr 8 years ago
parent c274a27dfb
commit 250d85bb8a

@ -77,25 +77,19 @@ define([
}; };
var infopageTopbar = function () { var infopageTopbar = function () {
return h('div.cp-topbar', return h('nav.navbar.navbar-toggleable-md',
h('div',
h('a.navbar-brand', { href: 'index.html'}, [
h( 'img', { src: '/customize/CryptPad-white-logo.svg' })
])
),
h('div.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('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('i.fa.fa-bars ')
]), ]),
h('div.collapse.navbar-collapse.justify-content-end.flex-column#menuCollapse', [ h('a.navbar-brand', { href: '/'}),
h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [
h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), 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: 'https://blog.cryptpad.fr/'}, Msg.blog),
h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact), h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about), h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
h('a.cp-login-btn', { href: '/login'}, Msg.login_login), h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login),
h('a.cp-register-btn', { href: '/register'}, Msg.login_register) h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register)
]) ])
)
); );
}; };
@ -280,9 +274,11 @@ define([
if (showingMore) { if (showingMore) {
$('.cp-more, .cp-callout-more-lessmsg').addClass('cp-hidden'); $('.cp-more, .cp-callout-more-lessmsg').addClass('cp-hidden');
$('.cp-callout-more-moremsg').removeClass('cp-hidden'); $('.cp-callout-more-moremsg').removeClass('cp-hidden');
if ( $( window ).width() >991 ) $('.navbar').css('margin-top','-1em');
} else { } else {
$('.cp-more, .cp-callout-more-lessmsg').removeClass('cp-hidden'); $('.cp-more, .cp-callout-more-lessmsg').removeClass('cp-hidden');
$('.cp-callout-more-moremsg').addClass('cp-hidden'); $('.cp-callout-more-moremsg').addClass('cp-hidden');
$('.navbar').css('margin-top','0');
} }
showingMore = !showingMore; showingMore = !showingMore;
} }

@ -62,43 +62,39 @@
//font-style: italic; //font-style: italic;
} }
} }
.cp-topbar { .navbar {
//position: absolute; width: 100%;
background: transparent; margin-top: -1em;
a { @media only screen and (max-device-width: 991px) {
color: #fff; margin-top: 0;
padding: 0.5em 0.5em 0.5em 0.5em;
} }
button:focus { .navbar-brand {
outline: none; background: url(/customize/CryptPad-white-logo.svg) no-repeat;
width: 250px;
height: 50px;
} }
.collapse {
a { a {
display: block; color: #fff;
} border: 2px solid transparent;
} &:visited {
.navbar-toggler-left { color: rgba(255,255,255,.8);
top: -0.59rem; };
}
.cp-left {
.fa-bars {
font-size: 1.6rem;
}
} }
a.cp-logo { .nav-link {
display: none; padding: 0.5em 0.7em;
&:hover {
transform: scale(1.05);
};
} }
img { .cp-register-btn {
height: 5vh; border: 2px solid #fff;
margin-top: -4px;
} }
&:hover { button:focus {
img { outline: none;
transform: none;
} }
}; .navbar-toggler {
a.cp-logo { margin-top: 10px;
display: none; color: #fff;
} }
} }
@callout-padding: 15px; @callout-padding: 15px;
@ -119,9 +115,9 @@ a:hover {
color: black; color: black;
&:hover { text-decoration-line: none; } &:hover { text-decoration-line: none; }
} }
div { div h4 {
@media only screen and (min-device-width: 576px) and (max-device-width: 767px) { @media only screen and (min-device-width: 576px) and (max-device-width: 767px) {
left: 4.5em !important; font-size: 1.3em;
} }
} }
} }
@ -192,11 +188,6 @@ h4 {
} }
} }
} }
.navbar-inverse .navbar-toggler {
border-color: transparent;
margin-top: -12px;
padding: 0;
}
@media (min-width: 576px) and (max-width: 767px) { @media (min-width: 576px) and (max-width: 767px) {
.container { .container {
padding-left: 0; padding-left: 0;
@ -208,22 +199,25 @@ h4 {
} }
@media (max-width: 991px) { @media (max-width: 991px) {
#menuCollapse { #menuCollapse {
/*position: absolute;
left: -131px;*/
margin-top: 0.5em;
text-align: right;
}
#menuCollapse a {
width: 100%;
text-align: right; text-align: right;
} }
.navbar-nav a { .navbar-nav a {
text-align: right !important; text-align: right !important;
} }
.cp-right .cp-login-btn { .cp-register-btn {
padding: 0.5em; margin-right: 13px;
margin-left: 83vw;
text-align: center;
} }
} }
.collapsing a { @media (max-width: 687px) {
text-align: right !important; .cp-register-btn {
margin-left: 75vw;
}
} }
@media (max-width: 467px) {
.cp-register-btn {
margin-left: 63vw;
}
}

Loading…
Cancel
Save