[SUCS Devel] [Git][sucssite/sucs-site][master] Revert "Updated CSS to try and give a more modern feel"
Imran Hussain
imranh at sucs.org
Mon Jan 15 13:51:55 GMT 2018
Imran Hussain pushed to branch master at sucssite / sucs-site
Commits:
fea0d64a by Imran Hussain at 2018-01-15T13:51:50+00:00
Revert "Updated CSS to try and give a more modern feel"
This reverts commit 09cb85e1459319d7b8b3e5abbf64be59fc3be210
- - - - -
7 changed files:
- htdocs/css/box.css
- htdocs/css/common.css
- htdocs/css/sucs.css
- − htdocs/images/sucslogo-trans-white.png
- templates/branding.tpl
- templates/foot.tpl
- templates/login.tpl
Changes:
=====================================
htdocs/css/box.css
=====================================
--- 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: #ff6600;
+ background: #e76808;
font-size: 85%;
}
=====================================
htdocs/css/common.css
=====================================
--- 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;
}
=====================================
htdocs/css/sucs.css
=====================================
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -3,14 +3,12 @@
-------------------------------------------------- */
body {
- padding: 0;
- margin: 0;
- background: #f5f5f5;
+ background: #fff;
min-width: 600px;
}
hr {
- border: 1px solid #ff6600;
+ border: 1px solid #e76808;
}
/* --------------------------------------------------
@@ -18,7 +16,7 @@ hr {
-------------------------------------------------- */
a:link {
- color: #ff6600;
+ color: #d45e08;
}
a:visited {
@@ -34,6 +32,23 @@ 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
-------------------------------------------------- */
@@ -43,11 +58,11 @@ a:hover {
}
#brandingC {
- background: #ff6600;
+ background: url('/images/bgfade.png') repeat-y;
}
#title {
- color: #f5f5f5;
+ color: #a52f0f;
}
#loginForm {
@@ -63,35 +78,6 @@ 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
-------------------------------------------------- */
@@ -99,15 +85,7 @@ a:hover {
#breadcrumb {
font-weight: bold;
font-size: 80%;
- color: #f5f5f5;
-}
-
-#breadcrumb a:link {
- color: #f5f5f5;
-}
-
-#breadcrumb a:visited {
- color: #f5f5f5;
+ color: #ffc62b;
}
#breadcrumb ul {
@@ -129,9 +107,12 @@ a:hover {
-------------------------------------------------- */
#wrapper {
- background: #f5f5f5;
- min-height: 100%;
- margin-top: 10px;
+ background: #fff0cd;
+ padding: 0;
+ clear: both;
+ border: 2px solid #e76808;
+ border-top: 0;
+ border-bottom: 0;
}
#navigation {
@@ -179,11 +160,13 @@ a:hover {
line-height: 1.5em;
font-size: 95%;
color: #ffc62b;
- background: #ff6600;
+ 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 {
@@ -202,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;
}
@@ -213,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;
@@ -264,14 +261,16 @@ ul#valid {
-------------------------------------------------- */
#footer {
- background: #ff6600;
- margin-bottom: -20px;
+ 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;
- padding-bottom: 5px;
+ font-size: 80%;
+ padding: 0.5em;
}
/* --------------------------------------------------
@@ -280,11 +279,13 @@ ul#valid {
.box {
background: #ffffff;
+ border-radius: 7px;
+ -moz-border-radius: 7px;
}
.box div.boxcontent {
- border: 2px solid #ff6600;
- border-top: 1px solid #ff6600;
+ border: 2px solid #e76808;
+ border-top: 1px solid #e76808;
border-bottom: 1px solid #ffffff;
}
@@ -293,21 +294,33 @@ ul#valid {
}
.box .boxhead {
- background: #ff6600;
+ 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 #ff6600;
- border-left: 2px solid #ff6600;
- border-right: 2px solid #ff6600;
+ 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: #ff6600;
+ background: #e76808;
+ border-bottom-left-radius: 7px;
+ border-bottom-right-radius: 7px;
+ -moz-border-radius-bottomleft: 7px;
+ -moz-border-radius-bottomright: 7px;
}
.box .hollowfoot {
@@ -315,9 +328,13 @@ ul#valid {
height: 5px;
margin: 0;
padding: 0;
- border-bottom: 2px solid #ff6600;
- border-left: 2px solid #ff6600;
- border-right: 2px solid #ff6600;
+ 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;
}
/* --------------------------------------------------
@@ -404,7 +421,7 @@ ul#valid {
-------------------------------------------------- */
table.border th {
- background: #ff6600;
+ background: #e76808;
color: #ffc62b;
}
=====================================
htdocs/images/sucslogo-trans-white.png deleted
=====================================
Binary files a/htdocs/images/sucslogo-trans-white.png and /dev/null differ
=====================================
templates/branding.tpl
=====================================
--- 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-trans-white.png" height="76"
+ <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76"
alt="SUCS"/></a>
</div>
=====================================
templates/foot.tpl
=====================================
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -17,8 +17,13 @@
</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>
- {if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if}
+ <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>
</div>
{if $action=="edit"}
=====================================
templates/login.tpl
=====================================
--- 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 id="loginText">
+ <div>
{if $session->loggedin}
Hello
<a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a>
@@ -17,6 +17,7 @@
<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}
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/fea0d64a4879358e3d8cc26fde6f9d5e6d33a7e2
---
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/fea0d64a4879358e3d8cc26fde6f9d5e6d33a7e2
You're receiving this email because of your account on projects.sucs.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20180115/9de6e458/attachment-0001.html>
More information about the Devel
mailing list