sanghee/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 35e312411f
3 changed files with 105 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ h6 {
background: url(../img/intro-bg.jpg) no-repeat center center; background: url(../img/intro-bg.jpg) no-repeat center center;
background-size: cover; background-size: cover;
} }
.intro-header-1 { .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-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; padding-bottom: 50px;
@ -46,6 +47,7 @@ h6 {
background: url(../img/configure.jpg) no-repeat center center; background: url(../img/configure.jpg) no-repeat center center;
background-size: cover; background-size: cover;
} }
.intro-header-2 { .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-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; padding-bottom: 50px;
@ -54,6 +56,7 @@ h6 {
background: url(../img/configure.jpg) no-repeat center center; background: url(../img/configure.jpg) no-repeat center center;
background-size: cover; background-size: cover;
} }
.intro-message { .intro-message {
position: relative; position: relative;
padding-top: 20%; padding-top: 20%;
@ -194,15 +197,18 @@ h6 {
} }
footer { footer {
padding: 50px 0; padding: 2%;
background-color: #f8f8f8; background-color: #f8f8f8;
#position: absolute;
right: 0;
bottom: 0;
left: 0;
} }
p.copyright { p.copyright {
margin: 15px 0 0; margin: 15px 0 0;
} }
a#forgotpassword { a#forgotpassword {
color: #ffffff; color: #ffffff;
} }

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

@ -58,6 +58,7 @@
<hr> <hr>
<h4>Total<p class="pull-right"><b>{{order.vm_plan.price}} CHF</b></p></h4> <h4>Total<p class="pull-right"><b>{{order.vm_plan.price}} CHF</b></p></h4>
</div> </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> </div>
</div> </div>

6
membership/static/stylesheet.css
View file

@ -71,6 +71,7 @@ table {
color: #1a6687; color: #1a6687;
padding-top: 2px; padding-top: 2px;
} }
/*Title*/ /*Title*/
.calendar thead { .calendar thead {
font-weight: 500; font-weight: 500;
@ -93,10 +94,12 @@ table {
/*border-radius: 50%;*/ /*border-radius: 50%;*/
} }
.selected { .selected {
background: #6b9699; background: #6b9699;
color: #f9f9f9; color: #f9f9f9;
} }
.calendar thead > tr > td { .calendar thead > tr > td {
border-top: hidden; border-top: hidden;
border-left: hidden; border-left: hidden;
@ -134,7 +137,6 @@ table {
/*background-color: #8BC4C9;*/ /*background-color: #8BC4C9;*/
} }
/*Next,Prev month*/ /*Next,Prev month*/
.btn-prev, .btn-prev,
.btn-next { .btn-next {
@ -150,7 +152,6 @@ table {
/*width: 25em;*/ /*width: 25em;*/
} }
.btn-prev:hover, .btn-prev:hover,
.btn-next:hover { .btn-next:hover {
background: none; background: none;
@ -164,3 +165,4 @@ table {
.btn-next { .btn-next {
right: 6em; right: 6em;
} }