From ed95a7ada411fb1b884f3514e5d80d255a6bf587 Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Sun, 22 May 2016 17:36:28 +0200 Subject: [PATCH] hosting: https://redmine.ungleich.ch/issues/2292, fixed footer --- hosting/static/hosting/css/landing-page.css | 44 +++--- hosting/templates/hosting/order_detail.html | 1 + membership/static/stylesheet.css | 156 ++++++++++---------- 3 files changed, 105 insertions(+), 96 deletions(-) diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css index cbbc5898..c79f35a7 100644 --- a/hosting/static/hosting/css/landing-page.css +++ b/hosting/static/hosting/css/landing-page.css @@ -17,12 +17,12 @@ 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; } .topnav { - font-size: 14px; + font-size: 14px; } .lead { @@ -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%; @@ -75,7 +78,7 @@ h6 { .intro-signup { background: url(../img/configure.jpg) no-repeat center center; - background-size: cover; + background-size: cover; } .intro-message > h1 { @@ -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,31 +197,34 @@ 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; - } + color: #ffffff; +} .content-404 h1 { - margin: 0 0 15px; - font-size: 200px; - line-height: 1; - font-weight: 700; - color: #6db97c; + margin: 0 0 15px; + font-size: 200px; + line-height: 1; + font-weight: 700; + color: #6db97c; } a.unlink { - color: inherit; + color: inherit; } a.unlink:hover { - color: inherit; + color: inherit; } \ No newline at end of file diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 8e1ff691..607c3677 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -58,6 +58,7 @@

Total

{{order.vm_plan.price}} CHF

+ diff --git a/membership/static/stylesheet.css b/membership/static/stylesheet.css index 20f5931b..9357a1c0 100644 --- a/membership/static/stylesheet.css +++ b/membership/static/stylesheet.css @@ -6,161 +6,163 @@ /* ---------- http://weloveiconfonts.com/ ---------- */ *[class*="fontawesome-"]:before { - font-family: 'FontAwesome', sans-serif; + font-family: 'FontAwesome', sans-serif; } /* ---------- 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*/ #monthtitle { - font-size: 1.2em; - line-height: 1.25em; - margin: .25em 0; - font-weight: 600; + font-size: 1.2em; + line-height: 1.25em; + margin: .25em 0; + font-weight: 600; } h3 { - font-size: 1.5em; - line-height: 1em; - margin: .33em 0; + font-size: 1.5em; + line-height: 1em; + margin: .33em 0; } table { - border-collapse: collapse; - border-spacing: 0; - margin:auto; + border-collapse: collapse; + border-spacing: 0; + 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 ---------- */ .calendar { - text-align: center; + text-align: center; } .calendar header { - position: relative; + position: relative; } .calendar #monthtitle { - text-transform: uppercase; - color: #1A6687; + text-transform: uppercase; + color: #1A6687; } -#datesbooked{ - color:#1a6687; - padding-top: 2px; +#datesbooked { + color: #1a6687; + padding-top: 2px; } + /*Title*/ .calendar thead { - font-weight: 500; - /*text-transform: uppercase;*/ - color: #8BC4C9; - /*margin-bottom:1px;*/ + font-weight: 500; + /*text-transform: uppercase;*/ + color: #8BC4C9; + /*margin-bottom:1px;*/ } /*Body text*/ .calendar tbody { - color: #7c8a95; + color: #7c8a95; } /*select date*/ .calendar tbody td:hover { - background: #8BC4C9; - color: #f9f9f9; - /*border: .1px solid #8BC4C9;*/ + background: #8BC4C9; + color: #f9f9f9; + /*border: .1px solid #8BC4C9;*/ - /*border-radius: 50%;*/ + /*border-radius: 50%;*/ } -.selected{ - background: #6b9699; - color: #f9f9f9; + +.selected { + background: #6b9699; + color: #f9f9f9; } -.calendar thead>tr>td{ - border-top:hidden; - border-left:hidden; - border-right: hidden; + +.calendar thead > tr > td { + border-top: hidden; + border-left: hidden; + border-right: hidden; } .calendar td { - border: .1px solid #cbd1d2; - /*border-radius: 50%;*/ - display: inline-block; - height: 2.5em; - line-height: 2.5em; - text-align: center; - width: 2.5em; - + border: .1px solid #cbd1d2; + /*border-radius: 50%;*/ + display: inline-block; + height: 2.5em; + line-height: 2.5em; + text-align: center; + width: 2.5em; + } .calendar .prev-month, .calendar .next-month { - /*border: .1px solid #cbd1d2;*/ - color: #cbd1d2; + /*border: .1px solid #cbd1d2;*/ + color: #cbd1d2; } .calendar .prev-month:hover, .calendar .next-month:hover { - border: .5px solid #cbd1d2; - background: #cbd1d2; - color: #f9f9f9; + border: .5px solid #cbd1d2; + background: #cbd1d2; + color: #f9f9f9; } /*Today*/ .current-day { - color: #8BC4C9; - /*background-color: #8BC4C9;*/ + color: #8BC4C9; + /*background-color: #8BC4C9;*/ } - /*Next,Prev month*/ .btn-prev, .btn-next { - border: 1px solid transparent; - color: #8BC4C9; - font-size: 1.5em; - padding: 1em; - /*height: .7em;*/ - /*line-height: .3em;*/ - /*margin: auto;*/ - /*position: absolute;*/ - /*top: .1em;*/ - /*width: 25em;*/ + border: 1px solid transparent; + color: #8BC4C9; + font-size: 1.5em; + padding: 1em; + /*height: .7em;*/ + /*line-height: .3em;*/ + /*margin: auto;*/ + /*position: absolute;*/ + /*top: .1em;*/ + /*width: 25em;*/ } - .btn-prev:hover, .btn-next:hover { - background: none; - color: #1A6687; + background: none; + color: #1A6687; } .btn-prev { - left: 6em; + left: 6em; } .btn-next { - right: 6em; -} \ No newline at end of file + right: 6em; +} +