[SUCS Devel] [Git][sucssite/sucs-site][master] 4 commits: Updated CSS to try and give a more modern feel
Imran Hussain
imranh at sucs.org
Mon Jul 3 10:19:17 BST 2017
Imran Hussain pushed to branch master at sucssite / sucs-site
Commits:
09cb85e1 by Isabel Jenkins at 2017-06-19T06:54:25+01:00
Updated CSS to try and give a more modern feel
- - - - -
325be9b7 by Isabel Jenkins at 2017-07-02T20:23:33+01:00
Merge branch 'master' of projects.sucs.org:sucssite/sucs-site
- - - - -
1ed84067 by Isabel Jenkins at 2017-07-02T22:16:31+01:00
who turned out the lights
- - - - -
a7061603 by Imran Hussain at 2017-07-03T10:19:09+01:00
Merge branch 'master' into 'master'
Operation Polished Turd - Phase 1
See merge request !60
- - - - -
8 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/head.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: #e76808;
+ background: #e65c00;
font-size: 85%;
}
=====================================
htdocs/css/common.css
=====================================
--- 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;
}
=====================================
htdocs/css/sucs.css
=====================================
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -3,12 +3,14 @@
-------------------------------------------------- */
body {
- background: #fff;
+ padding: 0;
+ margin: 0;
+ background: #f2f2f2;
min-width: 600px;
}
hr {
- border: 1px solid #e76808;
+ border: 1px solid #e65c00;
}
/* --------------------------------------------------
@@ -16,7 +18,7 @@ hr {
-------------------------------------------------- */
a:link {
- color: #d45e08;
+ color: #e65c00;
}
a:visited {
@@ -32,23 +34,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: #e65c00;
}
#title {
- color: #a52f0f;
+ color: #f2f2f2;
}
#loginForm {
@@ -78,6 +63,35 @@ 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
+}
+
/* --------------------------------------------------
Breadcrumb
-------------------------------------------------- */
@@ -85,7 +99,15 @@ a:hover {
#breadcrumb {
font-weight: bold;
font-size: 80%;
- color: #ffc62b;
+ color: #f2f2f2;
+}
+
+#breadcrumb a:link {
+ color: #f2f2f2;
+}
+
+#breadcrumb a:visited {
+ color: #f2f2f2;
}
#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: #f2f2f2;
+ 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: #e65c00;
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: #e65c00;
+ 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 #e65c00;
+ border-top: 1px solid #e65c00;
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: #e65c00;
}
.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 #e65c00;
+ border-left: 2px solid #e65c00;
+ border-right: 2px solid #e65c00;
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: #e65c00;
}
.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 #e65c00;
+ border-left: 2px solid #e65c00;
+ border-right: 2px solid #e65c00;
}
/* --------------------------------------------------
@@ -421,7 +404,7 @@ ul#valid {
-------------------------------------------------- */
table.border th {
- background: #e76808;
+ background: #e65c00;
color: #ffc62b;
}
=====================================
htdocs/images/sucslogo-trans-white.png
=====================================
Binary files /dev/null and b/htdocs/images/sucslogo-trans-white.png 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-halo.png" width="170" height="76"
+ <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-trans-white.png" height="76"
alt="SUCS"/></a>
</div>
=====================================
templates/foot.tpl
=====================================
--- 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"}
=====================================
templates/head.tpl
=====================================
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -3,6 +3,7 @@
<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"/>
=====================================
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>
+ <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}
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/f522dda59a653f4df20c420d7849a76e3611d4af...a706160396accd9ef4171fb6f63389b5d94ee035
---
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/f522dda59a653f4df20c420d7849a76e3611d4af...a706160396accd9ef4171fb6f63389b5d94ee035
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/20170703/c46ac2cb/attachment-0001.html>
More information about the Devel
mailing list