Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page

This commit is contained in:
CatalinScr
2017-08-04 17:58:48 +03:00
12 changed files with 89 additions and 51 deletions

View File

@@ -21,12 +21,11 @@
padding: 0;
margin: 0;
font-size: 14px;
font-size: 16pxt:;
font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
.cp-container {
font-size: 16px;
margin-top: @infopages_infobar-height;
padding-top: @infopages_padding;
padding-bottom: @infopages_padding;
min-height: 75vh;
@@ -115,6 +114,15 @@
// Apply this to the top bar div
.infopages_topbar () {
.navbar-brand {
display: block;
background-image: url(/customize/CryptPad-blue-logo.svg);
background-repeat: no-repeat;
background-size: contain;
height: 50px;
width: 250px;
}
.cp-topbar {
background: #fff;
z-index: 9001;
@@ -153,9 +161,6 @@
}
.cp-logo {
img {
height: @infopages_infobar-height / 2;
}
margin-right: 0.5em;
}
}