# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kanwei Li <kanwei@gmail.com> # Date 1278095180 14400 # Node ID b841989e2662b204fcb4c73931ab3a2b08ef35a0 # Parent b68cbc002e8aabb1750d1c82607430124065736f Move trackster.css to common stylesheet folder, fix small error in color --- a/static/june_2007_style/make_style.py +++ b/static/june_2007_style/make_style.py @@ -20,13 +20,14 @@ def run( cmd ): templates = [ ( "base.css.tmpl", "base.css" ), ( "panel_layout.css.tmpl", "panel_layout.css" ), - ( "masthead.css.tmpl", "masthead.css"), - ( "library.css.tmpl", "library.css"), + ( "masthead.css.tmpl", "masthead.css" ), + ( "library.css.tmpl", "library.css" ), ( "history.css.tmpl", "history.css" ), ( "tool_menu.css.tmpl", "tool_menu.css" ), ( "iphone.css.tmpl", "iphone.css" ), ( "reset.css.tmpl", "reset.css" ), - ( "autocomplete_tagging.css.tmpl", "autocomplete_tagging.css") ] + ( "autocomplete_tagging.css.tmpl", "autocomplete_tagging.css" ), + ( "trackster.css.tmpl", "trackster.css" ) ] # TODO: Are these images still being used? If not, clean this code up! images = [ --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -71,8 +71,7 @@ <%def name="stylesheets()"> ${parent.stylesheets()} - ${h.css( "autocomplete_tagging", "embed_item" )} - <link rel="stylesheet" type="text/css" href="${h.url_for('/static/trackster.css')}" /> + ${h.css( "autocomplete_tagging", "embed_item", "trackster" )} <style type="text/css"> .page-body { Binary file static/june_2007_style/blue/fugue.png has changed Binary file static/june_2007_style/blue/history-buttons.png has changed --- /dev/null +++ b/static/june_2007_style/trackster.css @@ -0,0 +1,125 @@ +.viewport-container { + overflow-x: hidden; + overflow-y: auto; +} + +/*canvas{ + border-left: 1px solid green; + border-right: 1px solid red; } /* debugging */ +.nav { + padding: 0 0; + color:#333;font-weight:bold; +} + +.nav-controls { + text-align: center; + background:#cccccc; + background-image:url(style/panel_header_bg.png); + background-position:top center; + background-repeat:repeat-x; + padding: 2px 0; +} +.nav-controls input { + margin: 0 5px; +} +.nav-controls a { + padding: 0 0.4em; +} + +.overview { + width: 100%; + margin: 0px; + color: white; + margin-top: -6px; + margin-bottom: -4px; +} + +.overview-viewport { + position: relative; + height: 14px; +/* border-top: solid #666 1px;*/ +/* border-bottom: solid #aaa 1px;*/ + background: white; + border-top: solid gray 1px; + border-bottom: solid gray 1px; + margin: 5px 0; +} +.overview-box { + position: absolute; + margin-top: 0px; + height: 14px; + background: #ddd url(images/visualization/draggable_horizontal.png) center center no-repeat; + /*border-style: outset;*/ +} + +.viewport { +/* overflow-x: hidden;*/ + background-color: #fff; +/* overflow: scroll;*/ +/* border-bottom: 2px solid black;*/ +} + +.viewport-canvas { + width: 100%; + height: 100px; +} + +.yaxislabel { + color: #777; +} +/* Line track needs borders to show range */ +.line-track .track-content { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; +} + +.track { + /* border-top: solid #DDDDDD 1px; */ + /* border-bottom: solid #DDDDDD 1px; */ + background: white; +} + +.track-header { + text-align: center; + padding: 4px; + color: #666; +} + +.track-content { + overflow: hidden; + text-align: center; +} + +.track.error { + background-color: #ECB4AF; +} +.track.nodata { + background-color: #ddd; +} + +.loading { + min-height: 100px; +} + +.label-track { + /* font-weight: bold; */ + /* font-size: 10px; */ +} +.label-track .label { + border-left: solid #999 1px; + padding: 1px; + display: inline-block; +} +.right-float { + float: right; + margin-left: 5px; +} + +.top-labeltrack { + border-bottom: solid #999 1px; +} + +.nav-labeltrack { + border-top: solid #999 1px; + border-bottom: solid #999 1px; +} --- a/static/june_2007_style/blue/base.css +++ b/static/june_2007_style/blue/base.css @@ -73,7 +73,7 @@ span.toolParameterExpandableCollapsable{ ul.toolParameterExpandableCollapsable{list-style:none;} ul.manage-table-actions{float:right;margin-top:-2.5em;} ul.manage-table-actions li{display:block;float:left;margin-left:0.5em;} -.state-color-new{border-color:#A86030;background:FFB030;} +.state-color-new{border-color:#A86030;background:#FFB030;} .state-color-upload{border-color:#6666AA;background:#CCCCFF;} .state-color-waiting{border-color:#A86030;background:#E8C060;} .state-color-queued{border-color:#888888;background:#EEEEEE;} --- a/templates/tracks/browser.mako +++ b/templates/tracks/browser.mako @@ -12,8 +12,8 @@ <%def name="stylesheets()"> ${parent.stylesheets()} -${h.css( "history", "autocomplete_tagging" )} -<link rel="stylesheet" type="text/css" href="${h.url_for('/static/trackster.css')}" /> +${h.css( "history", "autocomplete_tagging", "trackster" )} + <style type="text/css"> #center { overflow: auto; --- /dev/null +++ b/static/june_2007_style/trackster.css.tmpl @@ -0,0 +1,125 @@ +.viewport-container { + overflow-x: hidden; + overflow-y: auto; +} + +/*canvas{ + border-left: 1px solid green; + border-right: 1px solid red; } /* debugging */ +.nav { + padding: 0 0; + color:#333;font-weight:bold; +} + +.nav-controls { + text-align: center; + background:#cccccc; + background-image:url(panel_header_bg.png); + background-position:top center; + background-repeat:repeat-x; + padding: 2px 0; +} +.nav-controls input { + margin: 0 5px; +} +.nav-controls a { + padding: 0 0.4em; +} + +.overview { + width: 100%; + margin: 0px; + color: white; + margin-top: -6px; + margin-bottom: -4px; +} + +.overview-viewport { + position: relative; + height: 14px; +/* border-top: solid #666 1px;*/ +/* border-bottom: solid #aaa 1px;*/ + background: white; + border-top: solid gray 1px; + border-bottom: solid gray 1px; + margin: 5px 0; +} +.overview-box { + position: absolute; + margin-top: 0px; + height: 14px; + background: #ddd url(../images/visualization/draggable_horizontal.png) center center no-repeat; + /*border-style: outset;*/ +} + +.viewport { +/* overflow-x: hidden;*/ + background-color: #fff; +/* overflow: scroll;*/ +/* border-bottom: 2px solid black;*/ +} + +.viewport-canvas { + width: 100%; + height: 100px; +} + +.yaxislabel { + color: #777; +} +/* Line track needs borders to show range */ +.line-track .track-content { + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; +} + +.track { + /* border-top: solid #DDDDDD 1px; */ + /* border-bottom: solid #DDDDDD 1px; */ + background: white; +} + +.track-header { + text-align: center; + padding: 4px; + color: #666; +} + +.track-content { + overflow: hidden; + text-align: center; +} + +.track.error { + background-color: #ECB4AF; +} +.track.nodata { + background-color: #ddd; +} + +.loading { + min-height: 100px; +} + +.label-track { + /* font-weight: bold; */ + /* font-size: 10px; */ +} +.label-track .label { + border-left: solid #999 1px; + padding: 1px; + display: inline-block; +} +.right-float { + float: right; + margin-left: 5px; +} + +.top-labeltrack { + border-bottom: solid #999 1px; +} + +.nav-labeltrack { + border-top: solid #999 1px; + border-bottom: solid #999 1px; +} Binary file static/june_2007_style/blue/history-states.png has changed --- a/static/trackster.css +++ /dev/null @@ -1,125 +0,0 @@ -.viewport-container { - overflow-x: hidden; - overflow-y: auto; -} - -/*canvas{ - border-left: 1px solid green; - border-right: 1px solid red; } /* debugging */ -.nav { - padding: 0 0; - color:#333;font-weight:bold; -} - -.nav-controls { - text-align: center; - background:#cccccc; - background-image:url(style/panel_header_bg.png); - background-position:top center; - background-repeat:repeat-x; - padding: 2px 0; -} -.nav-controls input { - margin: 0 5px; -} -.nav-controls a { - padding: 0 0.4em; -} - -.overview { - width: 100%; - margin: 0px; - color: white; - margin-top: -6px; - margin-bottom: -4px; -} - -.overview-viewport { - position: relative; - height: 14px; -/* border-top: solid #666 1px;*/ -/* border-bottom: solid #aaa 1px;*/ - background: white; - border-top: solid gray 1px; - border-bottom: solid gray 1px; - margin: 5px 0; -} -.overview-box { - position: absolute; - margin-top: 0px; - height: 14px; - background: #ddd url(images/visualization/draggable_horizontal.png) center center no-repeat; - /*border-style: outset;*/ -} - -.viewport { -/* overflow-x: hidden;*/ - background-color: #fff; -/* overflow: scroll;*/ -/* border-bottom: 2px solid black;*/ -} - -.viewport-canvas { - width: 100%; - height: 100px; -} - -.yaxislabel { - color: #777; -} -/* Line track needs borders to show range */ -.line-track .track-content { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; -} - -.track { - /* border-top: solid #DDDDDD 1px; */ - /* border-bottom: solid #DDDDDD 1px; */ - background: white; -} - -.track-header { - text-align: center; - padding: 4px; - color: #666; -} - -.track-content { - overflow: hidden; - text-align: center; -} - -.track.error { - background-color: #ECB4AF; -} -.track.nodata { - background-color: #ddd; -} - -.loading { - min-height: 100px; -} - -.label-track { - /* font-weight: bold; */ - /* font-size: 10px; */ -} -.label-track .label { - border-left: solid #999 1px; - padding: 1px; - display: inline-block; -} -.right-float { - float: right; - margin-left: 5px; -} - -.top-labeltrack { - border-bottom: solid #999 1px; -} - -.nav-labeltrack { - border-top: solid #999 1px; - border-bottom: solid #999 1px; -} --- a/static/june_2007_style/blue_colors.ini +++ b/static/june_2007_style/blue_colors.ini @@ -35,7 +35,7 @@ footer_title_bg=#023858 footer_title_hatch=#000000 # History - these are actually Job states (used in the reports webapp), but the same styles are used for Tool states in the community webapp history_new_border=#A86030 -history_new_bg=FFB030 +history_new_bg=#FFB030 history_upload_border=#990099 history_upload_bg=#D090D0 history_waiting_border=#A86030