Merge branch 'ui-integration' into staging2

This commit is contained in:
Caleb James DeLisle
2017-08-24 13:54:55 +02:00
5 changed files with 81 additions and 25 deletions

View File

@@ -73,6 +73,6 @@
}
}
.cp-container {
padding-top: 0;
padding-top: 3em;
min-height: 66vh;
}

View File

@@ -4,6 +4,40 @@
.infopages_main();
.infopages_topbar();
img#zeroknowledge {
width: 100%;
.cp-what-is {
padding-top: 3em;
padding-bottom: 3em;
background-image: url(/customize/bkwhat.jpg);
background-size: cover;
background-repeat: no-repeat;
background-position: center;
color: #fff;
h1 {
font-weight: 700;
}
}
#cp-main {
background: #fff;
}
.cp-container {
padding-top: 3em;
padding-bottom: 3em;
h2 {
margin-top: 0;
font-weight: 700;
color: @cryptpad_header_col;
}
p {
color: @cryptpad_text_col
}
#zeroknowledge {
width: 65%;
}
.row {
margin-bottom: 1.5em;
}
img {
display: block;
margin: 0 auto;
}
}