Merge pull request #4948 from dannon/fix_trackster_styles

Fix trackster styles bleeding into the app (the slightly offcenter upload .icon buttons)

client/galaxy/scripts/viz/circster.js

@@ -8,8 +8,6 @@ import "libs/farbtastic";
 /**
  * Utility class for working with SVG.
  */
-// load css
-mod_utils.cssLoadFile("static/style/circster.css");
 
 var SVGUtils = Backbone.Model.extend({
     /**
@@ -1099,6 +1097,8 @@ var CircsterChromInteractionsTrackView = CircsterTrackView.extend({
 // circster app loader
 var Circster = Backbone.View.extend({
     initialize: function() {
+        // load css
+        mod_utils.cssLoadFile("static/style/circster.css");
         // -- Configure visualization --
         var genome = new visualization.Genome(galaxy_config.app.genome);
 

client/galaxy/scripts/viz/trackster.js

@@ -24,11 +24,6 @@ import "libs/farbtastic";
 import "libs/jquery/jquery.form";
 import "libs/jquery/jquery.rating";
 import "ui/editable-text";
-mod_utils.cssLoadFile("static/style/jquery.rating.css");
-mod_utils.cssLoadFile("static/style/autocomplete_tagging.css");
-mod_utils.cssLoadFile("static/style/jquery-ui/smoothness/jquery-ui.css");
-mod_utils.cssLoadFile("static/style/library.css");
-mod_utils.cssLoadFile("static/style/trackster.css");
 /**
  * Base Object/Model for inhertiance.
  */
@@ -44,6 +39,11 @@ Base.extend = Backbone.Model.extend;
  */
 var TracksterUI = Base.extend({
     initialize: function(baseURL) {
+        mod_utils.cssLoadFile("static/style/jquery.rating.css");
+        mod_utils.cssLoadFile("static/style/autocomplete_tagging.css");
+        mod_utils.cssLoadFile("static/style/jquery-ui/smoothness/jquery-ui.css");
+        mod_utils.cssLoadFile("static/style/library.css");
+        mod_utils.cssLoadFile("static/style/trackster.css");
         this.baseURL = baseURL;
     },
 

client/galaxy/style/less/trackster.less

@@ -508,6 +508,7 @@ input {
     float:right;
 }
 
+/*
 .icon {
     display: inline-block;
     width: 16px;
@@ -521,6 +522,7 @@ input {
         background: url('../images/fugue/arrow-transition-bw.png') no-repeat 0px 0px;
     }
 }
+*/
 
 .feature-popup {
     position: absolute;