From 521ddbcdd5ccb6509727e06d44a402c9de7ab159 Mon Sep 17 00:00:00 2001
From: Isabel Jenkins <unreturnable@sucs.org>
Date: Sun, 20 Aug 2017 21:10:57 +0100
Subject: [PATCH] Site now does some basic scaling for mobile phone. As well as
 fixed footer

---
 htdocs/css/sucs.css       | 102 +++++++++++++++++++++++++++++++-------
 static/fragments/Join.txt |   2 +-
 templates/foot.tpl        |   1 +
 templates/head.tpl        |  14 +++---
 4 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css
index de09d8b..7b27e55 100644
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -7,6 +7,7 @@ body {
     margin: 0;
     background: #f2f2f2;
     min-width: 600px;
+    height: calc(100vh - 30px);
 }
 
 hr {
@@ -38,7 +39,6 @@ a:hover {
    -------------------------------------------------- */
 
 #branding {
-    background: url('/images/orangefade.png') repeat-x #ffc62b bottom;
     clear: both;
 }
 
@@ -92,6 +92,13 @@ a:hover {
     border-radius: 0px
 }
 
+.join-header {
+  font-size: 30pt;
+  margin-left: 10px;
+  text-decoration: none;
+  color: #ffc62b !important;
+}
+
 /* --------------------------------------------------
     Breadcrumb
    -------------------------------------------------- */
@@ -129,36 +136,92 @@ a:hover {
    -------------------------------------------------- */
 
 #wrapper {
-    background: #f2f2f2;
-    min-height: 100%;
-    margin-top: 10px;
+  background: #f2f2f2;
+  min-height: 100%;
+  margin-top: 10px;
 }
 
 #navigation {
-    float: left;
-    width: 17%;
-    padding-top: 0.5em;
-    /*	overflow: auto; */
+  float: left;
+  width: 300px;
+  padding-top: 0.5em;
 }
 
 #content {
-    float: right;
-    width: 82%;
+  float: right;
+  width: calc(100% - 300px);
 }
 
 #primary {
-    float: left;
-    width: 66%;
-    padding: 0;
+  float: left;
+  width: calc(100% - 400px);
 }
 
 #primaryC {
-    padding-right: 0.5em;
+  padding-left: 20px;
+  padding-right: 20px;
 }
 
 #secondary {
-    float: right;
-    width: 33%;
+  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;
+  }
 }
 
 /* --------------------------------------------------
@@ -263,15 +326,18 @@ ul#valid {
     Footer
    -------------------------------------------------- */
 
+#footer-fix {
+    min-height: calc(100% - 16px);
+}
+
 #footer {
     background: #e65c00;
-    margin-bottom: -20px;
+    height: 30px;
 }
 
 #footer p {
     text-align: center;
     padding-top: 5px;
-    padding-bottom: 5px;
 }
 
 /* --------------------------------------------------
diff --git a/static/fragments/Join.txt b/static/fragments/Join.txt
index 3759360..57f60db 100644
--- a/static/fragments/Join.txt
+++ b/static/fragments/Join.txt
@@ -1,6 +1,6 @@
 <!-- Joining box --> 
 <div class="cbb"> 
-<h3>Join SUCS!</h3> 
+<a class="join-header" href="https://www.swansea-union.co.uk/activities/society/sucs/" target="_blank">Join SUCS!</a>
 <p>As well as being an excellent way to meet people with similar interests (we have regular social events and we&#39;re all really nice), you also get all this great stuff: </p> 
 <ul> <li>Use of our dedicated <a href="../Games/" title="Gameserver">games server</a></li> 
 <li><a href="../Knowledge/Help/SUCS%20Services/Using%20your%20web%20space">Web hosting</a> with scripting and database support</li>
diff --git a/templates/foot.tpl b/templates/foot.tpl
index 09f8a9a..7644691 100644
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -15,6 +15,7 @@
 
 <div class="clear"></div>
 </div>
+</div>
 
 <div id="footer">
     <p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not of the society.</p>
diff --git a/templates/head.tpl b/templates/head.tpl
index 910439c..c2ede33 100644
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -31,7 +31,8 @@
           content="Swansea University Computer Society - providing student computing facilities and personal web pages."/>
     {if $refresh}
         <meta http-equiv="REFRESH" content="{$refresh}" />{/if}
-
+    
+    <meta name="viewport" content="width=device-width">
 
     {if isset($extra_scripts)}
         {foreach from=$extra_scripts item=script}
@@ -54,10 +55,9 @@
 </head>
 <body>
 
-{include file="branding.tpl"}
-
-
-<div id="wrapper">
+  <div id="footer-fix">
+    {include file="branding.tpl"}
 
-    <div id="content">
-        {include file="usermessages.tpl"}
+    <div id="wrapper">
+	<div id="content">
+	  {include file="usermessages.tpl"}
-- 
GitLab