mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #78 from tmslav/develop

Browse source 
hosting: https://redmine.ungleich.ch/issues/2292, fixed footer
This commit is contained in:
tmslav 2016-05-22 17:37:44 +02:00
commit d160344130
3 changed files with 105 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hosting/static/hosting/css/landing-page.css
View file

@ -17,7 +17,7 @@ h3,
h4,
h5,
h6 {
font-family: 'Raleway',"Lato","Helvetica Neue",Helvetica,Arial,sans-serif;
font-family: 'Raleway', "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 700;
}
@ -38,6 +38,7 @@ h6 {
background: url(../img/intro-bg.jpg) no-repeat center center;
background-size: cover;
}
.intro-header-1 {
padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
padding-bottom: 50px;
@ -46,6 +47,7 @@ h6 {
background: url(../img/configure.jpg) no-repeat center center;
background-size: cover;
}
.intro-header-2 {
padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
padding-bottom: 50px;
@ -54,6 +56,7 @@ h6 {
background: url(../img/configure.jpg) no-repeat center center;
background-size: cover;
}
.intro-message {
position: relative;
padding-top: 20%;
@ -87,14 +90,14 @@ h6 {
.intro-divider {
width: 400px;
border-top: 1px solid #f8f8f8;
border-bottom: 1px solid rgba(0,0,0,0.2);
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
}
.intro-message > h3 {
font-weight: 300;
}
@media(max-width:767px) {
@media (max-width: 767px) {
.intro-message {
padding-bottom: 15%;
}
@ -168,17 +171,17 @@ h6 {
margin-top: 0;
}
@media(max-width:1199px) {
@media (max-width: 1199px) {
ul.banner-social-buttons {
float: left;
margin-top: 15px;
}
}
@media(max-width:767px) {
@media (max-width: 767px) {
.banner h2 {
margin: 0;
text-shadow: 2px 2px 3px rgba(0,0,0,0.6);
text-shadow: 2px 2px 3px rgba(0, 0, 0, 0.6);
font-size: 3em;
}
@ -194,18 +197,21 @@ h6 {
}
footer {
padding: 50px 0;
padding: 2%;
background-color: #f8f8f8;
#position: absolute;
right: 0;
bottom: 0;
left: 0;
}
p.copyright {
margin: 15px 0 0;
}
a#forgotpassword {
color: #ffffff;
}
}
.content-404 h1 {
margin: 0 0 15px;

1
hosting/templates/hosting/order_detail.html
View file

@ -58,6 +58,7 @@
<hr>
<h4>Total<p class="pull-right"><b>{{order.vm_plan.price}} CHF</b></p></h4>
</div>
<a href="{% url 'hosting:virtual_machines' order.vm_plan.id %}" class="pull-right"><button class="btn-info">View instance</button></a>
</div>
</div>
</div>

42
membership/static/stylesheet.css
View file

@ -12,14 +12,14 @@
/* ---------- GENERAL ---------- */
/*body {*/
/*background: #f9f9f9;*/
/*color: #0e171c;*/
/*font: 300 100%/1em 'Lato', sans-serif;*/
/*margin: 0;*/
/*background: #f9f9f9;*/
/*color: #0e171c;*/
/*font: 300 100%/1em 'Lato', sans-serif;*/
/*margin: 0;*/
/*}*/
/**/
/*a {*/
/*text-decoration: none;*/
/*text-decoration: none;*/
/*}*/
/*Month size*/
@ -39,17 +39,17 @@ h3 {
table {
border-collapse: collapse;
border-spacing: 0;
margin:auto;
margin: auto;
}
/*.container {*/
/*height: 358px;*/
/*left: 50%;*/
/*margin: -255px 0 0 -245px;*/
/*position: absolute;*/
/*top: 50%;*/
/*width: 340px;*/
/*height: 358px;*/
/*left: 50%;*/
/*margin: -255px 0 0 -245px;*/
/*position: absolute;*/
/*top: 50%;*/
/*width: 340px;*/
/*}*/
/* ---------- CALENDAR ---------- */
@ -67,10 +67,11 @@ table {
color: #1A6687;
}
#datesbooked{
color:#1a6687;
#datesbooked {
color: #1a6687;
padding-top: 2px;
}
/*Title*/
.calendar thead {
font-weight: 500;
@ -93,13 +94,15 @@ table {
/*border-radius: 50%;*/
}
.selected{
.selected {
background: #6b9699;
color: #f9f9f9;
}
.calendar thead>tr>td{
border-top:hidden;
border-left:hidden;
.calendar thead > tr > td {
border-top: hidden;
border-left: hidden;
border-right: hidden;
}
@ -134,7 +137,6 @@ table {
/*background-color: #8BC4C9;*/
}
/*Next,Prev month*/
.btn-prev,
.btn-next {
@ -150,7 +152,6 @@ table {
/*width: 25em;*/
}
.btn-prev:hover,
.btn-next:hover {
background: none;
@ -164,3 +165,4 @@ table {
.btn-next {
right: 6em;
}