[open-ils-commits] [GIT] Evergreen ILS branch master updated. 56fa348c351da2e4d1a9af9903c91a4b7ab8f33b
Evergreen Git
git at git.evergreen-ils.org
Fri Jan 20 18:04:49 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 56fa348c351da2e4d1a9af9903c91a4b7ab8f33b (commit)
via 522bddfa14ca0cb60fbc1a53f3afd7d6a1579858 (commit)
from 5ae3c823e9e7af705ed4ae6a4e813c2196d329f7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 56fa348c351da2e4d1a9af9903c91a4b7ab8f33b
Merge: 522bddf 5ae3c82
Author: Dan Wells <dbw2 at calvin.edu>
Date: Fri Jan 20 17:58:01 2012 -0500
Merge branch 'master' of git.evergreen-ils.org:Evergreen
commit 522bddfa14ca0cb60fbc1a53f3afd7d6a1579858
Author: Michael Peters <mrpeters at library.in.gov>
Date: Fri Jan 20 17:49:16 2012 -0500
Modifications to the TTPac color scheme to be more with logo guidelines
Tweaked the buttons, gradients, etc. in TTPac to eradicate the blue/grey elements.
Began with the Evergreen Logo's official color (Pantone 340 as found at http://www.georgialibraries.org/lib/pines/evergreenlogo/)
and complimented the colors accordingly, replacing dark blues with dark greens, light blues with light greens, etc.
This also adds two new selectors in styles.css to control the logo placement. Logos were also centered on the page, rather than being crowded
into neighboring elements.
Signed-off-by: Michael Peters <mrpeters at library.in.gov>
Fixed Conflicts:
Open-ILS/web/css/skin/default/opac/semiauto.css
Open-ILS/web/css/skin/default/opac/style.css
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/homesearch.tt2 b/Open-ILS/src/templates/opac/parts/homesearch.tt2
index 4ed9017..e99e1b1 100644
--- a/Open-ILS/src/templates/opac/parts/homesearch.tt2
+++ b/Open-ILS/src/templates/opac/parts/homesearch.tt2
@@ -1,3 +1,3 @@
-<div style='width:664px;height:35px;background:#FFFFFF;'>
+<div id="homesearch_main_logo">
<strong><center><img src="[% ctx.media_prefix %]/opac/images/main_logo.png" /></center></strong>
</div>
diff --git a/Open-ILS/src/templates/opac/parts/topnav_logo.tt2 b/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
index cd067d6..0b55700 100644
--- a/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
@@ -1,2 +1,2 @@
- <a href="http://evergreen-ils.org"><img alt="[% l('Evergreen Logo') %]"
- src="[% ctx.media_prefix %]/opac/images/small_logo.png" /></a>
+ <div id="topnav_logo"> <a href="http://evergreen-ils.org"><img alt="[% l('Evergreen Logo') %]"
+ src="[% ctx.media_prefix %]/opac/images/small_logo.png" /></a></div>
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index 67ea799..bb2e114 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -4,7 +4,7 @@
.normal-height { height: 15px; }
.big-height { height: 20px; }
.very-big-height { height: 30px; }
-#gold-links-holder { height: 24px; background: #252525; }
+#gold-links-holder { height: 24px; background: #69a088; }
.big-block { margin: auto; width: 974px; height: 0px; }
.qtype_selector_margin { margin-right: 7px; }
.warning_box { margin-top: 10px; }
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index a9876eb..e54180b 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -2,15 +2,23 @@ body {
margin:0;
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
- background: #252525;
+ background: #00593d;
}
img {
border: none;
}
+#topnav_logo {
+ padding-bottom: 25px;
+}
+
+#homesearch_main_logo {
+ padding-top: 60px;
+}
+
a {
- color: #003399;
+ color: #00593d;
}
#search-wrapper input[type=text] {
@@ -83,7 +91,7 @@ div.select-wrapper:hover {
#dash_wrapper div {
position: relative;
vertical-align: middle;
- background: #252525;
+ background: #00593d;
border-radius: 5px;
height: 3em;
padding: 0em 1em 0em 1em;
@@ -93,20 +101,21 @@ span.dash_divider {
margin: 0em 1em 0em 1em;
position: relative;
top: 10px;
- color: black;
+ color: #007a54;
}
#dashboard {
clear:both;
float:right;
margin-top: 1em;
- background: #252525;
+ background: #00593d;
border-radius: 5px;
height: 3em;
}
#dashboard span.dash-align a {
font-weight: bold;
+ text-decoration: none;
position: relative;
top: 10px;
}
@@ -125,11 +134,11 @@ span.dash_divider {
#dash_pickup { color: #1dd93c; }
#dash_fines { color: #f41d36; }
#header-wrap {
- background: linear-gradient(lightGreen, #252525);
- background: -moz-linear-gradient(lightGreen, #252525);
- background: -o-linear-gradient(lightGreen, #252525);
- background: -webkit-linear-gradient(lightGreen, #252525);
- background-color: lightGreen;
+ background: linear-gradient(#00593d, #007a54);
+ background: -moz-linear-gradient(#00593d, #007a54);
+ background: -o-linear-gradient(#00593d, #007a54);
+ background: -webkit-linear-gradient(#00593d, #007a54);
+ background-color: #007a54;
}
#header {
color: #fff;
@@ -148,7 +157,7 @@ span.dash_divider {
}
#header-links {
- color: #afafaf;
+ color: white;
font-size: 11px;
font-weight: bold;
position: relative;
@@ -157,14 +166,16 @@ span.dash_divider {
}
#header-links a {
- color: #afafaf;
+ color: white;
display: block;
float:left;
margin-right:22px;
+ text-decoration: none;
}
#header-links a:hover {
color: white;
+ text-shadow: 0 0 0.2em #00593d, 0 0 0.2em #00593d;
text-decoration: none;
}
@@ -272,30 +283,39 @@ span.dash_divider {
display: block;
margin: 10px 7px 10px 0px;
padding: 10px 0px 10px 0px;
- -moz-border-radius: 7px 7px 0px 0px;
- border-radius: 7px 7px 0px 0px;
+ -moz-border-radius: 10px 10px 0px 0px;
+ border-radius: 10px 10px 0px 0px;
font-weight: bold;
- color: #45709b;
- background: #9ad0f1;
+ color: white;
+ background: #69A088;
font-weight: bold;
+ text-decoration: none;
}
#adv_search_tabs a, #acct_tabs a, #acct_fines_tabs a {
padding: 1em 1em 0.5em;
}
+#adv_search_tabs a:hover, #acct_tabs a:hover, #acct_fines_tabs a:hover, #acct_checked_tabs a:hover, #acct_holds_tabs a:hover, #acct_prefs_tabs a:hover {
+ background: #00593d;
+ color: white;
+ text-decoration: none;
+}
+
#adv_search.on, #num_search.on, #expert_search.on {
color: #333333;
background: white;
+ text-decoration: none;
}
#adv_search_tabs a.acct-tab-on, #acct_tabs a.acct-tab-on, #acct_fines_tabs a.acct-tab-on {
color: #333333;
background: white;
+ text-decoration: none;
}
.acct-tab-off {
- background: #9ad0f1;
+ background: #69A088;
}
#acct_checked_tabs a, #acct_holds_tabs a, #acct_prefs_tabs a {
@@ -322,7 +342,7 @@ span.dash_divider {
}
#rdetail_results a {
- color:#074079;
+ color:#007a54;
font-weight:bold;
font-size: 1.2em;
}
@@ -455,7 +475,7 @@ div.format_icon {
.rdetail_extras {
height: 29px;
- background: #9ad0f1;
+ background: #69A088;
padding-top:1px;
margin-bottom: 10px;
margin-top: 10px;
@@ -708,7 +728,7 @@ div.format_icon {
.results_header_nav1 .h1 {
font-size:14px;
font-weight:bold;
- color:#074079;
+ color:#007a54;
}
.start_end_links_span {
@@ -819,7 +839,7 @@ div.result_place_hold {
height:22px;
font-size:14px;
font-weight:bold;
- color:#074079;
+ color:#007a54;
padding: 0px 7px 0px 0px;
border-bottom: 1px dotted #ccc;
}
@@ -917,8 +937,7 @@ div.result_place_hold {
}
#myopac_tabs, #adv_search_parent, #fines_payments_wrapper {
- background: #929292;
- border-top:1px solid #8b8b8b;
+ background: #007a54;
padding-top:5px;
margin-bottom:20px;
}
@@ -993,7 +1012,7 @@ div.facet_sidebar {
overflow:hidden;
background:url('/images/facet_box_bg.png') no-repeat;
font-weight:bold;
- color:#074079;
+ color:#007a54;
padding-top:4px;
}
@@ -1055,11 +1074,11 @@ div.facet_sidebar {
}
#footer-wrap {
- background: linear-gradient(lightGreen, #252525);
- background: -moz-linear-gradient(lightGreen, #252525);
- background: -o-linear-gradient(lightGreen, #252525);
- background: -webkit-linear-gradient(lightGreen, #252525);
- background-color: lightGreen;
+ background: linear-gradient(#007a54, #00593d);
+ background: -moz-linear-gradient(#007a54, #00593d);
+ background: -o-linear-gradient(#007a54, #00593d);
+ background: -webkit-linear-gradient(#007a54, #00593d);
+ background-color: #00593d;
}
#footer {
@@ -1070,7 +1089,13 @@ div.facet_sidebar {
}
#footer a {
- color: black;
+ color: white;
+ text-decoration: none;
+ text-shadow: 0 0 0.2em #00593d, 0 0 0.2em #00593d;
+}
+
+#copyright_text, #footer_logo {
+ color: white;
}
.color_4 {
@@ -1097,7 +1122,7 @@ div.facet_sidebar {
.row-remover { position: relative; top: 1px; vertical-align: middle; }
.subtle-button {
background-color: #ffffff;
- color: #003399; text-decoration: none;
+ color: #00593d; text-decoration: none;
font-size: 12px;
padding: 0; border: 0; margin: 0;
vertical-align: middle;
@@ -1163,9 +1188,10 @@ a.dash-link:hover { text-decoration: underline !important; }
.opac-button, .results_header_btns, #simple-detail-view-links {
color: white;
font-weight: bold;
- -moz-border-radius: 5%;
- border-radius: 5%;
- background: #1784c7;
+ text-decoration: none;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ background: #69A088;
}
.results_header_btns a, #simple-detail-view-links a {
@@ -1177,7 +1203,7 @@ a.dash-link:hover { text-decoration: underline !important; }
}
a.opac-button:hover, .results_header_btns a:hover, #simple-detail-view-links a:hover {
- background: #359ee0;
+ background: #00593d;
text-decoration: none;
}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/parts/homesearch.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/topnav_logo.tt2 | 4 +-
Open-ILS/web/css/skin/default/opac/semiauto.css | 2 +-
Open-ILS/web/css/skin/default/opac/style.css | 96 +++++++++++++--------
4 files changed, 65 insertions(+), 39 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list