From 93be12f729cd6b21b40294daebe2272105687bd1 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Mon, 3 Oct 2011 21:58:17 -0400 Subject: [PATCH] TPAC: Replace dashboard images with CSS Also gets rid of a number of tables and a bunch of CSS definitions with hard-coded widths that will cause trouble when longer translated terms get dropped into place. Signed-off-by: Dan Scott Signed-off-by: Bill Erickson --- Open-ILS/src/templates/opac/parts/topnav.tt2 | 96 +++++++-------------------- Open-ILS/web/css/skin/default/opac/style.css | 63 ++++++++---------- Open-ILS/web/images/dash-corner-left1.png | Bin 215 -> 0 bytes Open-ILS/web/images/dash-corner-left2.png | Bin 276 -> 0 bytes Open-ILS/web/images/dash-corner-mid1.png | Bin 121 -> 0 bytes Open-ILS/web/images/dash-corner-mid2.png | Bin 127 -> 0 bytes Open-ILS/web/images/dash-corner-right1.png | Bin 218 -> 0 bytes Open-ILS/web/images/dash-corner-right2.png | Bin 289 -> 0 bytes Open-ILS/web/images/dash-divider.jpg | Bin 515 -> 0 bytes 9 files changed, 50 insertions(+), 109 deletions(-) delete mode 100644 Open-ILS/web/images/dash-corner-left1.png delete mode 100644 Open-ILS/web/images/dash-corner-left2.png delete mode 100644 Open-ILS/web/images/dash-corner-mid1.png delete mode 100644 Open-ILS/web/images/dash-corner-mid2.png delete mode 100644 Open-ILS/web/images/dash-corner-right1.png delete mode 100644 Open-ILS/web/images/dash-corner-right2.png delete mode 100644 Open-ILS/web/images/dash-divider.jpg diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2 index bdb9d54d29..db1f2a4127 100644 --- a/Open-ILS/src/templates/opac/parts/topnav.tt2 +++ b/Open-ILS/src/templates/opac/parts/topnav.tt2 @@ -14,81 +14,33 @@ [% ELSE %] [% END %] diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css index e90a0ef82a..9d18010f29 100644 --- a/Open-ILS/web/css/skin/default/opac/style.css +++ b/Open-ILS/web/css/skin/default/opac/style.css @@ -79,21 +79,39 @@ div.select-wrapper:hover { } #dash_wrapper { - width:500px; - position:relative; - top:-26px; + position: relative; + top: -2em; +} + +#dash_wrapper div { + position: relative; + vertical-align: middle; + background: #252525; + border-radius: 5px; + height: 3em; + padding: 0em 1em 0em 1em; +} + +span.dash_divider { + margin: 0em 1em 0em 1em; + position: relative; + top: 10px; + color: black; } #dashboard { clear:both; float:right; - width:384px; + margin-top: 1em; + background: #252525; + border-radius: 5px; + height: 3em; } -#dashboard span { - font-weight:bold; - position:relative; - left:-1px; +#dashboard span.dash-align a { + font-weight: bold; + position: relative; + top: 10px; } #dash_user { @@ -103,35 +121,6 @@ div.select-wrapper:hover { top: 10px; } -#dash_corner_mid1a { - vertical-align: top; - background: url('/images/dash-corner-mid1.png') repeat-x; - padding-left: 8px; -} -#dash_corner_mid1b { - background: url('/images/dash-corner-mid1.png') repeat-x; - padding: 0px 8px 0px 10px; -} -#dash_corner_mid1b img { position: relative; top: -1px; } -#dash_corner_mid1c { - background: url('/images/dash-corner-mid1.png') repeat-x; - vertical-align: top; -} -#dash_corner_mid2a { - vertical-align: top; - width: 372px; - background: url('/images/dash-corner-mid2.png') repeat-x; -} -.dash-pos-out { position: relative; left: 3px; } -.dash-pos-holds { position: relative; left: 100px; } -.dash-align-out { text-align: right; width: 86px; } -.dash-align-holds { text-align: right; width: 62px; } -.dash-pos-pickup { position: relative; left: 170px; } -.dash-align-pickup { text-align: right; width: 111px; } -.dash-pos-fines { position: relative; left: 284px; } -.dash-align-fines { text-align: right; width: 76px; } -.pos-rel-top4 { position: relative; top: 4px; } -#dash_number_row { position: relative; top: 6px; } #logout_link { left: 1px; } #dash_checked { color: #ffcc33; } diff --git a/Open-ILS/web/images/dash-corner-left1.png b/Open-ILS/web/images/dash-corner-left1.png deleted file mode 100644 index 9559e8bf307b23cf971322dae98640e0a17555a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8S0U}qe@Gb>Xk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XDm`5sLn>}1r6eRIloc2MKHR`IqhZEeMs5aAgU6E+B&GtP zjL?4|=<$8@e}Db|yrjuLem^|io~Q7aKay$ArTO;t|9paiCW&(BOjP~X9AaPf<%N#E z{(Dz5Gc!dsHMKZ573G@^Go(9qI^?*iBug$-+t85Fz`)G#b&j-kbDYu!pd%POUHx3v IIVCg!021y^!2kdN diff --git a/Open-ILS/web/images/dash-corner-left2.png b/Open-ILS/web/images/dash-corner-left2.png deleted file mode 100644 index 5bc8112c90a0eeac46471a8dad61230f423fef50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^Y(Ol>0V4T5^Y;NM$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G+dN$yLn>}1r8qFS)z{Z^r=>lMa&vRb7Mqda;NYM+A@BFc z$Lyc)@2{715bCkBv)kt2cl-Q&`2+1a_0HBvzB;HTf;^O@O97^eOB{$5_+ zjPuz4|No5>CLiE(Q)TmGk_eo?(Ualm|NBSOK7PNv-2bk_FZoR@7AI|Le|?#`WQmHk zw)Se)O)MI!f2zN{xEL81cdt7qCuh-tl4FNEQdFb`ikS_?JI;2@S+P*9VUn(~LjxlN Y3!Aym39p*1Kp!x8y85}Sb4q9e0G=&tHUIzs diff --git a/Open-ILS/web/images/dash-corner-mid1.png b/Open-ILS/web/images/dash-corner-mid1.png deleted file mode 100644 index 546b8a8038dadc106778fcc2f272379e6e4a1471..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!3HEfN&F!Nd?8lzt10GU}>Jqz-XGL@R3{L07Fa@vpIj^ Qa*!nqp00i_>zopr0J;z$i~s-t diff --git a/Open-ILS/web/images/dash-corner-mid2.png b/Open-ILS/web/images/dash-corner-mid2.png deleted file mode 100644 index 15af112586420f919eddb32db0cbf7fab06cdb9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{M!3HGXPAxeOq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c6)AeUIEGZ*O5)(-`*;4!&(G;>YHSJ;0Zc4cW;7nrZ(v|% YI3vZT-FhiwJy0=&r>mdKI;Vst05xtUC;$Ke diff --git a/Open-ILS/web/images/dash-corner-right1.png b/Open-ILS/web/images/dash-corner-right1.png deleted file mode 100644 index 061afc92dbab11011e61e1503b1d9bd044df3d15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8S0U}qe@Gb>Xk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XYCK&WLn>}1l@u5MKHtDr_V(7%Lq{59H$0w{a7^`}ftI0` z;Rd1qK+qQY=>GotaEDJXg#O#r{J6lngTe~DWM4f@mE{R diff --git a/Open-ILS/web/images/dash-corner-right2.png b/Open-ILS/web/images/dash-corner-right2.png deleted file mode 100644 index 8663e0c69d29ada8021c2c9695a9b1d4631dfb87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)3TM@8->$ zPZ^+q>C2Zdd_R8t@ML6UJRA@ZPyrNU1WWw?|DWN{pFa%WzI|i<`}c3Nx3{+)NRo*G z3Hz6K&V#SaE8qJGU2gptgJCMPs#NdzsM$|W464yW!hQy~& zpSpq6Ula*o+M00c)TzBd=5H3D*0;a}ckTWA_p>fsxUdH(_!XoBlpK{o$qA$ZDhOi# n14(d$Q~>cGC=E_O009O7AUId*$yuo600000NkvXXu0mjf_U3iV diff --git a/Open-ILS/web/images/dash-divider.jpg b/Open-ILS/web/images/dash-divider.jpg deleted file mode 100644 index 19dda7d23bec7c1ef0b889cc8aeae8aa456e766d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmaKoJx&8L5QX2&tdkW2$tL0eG`YqK2?fCsC}F86l7@ncCUiN$UVn-r_EY}T