diff --git a/htdocs/css/box.css b/htdocs/css/box.css index bfbdf7546c6d67ffeb66e92d273efda72667e1a8..4d2ef2446839514f568936817c3ca5236eca781b 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: #e76808; font-size: 85%; } diff --git a/htdocs/css/common.css b/htdocs/css/common.css index 675649b660301b31bdd32b6a2bc192e1612efd2a..e7f8b7cae626196b0b2a76a6132e720e6d59b0e6 100644 --- a/htdocs/css/common.css +++ b/htdocs/css/common.css @@ -62,8 +62,7 @@ acronym, abbr { float: left; padding: 0.2em; min-width: 170px; - margin-left: 1%; - width: 16%; + width: 17%; } #title { @@ -171,7 +170,7 @@ table.wide { } table.border, table.border td, table.border th { - border: 1px solid #ff6600; + border: 1px solid #e76808; border-collapse: collapse; } diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css index 7b27e5550ff6acf708f4c582be3e3c25d2121184..7ce8a82a8768935f6f74ccf394a0a9f950485416 100644 --- a/htdocs/css/sucs.css +++ b/htdocs/css/sucs.css @@ -3,15 +3,12 @@ -------------------------------------------------- */ body { - padding: 0; - margin: 0; - background: #f2f2f2; + background: #fff; min-width: 600px; - height: calc(100vh - 30px); } hr { - border: 1px solid #e65c00; + border: 1px solid #e76808; } /* -------------------------------------------------- @@ -19,7 +16,7 @@ hr { -------------------------------------------------- */ a:link { - color: #e65c00; + color: #d45e08; } a:visited { @@ -34,20 +31,38 @@ a:hover { } +/* -------------------------------------------------- + Page corners + -------------------------------------------------- */ +#branding, #brandingC { + border-top-left-radius: 15px; + border-top-right-radius: 15px; + -moz-border-radius-topleft: 15px; + -moz-border-radius-topright: 15px; +} + +#footer { + border-bottom-left-radius: 15px; + border-bottom-right-radius: 15px; + -moz-border-radius-bottomleft: 15px; + -moz-border-radius-bottomright: 15px; +} + /* -------------------------------------------------- Branding -------------------------------------------------- */ #branding { + background: url('/images/orangefade.png') repeat-x #ffc62b bottom; clear: both; } #brandingC { - background: #e65c00; + background: url('/images/bgfade.png') repeat-y; } #title { - color: #f2f2f2; + color: #a52f0f; } #loginForm { @@ -63,42 +78,6 @@ a:hover { width: 8em; } -#loginText a:link { - color: #f2f2f2; -} - -#loginText a:visited { - color: #f2f2f2; -} - -#loginForm input[type=text] { - padding: 5px 15px; - box-sizing: border-box; - border: 0px; -} - -#loginForm input[type=password] { - padding: 5px 15px; - box-sizing: border-box; - border: 0px; -} - -#loginForm input[type=submit] { - padding: 5px 15px; - background: #f2f2f2; - 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 +85,7 @@ a:hover { #breadcrumb { font-weight: bold; font-size: 80%; - color: #f2f2f2; -} - -#breadcrumb a:link { - color: #f2f2f2; -} - -#breadcrumb a:visited { - color: #f2f2f2; + color: #ffc62b; } #breadcrumb ul { @@ -136,92 +107,39 @@ a:hover { -------------------------------------------------- */ #wrapper { - background: #f2f2f2; - min-height: 100%; - margin-top: 10px; + background: #fff0cd; + padding: 0; + clear: both; + border: 2px solid #e76808; + border-top: 0; + border-bottom: 0; } #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,11 +160,13 @@ a:hover { line-height: 1.5em; font-size: 95%; color: #ffc62b; - background: #e65c00; + background: #e76808; + border-top-right-radius: 7px; + border-bottom-right-radius: 7px; + -moz-border-radius-topright: 7px; + -moz-border-radius-bottomright: 7px; padding-left: 1em; margin-bottom: 2px; - padding-top: 5px; - padding-bottom: 5px; } #navigationC ul li a:hover { @@ -265,6 +185,10 @@ a:hover { font-weight: normal; padding-left: 2em; background: #ffa405; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 0; color: #d45e08; } @@ -276,14 +200,24 @@ a:hover { color: #fff0cd; } +#navigationC ul ul li.lastsub a { + border-bottom-right-radius: 7px; + -moz-border-radius-bottomright: 7px; +} + #navigationC ul li.lastsub a { display: block; + border-bottom-right-radius: 7px; + -moz-border-radius-bottomright: 7px; } /* -------------------------------------------------- Boxes -------------------------------------------------- */ div.cbb { + border-radius: 12px; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; padding: 1em; box-shadow: 3px 3px 5px #777; -moz-box-shadow: 3px 3px 5px #777; @@ -326,18 +260,17 @@ ul#valid { Footer -------------------------------------------------- */ -#footer-fix { - min-height: calc(100% - 16px); -} - #footer { - background: #e65c00; - height: 30px; + margin: 0; + margin-bottom: 0.5em; + background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b; } #footer p { + margin: 0; text-align: center; - padding-top: 5px; + font-size: 80%; + padding: 0.5em; } /* -------------------------------------------------- @@ -346,11 +279,13 @@ ul#valid { .box { background: #ffffff; + border-radius: 7px; + -moz-border-radius: 7px; } .box div.boxcontent { - border: 2px solid #e65c00; - border-top: 1px solid #e65c00; + border: 2px solid #e76808; + border-top: 1px solid #e76808; border-bottom: 1px solid #ffffff; } @@ -359,21 +294,33 @@ ul#valid { } .box .boxhead { - background: #e65c00; + background: #e76808; + border-top-left-radius: 7px; + border-top-right-radius: 7px; + -moz-border-radius-topleft: 7px; + -moz-border-radius-topright: 7px; } .box .hollowhead { background: #ffffff; - border-top: 2px solid #e65c00; - border-left: 2px solid #e65c00; - border-right: 2px solid #e65c00; + border-top: 2px solid #e76808; + border-left: 2px solid #e76808; + border-right: 2px solid #e76808; + border-top-left-radius: 7px; + border-top-right-radius: 7px; + -moz-border-radius-topleft: 7px; + -moz-border-radius-topright: 7px; height: 5px; margin: 0; padding: 0; } .box .boxfoot { - background: #e65c00; + background: #e76808; + border-bottom-left-radius: 7px; + border-bottom-right-radius: 7px; + -moz-border-radius-bottomleft: 7px; + -moz-border-radius-bottomright: 7px; } .box .hollowfoot { @@ -381,9 +328,13 @@ 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 #e76808; + border-left: 2px solid #e76808; + border-right: 2px solid #e76808; + border-bottom-left-radius: 7px; + border-bottom-right-radius: 7px; + -moz-border-radius-bottomleft: 7px; + -moz-border-radius-bottomright: 7px; } /* -------------------------------------------------- @@ -470,7 +421,7 @@ ul#valid { -------------------------------------------------- */ table.border th { - background: #e65c00; + background: #e76808; color: #ffc62b; } diff --git a/htdocs/images/sucslogo-trans-white.png b/htdocs/images/sucslogo-trans-white.png deleted file mode 100644 index 0a49c8302319dadf67a76ed1169d835767ddaa09..0000000000000000000000000000000000000000 Binary files a/htdocs/images/sucslogo-trans-white.png and /dev/null differ diff --git a/static/About/Conditions.txt b/static/About/Conditions.txt index cc4faf5d833abab969f01856bae72f185c18a838..5f4a313cdcf6bbd37b0b3f6dc81b142c95f2677c 100644 --- a/static/About/Conditions.txt +++ b/static/About/Conditions.txt @@ -8,7 +8,7 @@ Date: May 2002

  1. Members of Swansea University Computer Society are entitled to an account on the SUCS network. For all except life members, membership will only be granted on payment of the appropriate fee.
  2. All members agree not to do anything to bring the Society into disrepute, and to abide by the Terms and Conditions of the Society, as noted below and as may be subsequently amended. Non-compliance with these rules may result in membership being withdrawn.
    3. -
  3. Members must comply with the regulations of the network(s) over which they access the SUCS network. This will always include the UK Joint Academic Network (JANET), the Acceptable Use Policy of which can be found at http://www.ja.net/services/publications/policy/aup.html.
    4. +
  4. Members must comply with the regulations of the network(s) over which they access the SUCS network. This will always include the UK Joint Academic Network (JANET), the Acceptable Use Policy of which can be found at https://community.jisc.ac.uk/library/acceptable-use-policy.
  5. Except when explicitly set up for clubs or groups within the University, accounts on the SUCS network are strictly for use by one person only. Multiple use of personal accounts is prohibited, and may result in the offending owner's account being withdrawn. 'Multiple use' includes the owner of the account making known his/her password to others, as well as allowing others access to the account by other means.
  6. Members must take into account the relevant laws of England and Wales as they apply to their use of the SUCS network. These include, but are not limited to, the Data Protection Act (1984), the Copyright, Designs and Patents Act (1988), the Obscene Publications Act (1959 & 1964 etc), the Telecommunications Act (1984), and the Computer Misuse Act (1990).
  7. Members must always use the SUCS network in a manner that does not adversely affect its use by others. In particular, disproportionate use of system resources (including, but not limited to, disc space, network bandwidth and processor time), may result in offending processes and/or files being terminated and/or removed without warning.
    8. 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: