From fd1bf290160a9cc90c8b5dce2ba33b0e9c1b6958 Mon Sep 17 00:00:00 2001 From: Andrew Vincent Pover Date: Thu, 2 Nov 2017 20:44:35 +0000 Subject: [PATCH 1/4] http -> https --- templates/members.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/members.tpl b/templates/members.tpl index 7bc894f..7f2e26e 100644 --- a/templates/members.tpl +++ b/templates/members.tpl @@ -25,7 +25,7 @@ {if $member.website }
Website
- http://sucs.org/~{$member.uid|escape:'url'}/
+ http://sucs.org/~{$member.uid|escape:'url'}/ {/if} {if isset($member.project) }
Project
-- GitLab From 90f2d348a8f9b223e7a98679725794cad7711c66 Mon Sep 17 00:00:00 2001 From: Imran Hussain Date: Mon, 15 Jan 2018 13:23:57 +0000 Subject: [PATCH 2/4] Revert "Site now does some basic scaling for mobile phone. As well as fixed footer" This reverts commit 521ddbcdd5ccb6509727e06d44a402c9de7ab159. --- htdocs/css/sucs.css | 102 +++++++------------------------------- static/fragments/Join.txt | 2 +- templates/foot.tpl | 1 - templates/head.tpl | 14 +++--- 4 files changed, 26 insertions(+), 93 deletions(-) diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css index 7b27e55..de09d8b 100644 --- a/htdocs/css/sucs.css +++ b/htdocs/css/sucs.css @@ -7,7 +7,6 @@ body { margin: 0; background: #f2f2f2; min-width: 600px; - height: calc(100vh - 30px); } hr { @@ -39,6 +38,7 @@ a:hover { -------------------------------------------------- */ #branding { + background: url('/images/orangefade.png') repeat-x #ffc62b bottom; clear: both; } @@ -92,13 +92,6 @@ a:hover { border-radius: 0px } -.join-header { - font-size: 30pt; - margin-left: 10px; - text-decoration: none; - color: #ffc62b !important; -} - /* -------------------------------------------------- Breadcrumb -------------------------------------------------- */ @@ -136,92 +129,36 @@ a:hover { -------------------------------------------------- */ #wrapper { - background: #f2f2f2; - min-height: 100%; - margin-top: 10px; + background: #f2f2f2; + min-height: 100%; + margin-top: 10px; } #navigation { - float: left; - width: 300px; - padding-top: 0.5em; + float: left; + width: 17%; + padding-top: 0.5em; + /* overflow: auto; */ } #content { - float: right; - width: calc(100% - 300px); + float: right; + width: 82%; } #primary { - float: left; - width: calc(100% - 400px); + float: left; + width: 66%; + padding: 0; } #primaryC { - padding-left: 20px; - padding-right: 20px; + padding-right: 0.5em; } #secondary { - float: right; - width: 400px; -} - -@media only screen and (max-width: 1080px) { - #wrapper { - margin-top: -5px; - display: flex; - flex-direction: column; - } - - #navigation { - order: 1; - width: 100%; - float: top; - } - - #content { - margin-top: 10px; - order: 2; - float: bottom; - width: 100%; - } - - #primary { - float: none; - width: 100%; - } - - #secondary { - float: none; - width: 100%; - } - - #footer { - height: auto !important; - } - - #branding { - height: auto !important; - } - - #logo { - padding-right: 0; - } - - #title h1 { - margin-top: 20px; - font-size: 12pt; - padding-left: 0; - } - - #breadcrumb li { - display: block; - } - - #loginForm { - padding-top: 1em; - } + float: right; + width: 33%; } /* -------------------------------------------------- @@ -326,18 +263,15 @@ ul#valid { Footer -------------------------------------------------- */ -#footer-fix { - min-height: calc(100% - 16px); -} - #footer { background: #e65c00; - height: 30px; + margin-bottom: -20px; } #footer p { text-align: center; padding-top: 5px; + padding-bottom: 5px; } /* -------------------------------------------------- diff --git a/static/fragments/Join.txt b/static/fragments/Join.txt index 57f60db..3759360 100644 --- a/static/fragments/Join.txt +++ b/static/fragments/Join.txt @@ -1,6 +1,6 @@
-Join SUCS! +

Join SUCS!

As well as being an excellent way to meet people with similar interests (we have regular social events and we're all really nice), you also get all this great stuff:

  • Use of our dedicated games server
  • Web hosting with scripting and database support
    • diff --git a/templates/foot.tpl b/templates/foot.tpl index 7644691..09f8a9a 100644 --- a/templates/foot.tpl +++ b/templates/foot.tpl @@ -15,7 +15,6 @@
-