details: http://www.bx.psu.edu/hg/galaxy/rev/08e1f40f2b93 changeset: 3248:08e1f40f2b93 user: Kanwei Li kanwei@gmail.com date: Fri Jan 15 17:29:19 2010 -0500 description: Use Lucida Grande for better unicode support, clean up some css
diffstat:
static/june_2007_style/base.css.tmpl | 4 ++-- static/june_2007_style/blue/base.css | 4 ++-- static/june_2007_style/blue/history.css | 2 +- static/june_2007_style/blue/panel_layout.css | 9 ++------- static/june_2007_style/history.css.tmpl | 1 + static/june_2007_style/panel_layout.css.tmpl | 13 ++++--------- templates/root/history_common.mako | 2 +- 7 files changed, 13 insertions(+), 22 deletions(-)
diffs (134 lines):
diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 static/june_2007_style/base.css.tmpl --- a/static/june_2007_style/base.css.tmpl Fri Jan 15 17:12:50 2010 -0500 +++ b/static/june_2007_style/base.css.tmpl Fri Jan 15 17:29:19 2010 -0500 @@ -1,5 +1,5 @@ -## Font settings from YUI + verdana -body{font:13px/1.231 verdana,arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% verdana,arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} +## Lucida Grande for proper mac unicode characters, verdana/arial stack for others +body{font:13px/1.231 "Lucida Grande",verdana,arial,helvetica,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% "Lucida Grande",verdana,arial,helvetica,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} body{font-size:75%;}
## Mixins diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 static/june_2007_style/blue/base.css --- a/static/june_2007_style/blue/base.css Fri Jan 15 17:12:50 2010 -0500 +++ b/static/june_2007_style/blue/base.css Fri Jan 15 17:29:19 2010 -0500 @@ -1,5 +1,5 @@ -body{font:13px/1.231 verdana,arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} -select,input,button,textarea,button{font:99% verdana,arial,helvetica,clean,sans-serif;} +body{font:13px/1.231 "Lucida Grande",verdana,arial,helvetica,sans-serif;*font-size:small;*font:x-small;} +select,input,button,textarea,button{font:99% "Lucida Grande",verdana,arial,helvetica,sans-serif;} table{font-size:inherit;font:100%;} pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} body{font-size:75%;} diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 static/june_2007_style/blue/history.css --- a/static/june_2007_style/blue/history.css Fri Jan 15 17:12:50 2010 -0500 +++ b/static/june_2007_style/blue/history.css Fri Jan 15 17:29:19 2010 -0500 @@ -3,7 +3,7 @@ div.historyLinks{padding:5px;margin:5px 0 5px 0;} div.historyItem{margin:5px -5px 5px 0px;padding:5px 11px 5px 5px;border:solid #888888 1px;border-left:solid #888888 5px;border-right:none;background:#EEEEEE;} div.historyItem .state-icon{display:inline-block;vertical-align:middle;width:16px;height:16px;background-position:0 1px;background-repeat:no-repeat;} -div.historyItem .historyItemTitle{line-height:16px;} +div.historyItem .historyItemTitle{font-weight:bold;line-height:16px;} div.historyItem div.historyItem{margin-right:-11px;} div.historyItem-ok{border-color:#66AA66;background:#CCFFCC;} div.historyItem-ok .state-icon{display:none;} diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 static/june_2007_style/blue/panel_layout.css --- a/static/june_2007_style/blue/panel_layout.css Fri Jan 15 17:12:50 2010 -0500 +++ b/static/june_2007_style/blue/panel_layout.css Fri Jan 15 17:29:19 2010 -0500 @@ -1,10 +1,5 @@ -body{font:13px/1.231 verdana,arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} -select,input,button,textarea,button{font:99% verdana,arial,helvetica,clean,sans-serif;} -table{font-size:inherit;font:100%;} -pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} -body{font-size:75%;} body,html{overflow:hidden;margin:0;padding:0;width:100%;height:100%;} -body{font:75% verdana, "Bitstream Vera Sans", geneva, arial, helvetica, helve, sans-serif;background:#eee;} +body{font:75% "Lucida Grande",verdana,arial,helvetica,sans-serif;background:#eee;} .unselectable{user-select:none;-moz-user-select:none;-webkit-user-select:none;} #background{position:absolute;background:#eee;z-index:-1;top:0;left:0;margin:0;padding:0;width:100%;height:100%;} #messagebox{position:absolute;top:33px;left:0;width:100%;height:24px !important;overflow:hidden;border-bottom:solid #999 1px;font-size:90%;} @@ -37,7 +32,7 @@ .panel-warning-message{background-image:url(warn_small.png);background-color:#FFFFCC;} .panel-done-message{background-image:url(done_small.png);background-color:#CCFFCC;} .panel-info-message{background-image:url(info_small.png);background-color:#CCCCFF;} -#masthead{position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;background:#2C3143;color:#fff;border-bottom:solid #444 1px;z-index:15000;padding:0;} +#masthead{font-family: verdana;arial;sans-serif;position:absolute;top:0;left:0;width:100%;min-width:900px;height:32px;background:#2C3143;color:#fff;border-bottom:solid #444 1px;z-index:15000;padding:0;} #masthead a{color:#eeeeee;text-decoration:none;} #masthead .title{padding:3px 10px;font-size:175%;font-weight:bold;} #masthead a:hover{text-decoration:underline;} diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 static/june_2007_style/history.css.tmpl --- a/static/june_2007_style/history.css.tmpl Fri Jan 15 17:12:50 2010 -0500 +++ b/static/june_2007_style/history.css.tmpl Fri Jan 15 17:29:19 2010 -0500 @@ -36,6 +36,7 @@ background-repeat: no-repeat; } .historyItemTitle { + font-weight: bold; line-height: 16px; } } diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 static/june_2007_style/panel_layout.css.tmpl --- a/static/june_2007_style/panel_layout.css.tmpl Fri Jan 15 17:12:50 2010 -0500 +++ b/static/june_2007_style/panel_layout.css.tmpl Fri Jan 15 17:29:19 2010 -0500 @@ -1,8 +1,3 @@ -## Font settings from YUI + verdana -body{font:13px/1.231 verdana,arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% verdana,arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;} -body{font-size:75%;} - - body, html { overflow: hidden; margin: 0; @@ -12,7 +7,7 @@ }
body { - font: 75% verdana, "Bitstream Vera Sans", geneva, arial, helvetica, helve, sans-serif; + font: 75% "Lucida Grande",verdana,arial,helvetica,sans-serif; background: ${layout_bg}; }
@@ -144,13 +139,12 @@ display: inline-block; cursor: pointer; margin: -1px; padding: 1px; - margin-top: -0.2em; - border: solid #999 1px; padding-right: 0.5em; padding-left: 0.5em; -moz-border-radius: 0.5em; -webkit-border-radius: 0.5em; border-radius: 0.5em; + background: #bbb; }
.panel-header-button.popup { @@ -160,7 +154,7 @@
.panel-header-button:hover { color: black; - background-color: #ccc; + background-color: #aaaaaa; }
.panel-header-button:active { @@ -235,6 +229,7 @@ ## Masthead
#masthead { + font-family: verdana;arial;sans-serif; position:absolute; top:0; left:0; diff -r 4e7c1fe8fab8 -r 08e1f40f2b93 templates/root/history_common.mako --- a/templates/root/history_common.mako Fri Jan 15 17:12:50 2010 -0500 +++ b/templates/root/history_common.mako Fri Jan 15 17:29:19 2010 -0500 @@ -43,7 +43,7 @@ %endif </div> <span class="state-icon"></span> - <span class="historyItemTitle"><b>${hid}: ${data.display_name()}</b></span> + <span class="historyItemTitle">${hid}: ${data.display_name()}</span> </div>
## Body for history items, extra info and actions, data "peek"