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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: 'Raleway',"Lato","Helvetica Neue",Helvetica,Arial,sans-serif; font-family: 'Raleway', "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 700; font-weight: 700;
} }
@ -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%;
@ -87,14 +90,14 @@ h6 {
.intro-divider { .intro-divider {
width: 400px; width: 400px;
border-top: 1px solid #f8f8f8; 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 { .intro-message > h3 {
font-weight: 300; font-weight: 300;
} }
@media(max-width:767px) { @media (max-width: 767px) {
.intro-message { .intro-message {
padding-bottom: 15%; padding-bottom: 15%;
} }
@ -168,17 +171,17 @@ h6 {
margin-top: 0; margin-top: 0;
} }
@media(max-width:1199px) { @media (max-width: 1199px) {
ul.banner-social-buttons { ul.banner-social-buttons {
float: left; float: left;
margin-top: 15px; margin-top: 15px;
} }
} }
@media(max-width:767px) { @media (max-width: 767px) {
.banner h2 { .banner h2 {
margin: 0; 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; font-size: 3em;
} }
@ -194,31 +197,34 @@ 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;
} }
.content-404 h1 { .content-404 h1 {
margin: 0 0 15px; margin: 0 0 15px;
font-size: 200px; font-size: 200px;
line-height: 1; line-height: 1;
font-weight: 700; font-weight: 700;
color: #6db97c; color: #6db97c;
} }
a.unlink { a.unlink {
color: inherit; color: inherit;
} }
a.unlink:hover { a.unlink:hover {
color: inherit; color: inherit;
} }

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>

152
membership/static/stylesheet.css
View file

@ -6,161 +6,163 @@
/* ---------- http://weloveiconfonts.com/ ---------- */ /* ---------- http://weloveiconfonts.com/ ---------- */
*[class*="fontawesome-"]:before { *[class*="fontawesome-"]:before {
font-family: 'FontAwesome', sans-serif; font-family: 'FontAwesome', sans-serif;
} }
/* ---------- GENERAL ---------- */ /* ---------- GENERAL ---------- */
/*body {*/ /*body {*/
/*background: #f9f9f9;*/ /*background: #f9f9f9;*/
/*color: #0e171c;*/ /*color: #0e171c;*/
/*font: 300 100%/1em 'Lato', sans-serif;*/ /*font: 300 100%/1em 'Lato', sans-serif;*/
/*margin: 0;*/ /*margin: 0;*/
/*}*/ /*}*/
/**/ /**/
/*a {*/ /*a {*/
/*text-decoration: none;*/ /*text-decoration: none;*/
/*}*/ /*}*/
/*Month size*/ /*Month size*/
#monthtitle { #monthtitle {
font-size: 1.2em; font-size: 1.2em;
line-height: 1.25em; line-height: 1.25em;
margin: .25em 0; margin: .25em 0;
font-weight: 600; font-weight: 600;
} }
h3 { h3 {
font-size: 1.5em; font-size: 1.5em;
line-height: 1em; line-height: 1em;
margin: .33em 0; margin: .33em 0;
} }
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
margin:auto; margin: auto;
} }
/*.container {*/ /*.container {*/
/*height: 358px;*/ /*height: 358px;*/
/*left: 50%;*/ /*left: 50%;*/
/*margin: -255px 0 0 -245px;*/ /*margin: -255px 0 0 -245px;*/
/*position: absolute;*/ /*position: absolute;*/
/*top: 50%;*/ /*top: 50%;*/
/*width: 340px;*/ /*width: 340px;*/
/*}*/ /*}*/
/* ---------- CALENDAR ---------- */ /* ---------- CALENDAR ---------- */
.calendar { .calendar {
text-align: center; text-align: center;
} }
.calendar header { .calendar header {
position: relative; position: relative;
} }
.calendar #monthtitle { .calendar #monthtitle {
text-transform: uppercase; text-transform: uppercase;
color: #1A6687; color: #1A6687;
} }
#datesbooked{ #datesbooked {
color:#1a6687; color: #1a6687;
padding-top: 2px; padding-top: 2px;
} }
/*Title*/ /*Title*/
.calendar thead { .calendar thead {
font-weight: 500; font-weight: 500;
/*text-transform: uppercase;*/ /*text-transform: uppercase;*/
color: #8BC4C9; color: #8BC4C9;
/*margin-bottom:1px;*/ /*margin-bottom:1px;*/
} }
/*Body text*/ /*Body text*/
.calendar tbody { .calendar tbody {
color: #7c8a95; color: #7c8a95;
} }
/*select date*/ /*select date*/
.calendar tbody td:hover { .calendar tbody td:hover {
background: #8BC4C9; background: #8BC4C9;
color: #f9f9f9; color: #f9f9f9;
/*border: .1px solid #8BC4C9;*/ /*border: .1px solid #8BC4C9;*/
/*border-radius: 50%;*/ /*border-radius: 50%;*/
} }
.selected{
background: #6b9699; .selected {
color: #f9f9f9; background: #6b9699;
color: #f9f9f9;
} }
.calendar thead>tr>td{
border-top:hidden; .calendar thead > tr > td {
border-left:hidden; border-top: hidden;
border-right: hidden; border-left: hidden;
border-right: hidden;
} }
.calendar td { .calendar td {
border: .1px solid #cbd1d2; border: .1px solid #cbd1d2;
/*border-radius: 50%;*/ /*border-radius: 50%;*/
display: inline-block; display: inline-block;
height: 2.5em; height: 2.5em;
line-height: 2.5em; line-height: 2.5em;
text-align: center; text-align: center;
width: 2.5em; width: 2.5em;
} }
.calendar .prev-month, .calendar .prev-month,
.calendar .next-month { .calendar .next-month {
/*border: .1px solid #cbd1d2;*/ /*border: .1px solid #cbd1d2;*/
color: #cbd1d2; color: #cbd1d2;
} }
.calendar .prev-month:hover, .calendar .prev-month:hover,
.calendar .next-month:hover { .calendar .next-month:hover {
border: .5px solid #cbd1d2; border: .5px solid #cbd1d2;
background: #cbd1d2; background: #cbd1d2;
color: #f9f9f9; color: #f9f9f9;
} }
/*Today*/ /*Today*/
.current-day { .current-day {
color: #8BC4C9; color: #8BC4C9;
/*background-color: #8BC4C9;*/ /*background-color: #8BC4C9;*/
} }
/*Next,Prev month*/ /*Next,Prev month*/
.btn-prev, .btn-prev,
.btn-next { .btn-next {
border: 1px solid transparent; border: 1px solid transparent;
color: #8BC4C9; color: #8BC4C9;
font-size: 1.5em; font-size: 1.5em;
padding: 1em; padding: 1em;
/*height: .7em;*/ /*height: .7em;*/
/*line-height: .3em;*/ /*line-height: .3em;*/
/*margin: auto;*/ /*margin: auto;*/
/*position: absolute;*/ /*position: absolute;*/
/*top: .1em;*/ /*top: .1em;*/
/*width: 25em;*/ /*width: 25em;*/
} }
.btn-prev:hover, .btn-prev:hover,
.btn-next:hover { .btn-next:hover {
background: none; background: none;
color: #1A6687; color: #1A6687;
} }
.btn-prev { .btn-prev {
left: 6em; left: 6em;
} }
.btn-next { .btn-next {
right: 6em; right: 6em;
} }