Commit 90f2d348 authored by Imran Hussain's avatar Imran Hussain

Revert "Site now does some basic scaling for mobile phone. As well as fixed footer"

This reverts commit 521ddbcd.
parent fd1bf290
......@@ -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;
}
/* --------------------------------------------------
......
<!-- Joining box -->
<div class="cbb">
<a class="join-header" href="https://www.swansea-union.co.uk/activities/society/sucs/" target="_blank">Join SUCS!</a>
<h3>Join SUCS!</h3>
<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>
......
......@@ -15,7 +15,6 @@
<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>
......
......@@ -31,8 +31,7 @@
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}
......@@ -55,9 +54,10 @@
</head>
<body>
<div id="footer-fix">
{include file="branding.tpl"}
{include file="branding.tpl"}
<div id="wrapper">
<div id="wrapper">
<div id="content">
{include file="usermessages.tpl"}
<div id="content">
{include file="usermessages.tpl"}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment