From 5ab9f4c4e727449f547f170784179ac65ed09cef Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sun, 29 Jul 2012 00:31:14 -0400 Subject: [PATCH] TPAC CSS: catch new colours added to master recently A few new colours were added to the CSS with recent features; roll them into the CSS templates for good measure. Signed-off-by: Dan Scott Signed-off-by: Thomas Berezansky --- Open-ILS/src/templates/opac/css/style.css.tt2 | 54 ++++++++++++------------ Open-ILS/src/templates/opac/parts/css/colors.tt2 | 3 ++ 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index 178435f775..5ed8ccb4b6 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -42,7 +42,7 @@ a { /* #search-wrapper select { - border:0px solid black; + border:0px solid [% css_colors.border_dark %]; filter:alpha(opacity=0); -moz-opacity:0; -khtml-opacity:0; @@ -512,7 +512,7 @@ div.format_icon { } #paginate-homebanner a.selected { - border: 2px solid black; + border: 2px solid [% css_colors.border_dark %]; margin-top:0px; margin-left:0px; margin-right:0px; @@ -525,7 +525,7 @@ div.format_icon { #content-wrapper { background: [% css_colors.background %]; min-height: 260px; - border-bottom: 1px solid black; + border-bottom: 1px solid [% css_colors.border_dark %]; } .content-wrapper-record-page { top: -15px; position: relative; } @@ -743,7 +743,7 @@ div.result_place_hold { } #myopac_holds_main_table td { - border: 1px solid black; + border: 1px solid [% css_colors.border_dark %]; } @@ -1187,7 +1187,7 @@ a.opac-button { } .rdetail-mfhd-bottom { - border-bottom: thin solid black; + border-bottom: thin solid [% css_colors.border_dark %]; width: 100%; } @@ -1365,9 +1365,9 @@ a.preflib_change { } #ac_tab_wrapper { width : 100%; } -.ac_tab { float: left; padding-right: 10px; font-size: 110%; padding: 5px; border: 1px solid #417860; } -.ac_tab_selected { background-color: #417860; } -.ac_tab_selected a { color: #FFF; } +.ac_tab { float: left; padding-right: 10px; font-size: 110%; padding: 5px; border: 1px solid [% css_colors.primary_offset %]; } +.ac_tab_selected { background-color: [% css_colors.primary_offset %]; } +.ac_tab_selected a { color: [% css_colors.text_invert %]; } #ac_content { clear: both; width: 100%; margin-top: 10px; } /* Popmenu styles used for making css menus. */ @@ -1385,14 +1385,14 @@ a.preflib_change { .popmenu li ul { display: none; width: 10em; /* Width to help Opera out */ - background-color: #00593d; + background-color: [% css_colors.primary %]; } .popmenu li:hover ul { display: block; position: absolute; margin: 0; padding: 0; - border-color: black; + border-color: [% css_colors.border_dark %]; border-width: 1px; border-style: solid; } @@ -1400,44 +1400,44 @@ a.preflib_change { float: none; } .popmenu li:hover li a { - background-color: #00593d; - color: #f0e0e0; + background-color: [% css_colors.primary %]; + color: [% css_colors.accent_ultratint %]; } .popmenu li li a:hover { - background-color: #f0e0e0; - color: #00593d; + background-color: [% css_colors.accent_ultratint %]; + color: [% css_colors.primary %]; } /* Styles for the temporary list entry. */ .popmenu li:hover li[class~="temporary"] a { - background-color: #00593d; - color: #f0e0e0; + background-color: [% css_colors.primary %]; + color: [% css_colors.accent_ultratint %]; } .popmenu li li[class~="temporary"] a:hover { - background-color: #f0e0e0; - color: #00593d; + background-color: [% css_colors.accent_ultratint %]; + color: [% css_colors.primary %]; } /* Styles for the default list entry. */ .popmenu li:hover li[class~="default"] a { - background-color: #00593d; - color: #f0e0e0; + background-color: [% css_colors.primary %]; + color: [% css_colors.accent_ultratint %]; } .popmenu li li[class~="default"] a:hover { - background-color: #f0e0e0; - color: #00593d; + background-color: [% css_colors.accent_ultratint %]; + color: [% css_colors.primary %]; } /* Styles for the new list entry. */ .popmenu li:hover li[class~="new"] a { - background-color: #00593d; - color: #f0e0e0; + background-color: [% css_colors.primary %]; + color: [% css_colors.accent_ultratint %]; } .popmenu li li[class~="new"] a:hover { - background-color: #f0e0e0; - color: #00593d; + background-color: [% css_colors.accent_ultratint %]; + color: [% css_colors.primary %]; } /* Style to add a divider on the menu. */ .popmenu li li[class~="divider"] { border-bottom-width: 1px; - border-bottom-color: black; + border-bottom-color: [% css_colors.border_dark %]; border-bottom-style: solid; } diff --git a/Open-ILS/src/templates/opac/parts/css/colors.tt2 b/Open-ILS/src/templates/opac/parts/css/colors.tt2 index 5babc0424f..f8a1749785 100644 --- a/Open-ILS/src/templates/opac/parts/css/colors.tt2 +++ b/Open-ILS/src/templates/opac/parts/css/colors.tt2 @@ -13,17 +13,20 @@ text_match = "#c00", # deep red primary = "#00593d", # dark green primary_fade = "#007a54", # medium green + primary_offset = "#417860", # light_green control = "#69A088", # lighter green accent_light = "#ccc", # grey (light) accent_lighter = "#ddd", # grey (lighter) accent_lighter2 = "#d8d8d8", # grey (lighter again) accent_lightest = "#eee", # grey (lightest) accent_ultralight = "#f0f0f0", # ivory + accent_ultratint = "#f0e0e0", # ivory-pink accent_medium = "#999", # gun metal grey (medium) accent_mediumdark = "#888", # gun metal grey (medium dark) accent_dark = "#666", # gun metal grey (dark) accent_darker = "#333", # gun metal grey (darker) border_standard = "#e9ebf3", # light grey-blue + border_dark = "black", # black border_alert = "red", # red button_text = "#fbf9f9", # off-white button_text_shadow = "#555555", # medium grey -- 2.11.0