diff --git a/htdocs/css/box.css b/htdocs/css/box.css index 4d2ef2446839514f568936817c3ca5236eca781b..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: #e76808; + background: #ff6600; font-size: 85%; } diff --git a/htdocs/css/common.css b/htdocs/css/common.css index e7f8b7cae626196b0b2a76a6132e720e6d59b0e6..675649b660301b31bdd32b6a2bc192e1612efd2a 100644 --- a/htdocs/css/common.css +++ b/htdocs/css/common.css @@ -62,7 +62,8 @@ acronym, abbr { float: left; padding: 0.2em; min-width: 170px; - width: 17%; + margin-left: 1%; + width: 16%; } #title { @@ -170,7 +171,7 @@ table.wide { } table.border, table.border td, table.border th { - border: 1px solid #e76808; + border: 1px solid #ff6600; border-collapse: collapse; } diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css index 7ce8a82a8768935f6f74ccf394a0a9f950485416..25e37353de6242d4de1ae7171370a06366968566 100644 --- a/htdocs/css/sucs.css +++ b/htdocs/css/sucs.css @@ -3,12 +3,14 @@ -------------------------------------------------- */ body { - background: #fff; + padding: 0; + margin: 0; + background: #f5f5f5; min-width: 600px; } hr { - border: 1px solid #e76808; + border: 1px solid #ff6600; } /* -------------------------------------------------- @@ -16,7 +18,7 @@ hr { -------------------------------------------------- */ a:link { - color: #d45e08; + color: #ff6600; } a:visited { @@ -31,23 +33,6 @@ 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 -------------------------------------------------- */ @@ -58,11 +43,11 @@ a:hover { } #brandingC { - background: url('/images/bgfade.png') repeat-y; + background: #ff6600; } #title { - color: #a52f0f; + color: #f5f5f5; } #loginForm { @@ -78,6 +63,35 @@ a:hover { width: 8em; } +#loginText a:link { + color: #f5f5f5; +} + +#loginText a:visited { + color: #f5f5f5; +} + +#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: #f5f5f5; + border: 0 none; + cursor: pointer; + -webkit-border-radius: 5px; + border-radius: 0px +} + /* -------------------------------------------------- Breadcrumb -------------------------------------------------- */ @@ -85,7 +99,15 @@ a:hover { #breadcrumb { font-weight: bold; font-size: 80%; - color: #ffc62b; + color: #f5f5f5; +} + +#breadcrumb a:link { + color: #f5f5f5; +} + +#breadcrumb a:visited { + color: #f5f5f5; } #breadcrumb ul { @@ -107,12 +129,9 @@ a:hover { -------------------------------------------------- */ #wrapper { - background: #fff0cd; - padding: 0; - clear: both; - border: 2px solid #e76808; - border-top: 0; - border-bottom: 0; + background: #f5f5f5; + min-height: 100%; + margin-top: 10px; } #navigation { @@ -160,13 +179,11 @@ a:hover { line-height: 1.5em; font-size: 95%; color: #ffc62b; - background: #e76808; - border-top-right-radius: 7px; - border-bottom-right-radius: 7px; - -moz-border-radius-topright: 7px; - -moz-border-radius-bottomright: 7px; + background: #ff6600; padding-left: 1em; margin-bottom: 2px; + padding-top: 5px; + padding-bottom: 5px; } #navigationC ul li a:hover { @@ -185,10 +202,6 @@ 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; } @@ -200,24 +213,14 @@ 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; @@ -261,16 +264,14 @@ ul#valid { -------------------------------------------------- */ #footer { - margin: 0; - margin-bottom: 0.5em; - background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b; + background: #ff6600; + margin-bottom: -20px; } #footer p { - margin: 0; text-align: center; - font-size: 80%; - padding: 0.5em; + padding-top: 5px; + padding-bottom: 5px; } /* -------------------------------------------------- @@ -279,13 +280,11 @@ ul#valid { .box { background: #ffffff; - border-radius: 7px; - -moz-border-radius: 7px; } .box div.boxcontent { - border: 2px solid #e76808; - border-top: 1px solid #e76808; + border: 2px solid #ff6600; + border-top: 1px solid #ff6600; border-bottom: 1px solid #ffffff; } @@ -294,33 +293,21 @@ ul#valid { } .box .boxhead { - background: #e76808; - border-top-left-radius: 7px; - border-top-right-radius: 7px; - -moz-border-radius-topleft: 7px; - -moz-border-radius-topright: 7px; + background: #ff6600; } .box .hollowhead { background: #ffffff; - 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; + border-top: 2px solid #ff6600; + border-left: 2px solid #ff6600; + border-right: 2px solid #ff6600; height: 5px; margin: 0; padding: 0; } .box .boxfoot { - background: #e76808; - border-bottom-left-radius: 7px; - border-bottom-right-radius: 7px; - -moz-border-radius-bottomleft: 7px; - -moz-border-radius-bottomright: 7px; + background: #ff6600; } .box .hollowfoot { @@ -328,13 +315,9 @@ ul#valid { height: 5px; margin: 0; padding: 0; - 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; + border-bottom: 2px solid #ff6600; + border-left: 2px solid #ff6600; + border-right: 2px solid #ff6600; } /* -------------------------------------------------- @@ -421,7 +404,7 @@ ul#valid { -------------------------------------------------- */ table.border th { - background: #e76808; + background: #ff6600; color: #ffc62b; } diff --git a/htdocs/images/sucslogo-trans-white.png b/htdocs/images/sucslogo-trans-white.png new file mode 100644 index 0000000000000000000000000000000000000000..0a49c8302319dadf67a76ed1169d835767ddaa09 Binary files /dev/null and b/htdocs/images/sucslogo-trans-white.png differ diff --git a/templates/branding.tpl b/templates/branding.tpl index c2aac96cb9a30fd9985a0722fc063aed0ad8e314..b235b01a1558f119c09d1a271619268f3a453b16 100644 --- a/templates/branding.tpl +++ b/templates/branding.tpl @@ -3,7 +3,7 @@ <div class="cornerTopLeft"> <div class="cornerTopRight"> <div id="logo"> - <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76" + <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-trans-white.png" height="76" alt="SUCS"/></a> </div> diff --git a/templates/foot.tpl b/templates/foot.tpl index 9c40c474db23dec81c665980ba0a7ba5feb0ebd3..09f8a9a214db3eb81ec88e75dc31f6f47d2e6f16 100644 --- a/templates/foot.tpl +++ b/templates/foot.tpl @@ -17,13 +17,8 @@ </div> <div id="footer"> - <div class="cornerBottomLeft"> - <div class="cornerBottomRight"> - <p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not - of the society.</p> - {if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if} - </div> - </div> + <p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not of the society.</p> + {if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if} </div> {if $action=="edit"} diff --git a/templates/login.tpl b/templates/login.tpl index d26970aed5a23aba93db9125f7a0120f2db2ad61..58771a865b6dcd817a01f5bcbe932f2e8010e4a2 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -1,6 +1,6 @@ <div id="loginForm"> <form method="post" action="{$ssl_url|escape:'htmlall'}{getparams gets=$gets}"> - <div> + <div id="loginText"> {if $session->loggedin} Hello <a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a> @@ -17,7 +17,6 @@ <br/> Print balance: {$session->printbalance} | <a href="{$baseurl}/Options">Membership Options</a> - <br/> {/if} <input type="submit" class="button" name="Logout" id="Logout" value="Logout"/> {else}