Use bootstrap 4 in the main page

This commit is contained in:
yflory
2017-01-17 18:19:45 +01:00
parent 73d424b506
commit 82e8041054
18 changed files with 201 additions and 95 deletions

View File

@@ -17,13 +17,13 @@ html.cp, .cp body {
}
.cp:not(.poll) {
#language-selector {
/*#language-selector {
position: absolute;
top: 80px;
top: @topbar-height;
right: 0px;
display: inline-block;
z-index: 2;
}
}*/
}
.cp {
@@ -144,16 +144,31 @@ body.html {
background: red;
}
.btn-default {
&:hover {
background-color: #d8d8d8;
}
}
#main {
background-image: url('/customize/bg.jpg');
background-image: url('/customize/bg2.jpg');
background-size: cover;
background-position: center center;
}
#main, #main_other {
#overlay {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #000;
opacity: 0.2;
}
position: absolute;
left: 0;
right: 0;
padding: 0 @main-border-width;
height: ~"calc(100vh - 80px)";
height: ~"calc(100vh - 50px)";
margin: auto;
//margin-top: 100px;
@@ -165,16 +180,20 @@ body.html {
padding: 0;
}
h5 {
color: @topbar-color;
color: @main-color;
}
color: @topbar-color;
color: @main-color;
padding: 15px;
box-sizing: border-box;
position: absolute;
top: 50%;
transform: translateY(-50%);
width: ~"calc(100% - 450px - 30vw)";
background-color: rgba(34, 177, 221, 0.8);
// background-color: @main-block-bg;
#tryit {
margin-top: 20px;
}
}
#userForm {
@@ -185,21 +204,19 @@ body.html {
margin-left: 50px;
display: inline-block;
width: 400px;
background-color: rgba(34, 177, 221, 0.8);
// background-color: @main-block-bg;
padding: 10px;
box-sizing: border-box;
font-family: lato, Helvetica, sans-serif;
color: @topbar-color;
color: @main-color;
h1 {
color: black;
color: @main-color;
padding: 0;
}
[type="text"], [type="password"] {
width: ~"calc(100% - 10px)";
height: 1.5em;
border-radius: 0;
width: 100%;
}
[type="checkbox"] {
@@ -209,21 +226,32 @@ body.html {
margin-right: 5px;
}
label {
margin-bottom: 0;
margin-top: 0.5em;
}
button {
width: 100%;
margin: 2px 0px;
text-transform: uppercase;
cursor: pointer;
&.half {
width: ~"calc(50% - 2px)";
&.first {
width: ~"calc(50% - 4px)";
&:not(.first) {
float: right;
}
}
}
}
.buttons {
margin-top: 20px;
text-align: center;
button {
text-transform: uppercase;
cursor: pointer;
margin-top: 10px;
}
}
}

View File

@@ -26,7 +26,7 @@
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 160px;
min-width: 200px;
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
z-index: 1000;

View File

@@ -6,12 +6,12 @@
top: 0;
left: 0;
right: 0;
height: 80px;
height: @topbar-height;
color: @topbar-color;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
padding: 5px;
box-sizing: border-box;
font-size: 40px;
font-size: 30px;
&> span {
vertical-align: middle;
@@ -19,37 +19,49 @@
height: 100%;
}
.cryptpad-logo {
height: 70px;
height: 40px;
vertical-align: middle;
}
.slogan {
font-size: 20px;
color: @topbar-color;
line-height: 70px;
line-height: 40px;
}
.gotoMain {
color: @topbar-color;
height: 70px;
line-height: 70px;
height: 40px;
line-height: 40px;
&:hover {
text-decoration: none;
color: #558;
}
}
.right {
float: right;
font-size: 20px;
margin: 0px 5px;
background: @topbar-button-bg;
margin: 0px 10px;
line-height: 40px;
a {
text-align: center;
font-weight: 500;
font-size: 0.75em;
color: #558;
&:hover {
text-decoration: none;
color: #000;
}
/* text-align: center;
min-width: 100px;
font-weight: bold;
height: 70px;
padding: 0 10px;
line-height: 70px;
display: inline-block;
color: @topbar-button-color;
color: @topbar-button-color;*/
}
}
}

View File

@@ -55,7 +55,11 @@
@topbar-color: #000;
@topbar-button-bg: #2E9AFE;
@topbar-button-color: #fff;
@topbar-height: 50px;
@main-border-width: 15vw;
@cp-darkblue: #3333ff;
@cp-accent2: darken(@cp-darkblue, 20%);
@main-block-bg: rgba(200, 200, 200, 0.3);
@main-color: #fff;