diff --git a/htdocs/css/box.css b/htdocs/css/box.css index bfbdf7546c6d67ffeb66e92d273efda72667e1a8..ceb4fef6a9587cfde6849778ebf3b12c24264abf 100644 --- a/htdocs/css/box.css +++ b/htdocs/css/box.css @@ -6,7 +6,7 @@ margin: 1em 0; margin-left: 0.5em; margin-right: 0.5em; - background: #e65c00; + background: #ff6600; font-size: 85%; } diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css index 7b27e5550ff6acf708f4c582be3e3c25d2121184..25e37353de6242d4de1ae7171370a06366968566 100644 --- a/htdocs/css/sucs.css +++ b/htdocs/css/sucs.css @@ -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; } diff --git a/static/About/History.txt b/static/About/History.txt index a825002a4cc11019c7a493ef768296b9a395bd77..2f63f325bedbab0dc767c8afbcf18dc3018fd43d 100644 --- a/static/About/History.txt +++ b/static/About/History.txt @@ -14,14 +14,23 @@ -

2017

+

2018

-andy (Andrew Vincent Pover) -eggnog (George Henry Woolley) -sgelfod98 (Megan Warren-Davis) -N/A -crox (Ciaran Crocker) +vectre (Alexander Moras) +elbows (Laurence Sebastian Bowes) +xray_effect (Ryan Williams) +None +arcryalis (Hywel Williams) + + +

2017

+ +andy (Andrew Vincent Pover) +eggnog (George Henry Woolley) +sgelfod98 (Megan Warren-Davis) +None +crox (Ciaran Crocker) diff --git a/static/About/Staff.txt b/static/About/Staff.txt index 997a3dd00eaa245d8aadb84a063e706de126e40a..b4bd1a5eeea5fe7eb4083b091569e3b602bc4dc9 100644 --- a/static/About/Staff.txt +++ b/static/About/Staff.txt @@ -4,29 +4,24 @@

The following people were elected to the following posts in accordance with the SUCS constitution.

diff --git a/static/fragments/Join.txt b/static/fragments/Join.txt index 57f60db9c4d6fcb9919abdfbeddb4f4d5b683bc1..3759360b5de47abfab9cfa99cca63e2bee3e8dc1 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:

-