Skip to content
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
htdocs/css/box.css
View file @ 77c431d7
......@@ -6,7 +6,7 @@
margin: 1em 0;
margin-left: 0.5em;
margin-right: 0.5em;
background: #e65c00;
background: #ff6600;
font-size: 85%;
}
......
htdocs/css/sucs.css
View file @ 77c431d7
......@@ -5,13 +5,12 @@
body {
padding: 0;
margin: 0;
background: #f2f2f2;
background: #f5f5f5;
min-width: 600px;
height: calc(100vh - 30px);
}
hr {
border: 1px solid #e65c00;
border: 1px solid #ff6600;
}
/* --------------------------------------------------
......@@ -19,7 +18,7 @@ hr {
-------------------------------------------------- */
a:link {
color: #e65c00;
color: #ff6600;
}
a:visited {
......@@ -39,15 +38,16 @@ a:hover {
-------------------------------------------------- */
#branding {
background: url('/images/orangefade.png') repeat-x #ffc62b bottom;
clear: both;
}
#brandingC {
background: #e65c00;
background: #ff6600;
}
#title {
color: #f2f2f2;
color: #f5f5f5;
}
#loginForm {
......@@ -64,11 +64,11 @@ a:hover {
}
#loginText a:link {
color: #f2f2f2;
color: #f5f5f5;
}
#loginText a:visited {
color: #f2f2f2;
color: #f5f5f5;
}
#loginForm input[type=text] {
......@@ -85,20 +85,13 @@ a:hover {
#loginForm input[type=submit] {
padding: 5px 15px;
background: #f2f2f2;
background: #f5f5f5;
border: 0 none;
cursor: pointer;
-webkit-border-radius: 5px;
border-radius: 0px
}
.join-header {
font-size: 30pt;
margin-left: 10px;
text-decoration: none;
color: #ffc62b !important;
}
/* --------------------------------------------------
Breadcrumb
-------------------------------------------------- */
......@@ -106,15 +99,15 @@ a:hover {
#breadcrumb {
font-weight: bold;
font-size: 80%;
color: #f2f2f2;
color: #f5f5f5;
}
#breadcrumb a:link {
color: #f2f2f2;
color: #f5f5f5;
}
#breadcrumb a:visited {
color: #f2f2f2;
color: #f5f5f5;
}
#breadcrumb ul {
......@@ -136,92 +129,36 @@ a:hover {
-------------------------------------------------- */
#wrapper {
background: #f2f2f2;
min-height: 100%;
margin-top: 10px;
background: #f5f5f5;
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%;
}
/* --------------------------------------------------
......@@ -242,7 +179,7 @@ a:hover {
line-height: 1.5em;
font-size: 95%;
color: #ffc62b;
background: #e65c00;
background: #ff6600;
padding-left: 1em;
margin-bottom: 2px;
padding-top: 5px;
......@@ -326,18 +263,15 @@ ul#valid {
Footer
-------------------------------------------------- */
#footer-fix {
min-height: calc(100% - 16px);
}
#footer {
background: #e65c00;
height: 30px;
background: #ff6600;
margin-bottom: -20px;
}
#footer p {
text-align: center;
padding-top: 5px;
padding-bottom: 5px;
}
/* --------------------------------------------------
......@@ -349,8 +283,8 @@ ul#valid {
}
.box div.boxcontent {
border: 2px solid #e65c00;
border-top: 1px solid #e65c00;
border: 2px solid #ff6600;
border-top: 1px solid #ff6600;
border-bottom: 1px solid #ffffff;
}
......@@ -359,21 +293,21 @@ ul#valid {
}
.box .boxhead {
background: #e65c00;
background: #ff6600;
}
.box .hollowhead {
background: #ffffff;
border-top: 2px solid #e65c00;
border-left: 2px solid #e65c00;
border-right: 2px solid #e65c00;
border-top: 2px solid #ff6600;
border-left: 2px solid #ff6600;
border-right: 2px solid #ff6600;
height: 5px;
margin: 0;
padding: 0;
}
.box .boxfoot {
background: #e65c00;
background: #ff6600;
}
.box .hollowfoot {
......@@ -381,9 +315,9 @@ ul#valid {
height: 5px;
margin: 0;
padding: 0;
border-bottom: 2px solid #e65c00;
border-left: 2px solid #e65c00;
border-right: 2px solid #e65c00;
border-bottom: 2px solid #ff6600;
border-left: 2px solid #ff6600;
border-right: 2px solid #ff6600;
}
/* --------------------------------------------------
......@@ -470,7 +404,7 @@ ul#valid {
-------------------------------------------------- */
table.border th {
background: #e65c00;
background: #ff6600;
color: #ffc62b;
}
......
static/About/History.txt
View file @ 77c431d7
......@@ -14,14 +14,23 @@
</tr>
<tr>
<td>
<p><strong>2017</strong></p>
<p><strong>2018</strong></p>
</td>
<td><strong><a href="/~andy">andy</a> (Andrew Vincent Pover)</strong></td>
<td><strong><a href="/~eggnog">eggnog</a> (George Henry Woolley)</strong></td>
<td><strong><a href="/~sgelfod98">sgelfod98</a> (Megan Warren-Davis)</strong></td>
<td><strong><em>N/A</em></strong></td>
<td><strong><a href="/~crox">crox</a> (Ciaran Crocker)</strong></td>
<td><strong><a href="/~vectre">vectre</a> (Alexander Moras)</strong></td>
<td><strong><a href="/~elbows">elbows</a> (Laurence Sebastian Bowes)</strong></td>
<td><strong><a href="/~xray_effect">xray_effect</a> (Ryan Williams)</strong></td>
<td><strong><em>None</em></strong></td>
<td><strong><a href="/~arcryalis">arcryalis</a> (Hywel Williams)</strong></td>
</tr>
<tr>
<td>
<p>2017</p>
</td>
<td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
<td><a href="/~eggnog">eggnog</a> (George Henry Woolley)</td>
<td><a href="/~sgelfod98">sgelfod98</a> (Megan Warren-Davis)</td>
<td><em>None</em></td>
<td><a href="/~crox">crox</a> (Ciaran Crocker)</td>
</tr>
<tr>
<td>
......
static/About/Staff.txt
View file @ 77c431d7
......@@ -4,29 +4,24 @@
<p>The following people were elected to the following posts in accordance with the <a href="../About/Constitution">SUCS constitution</a>.</p>
<ul class="boxes">
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/andy.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
<br />
<strong>President</strong><br />Andrew Vincent Pover (~andy)</div>
<strong>President</strong><br />Alexander Moras (~vectre)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/eggnog.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
<br />
<strong>Treasurer</strong><br />George Henry Woolley (~eggnog)
</div>
<strong>Treasurer</strong><br />Laurence Sebastian Bowes (~elbows)</div>
</li>
<li>
<div>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/sgelfod98.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
<br />
<strong>Secretary</strong><br />Megan Warren-Davis (~sgelfod98)
</div>
</div>
<strong>Secretary</strong><br />Ryan Williams (~xray_effect)</div>
</li>
<li>
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/crox.png" width="100" />
<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
<br />
<strong>Gaming</strong><br />Ciaran Crocker (~crox)
</div>
<strong>Gaming</strong><br />Hywel Williams (~arcryalis)</div>
</li>
</ul>
<div class="clear"></div>
......
static/fragments/Join.txt
View file @ 77c431d7
<!-- 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>
......
templates/foot.tpl
View file @ 77c431d7
......@@ -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>
......
templates/head.tpl
View file @ 77c431d7
......@@ -3,7 +3,6 @@
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
<meta name="theme-color" content="#e65c00">
<title>{$title} - SUCS</title>
<link rel="SHORTCUT ICON" href="{$baseurl}/favicon.ico"/>
<link rel="apple-touch-icon" href="{$baseurl}/images/apple-touch-icon.png"/>
......@@ -31,8 +30,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 +53,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"}
templates/members.tpl
View file @ 77c431d7
......@@ -25,7 +25,7 @@
{if $member.website }
<dt>Website</dt>
<dd>
<a href="http://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}/</a></dd>
<a href="https://sucs.org/~{$member.uid|escape:'url'}/">http://sucs.org/~{$member.uid|escape:'url'}/</a></dd>
{/if}
{if isset($member.project) }
<dt>Project</dt>
......