Merge pull request #1086 from jgoecks/trackster-pos-label

Resolve conflicting label CSS class for trackster.

client/galaxy/scripts/viz/trackster/tracks.js

@@ -3249,7 +3249,7 @@ extend(LabelTrack.prototype, Track.prototype, {
             new_div = $("<div/>").addClass('label-container');
         while ( position < view.high ) {
             var screenPosition = Math.floor( ( position - view.low ) / range * width );
-            new_div.append( $("<div/>").addClass('label').text(commatize( position )).css( {
+            new_div.append( $("<div/>").addClass('pos-label').text(commatize( position )).css( {
                 left: screenPosition
             }));
             position += tickDistance;

client/galaxy/style/less/trackster.less

@@ -18,7 +18,7 @@
         /* Used to push nav into title bar: */
         height: 0;
     }
-    
+
     text-align: center;
 }
 
@@ -202,7 +202,7 @@
     padding: 0px 2px;
     text-align: left;
     margin: 2px;
-    
+
     /* Make header opaque when focused on. */
     &:hover {
         background-color: #DDDDDD;
@@ -232,7 +232,7 @@
     overflow: hidden;
 }
 
-.overlay { 
+.overlay {
     position: absolute;
     left: 0;
     top: 0;
@@ -241,7 +241,7 @@
 .track-tile {
     position: absolute;
     background: white;
-    
+
     canvas {
         position: relative;
         z-index: @base-index;
@@ -292,7 +292,7 @@
 }
 
 .label-track {
-    font-size: 10px; 
+    font-size: 10px;
     border: none;
     padding: 0;
     margin: 0;
@@ -300,11 +300,11 @@
     overflow: hidden;
 
     .label-container {
-        position: relative; 
+        position: relative;
         height: 1.3em;
     }
 
-    .label {
+    .pos-label {
         position: absolute;
         border-left: solid #999 1px;
         padding: 1px;
@@ -344,7 +344,7 @@
 .nav-labeltrack {
     border-top: solid #999 1px;
     border-bottom: solid #333 1px;
-}   
+}
 
 // Styles for tools and filters.
 input {
@@ -544,7 +544,7 @@ input {
     top: 0px;
     background-color: #ccf;
     opacity: 0.5;
-    z-index: @overlay-index; 
+    z-index: @overlay-index;
 }
 
 .mouse-pos {
@@ -565,7 +565,7 @@ input {
     height: 12px;
 }
 
-// Highlight for element(s) being dragged. This definition must be after definition of draggable 
+// Highlight for element(s) being dragged. This definition must be after definition of draggable
 // elements (e.g. track, group) in order to take precedence.
 .dragging {
     border: 1px solid blue;

static/style/blue/autocomplete_tagging.css

@@ -1 +1 @@
-.ac_results{padding:0;border:1px solid black;background-color:white;overflow:hidden;z-index:99999}.ac_results ul{width:100%;list-style-position:outside;list-style:none;padding:0;margin:0}.ac_results li{padding:2px 5px;cursor:default;display:block;font-size:12px;line-height:16px;overflow:hidden}.ac_loading{background:white url('indicator.gif') right center no-repeat}.ac_odd{background-color:#fff;margin-left:.3em}.ac_even{margin-left:.3em}.ac_over{background-color:#0a246a;color:white}.ac_header{font-style:normal;color:gray;border-bottom:.1em solid gray}.tag-area{width:100%}.individual-tag-area{cursor:pointer;border:1px dotted transparent}.individual-tag-area:hover{border:1px dotted #999}.active-tag-area{background-color:white}.toggle-link{font-weight:normal;padding:.3em;margin-bottom:1em;width:100%;padding:.2em 0 .2em 0}.tag-button{width:auto;color:#444;text-decoration:none;display:inline-block;cursor:pointer;margin:.2em;border:solid #bbb 1px;padding:.1em .5em .1em .5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;background:#eee}.tag-button img{padding-left:.4em}.tag-button .tag-name:hover{color:black}.add-tag-button{margin-bottom:.3em;vertical-align:middle;padding:.3em}.add-tag-button:hover{cursor:pointer}.tag-input{vertical-align:bottom;border:none;outline:none;resize:none}.delete-tag-img{margin-left:.3em}.active-tag-name{font-weight:bold}
+.ac_results{padding:0;border:1px solid black;background-color:white;overflow:hidden;z-index:99999}.ac_results ul{width:100%;list-style-position:outside;list-style:none;padding:0;margin:0}.ac_results li{padding:2px 5px;cursor:default;display:block;font-size:12px;line-height:16px;overflow:hidden}.ac_loading{background:white url('indicator.gif') right center no-repeat}.ac_odd{background-color:#fff;margin-left:.3em}.ac_even{margin-left:.3em}.ac_over{background-color:#0A246A;color:white}.ac_header{font-style:normal;color:gray;border-bottom:.1em solid gray}.tag-area{width:100%}.individual-tag-area{cursor:pointer;border:1px dotted transparent}.individual-tag-area:hover{border:1px dotted #999999}.active-tag-area{background-color:white}.toggle-link{font-weight:normal;padding:.3em;margin-bottom:1em;width:100%;padding:.2em 0 .2em 0}.tag-button{width:auto;color:#444;text-decoration:none;display:inline-block;cursor:pointer;margin:.2em;border:solid #bbb 1px;padding:.1em .5em .1em .5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;background:#eee}.tag-button img{padding-left:.4em}.tag-button .tag-name:hover{color:black}.add-tag-button{margin-bottom:.3em;vertical-align:middle;padding:.3em}.add-tag-button:hover{cursor:pointer}.tag-input{vertical-align:bottom;border:none;outline:none;resize:none}.delete-tag-img{margin-left:.3em}.active-tag-name{font-weight:bold}

static/style/blue/embed_item.css

@@ -1 +1 @@
-.embedded-item{margin:0 auto;width:90%;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em}.embedded-item .expanded-content{display:none;background-color:white}.embedded-item .item-content{max-height:45em;overflow:auto}.embedded-item>.title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:5px}.embedded-item.placeholder .content{padding:.5em .5em;font-style:italic;text-align:center}.embedded-item p{background:inherit;margin-top:0;margin-bottom:0}.embedded-item table.annotated-item{width:100%;border-collapse:collapse}.embedded-item table.annotated-item td,.embedded-item th{padding:0}.embedded-item table.annotated-item .annotation{padding-left:2em;width:40%}.embedded-item table.annotated-item td.annotation{vertical-align:text-top;padding-top:1em}.embedded-item.display{padding:5px 10px 10px 10px}.embedded-item.history{background-color:#c1c9e5}.embedded-item.dataset{background-color:#cfc}.embedded-item.dataset .item-content{padding:5px}.embedded-item.workflow{background-color:#fbddb3}.embedded-item.workflow .item-content{padding:5px}.embedded-item.visualization{background-color:#bbb}.embedded-item.visualization .item-content{overflow:hidden;height:100%}.embedded-item.visualization .item-content iframe{min-height:320px;margin-bottom:-4px}
+.embedded-item{margin:0 auto;width:90%;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em}.embedded-item .expanded-content{display:none;background-color:white}.embedded-item .item-content{max-height:45em;overflow:auto}.embedded-item>.title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:5px}.embedded-item.placeholder .content{padding:.5em .5em;font-style:italic;text-align:center}.embedded-item p{background:inherit;margin-top:0;margin-bottom:0}.embedded-item table.annotated-item{width:100%;border-collapse:collapse}.embedded-item table.annotated-item td,.embedded-item th{padding:0}.embedded-item table.annotated-item .annotation{padding-left:2em;width:40%}.embedded-item table.annotated-item td.annotation{vertical-align:text-top;padding-top:1em}.embedded-item.display{padding:5px 10px 10px 10px}.embedded-item.history{background-color:#C1C9E5}.embedded-item.dataset{background-color:#CFC}.embedded-item.dataset .item-content{padding:5px}.embedded-item.workflow{background-color:#FBDDB3}.embedded-item.workflow .item-content{padding:5px}.embedded-item.visualization{background-color:#BBBBBB}.embedded-item.visualization .item-content{overflow:hidden;height:100%}.embedded-item.visualization .item-content iframe{min-height:320px;margin-bottom:-4px}

static/style/blue/library.css

@@ -1 +1 @@
-a{text-decoration:underline}label{font-weight:normal}.libraryRow{background-color:#ebd9b2}.datasetHighlighted{background-color:#f9f9f9}.libraryItemDeleted-True{font-style:italic}div.libraryItemBody{padding:4px 4px 2px 4px}li.folderRow,li.datasetRow{border-top:solid 1px #c6bfa8}li.folderRow:hover,li.datasetRow:hover{background-color:#f9f9f9}td.right-center{vertical-align:middle !important;text-align:right}.library-genome-select{max-width:350px}.library-extension-select{max-width:140px}.library_table td{border-top:1px solid #5f6990 !important}.library_table th{border-bottom:2px solid #5f6990 !important}.library_table a{color:#0a143d}.library_table a:hover{color:maroon}.library_style_container{width:95%;margin:auto;margin-top:2em;overflow:auto !important}.library_style_container tr{height:32px}tr.light td{background-color:white;color:black}tr.light:hover td{background-color:#f5e8cc}tr.dark td{background-color:#d6b161;color:white}tr.dark:hover td{background-color:#ebd4a4;color:white}a.dark{color:white}.dataset_table tr{border-bottom:1px solid #5f6990 !important}.dataset_table th{border:none !important}.dataset_table td{border:none !important}th.button_heading{width:2em}.bigdrop.select2-container .select2-results{max-height:300px}.bigdrop .select2-results{max-height:300px}.select2-container-multi{width:100%}.roles-selection{width:66%}#library_toolbar{margin-bottom:.5em}#library_toolbar span{margin-right:.2em}#library_toolbar .toolbar-item{margin-left:1em}img.expanderIcon{padding-right:4px}input.datasetCheckbox,li,ul{padding:0;margin:0}.rowTitle{padding:2px}ul{list-style:none}.libraryTitle th{text-align:left}pre.peek{background:white;color:black;overflow:auto}pre.peek th{color:white;background:#ebd9b2}.help-button{float:right}span.expandLink{padding-left:12px;display:inline-block;vertical-align:middle;background:url(../images/silk/resultset_next.png) no-repeat}.folderRow.expanded span.expandLink{background:url(../images/silk/resultset_bottom.png) no-repeat}.folderRow span.rowIcon{float:left;margin-right:5px;width:16px;height:16px;display:inline-block;vertical-align:middle;background:url(../images/silk/folder.png)}.libraryItem-error{margin-right:2px;padding:0 2px 0 2px;border:1px solid #dd1b15;background:#f9c7c5}.libraryItem-queued{margin-right:2px;padding:0 2px 0 2px;border:1px solid #bfbfbf;background:#eee}.libraryItem-running{margin-right:2px;padding:0 2px 0 2px;border:1px solid #aa6;background:#ffc}.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #119ac2;background:#a8e5f7}.pagination-sm{height:15px}.library-paginator{margin-left:2em}
+a{text-decoration:underline}label{font-weight:normal}.libraryRow{background-color:#ebd9b2}.datasetHighlighted{background-color:#f9f9f9}.libraryItemDeleted-True{font-style:italic}div.libraryItemBody{padding:4px 4px 2px 4px}li.folderRow,li.datasetRow{border-top:solid 1px #c6bfa8}li.folderRow:hover,li.datasetRow:hover{background-color:#f9f9f9}td.right-center{vertical-align:middle !important;text-align:right}.library-genome-select{max-width:350px}.library-extension-select{max-width:140px}.library_table td{border-top:1px solid #5f6990 !important}.library_table th{border-bottom:2px solid #5f6990 !important}.library_table a{color:#0A143D}.library_table a:hover{color:maroon}.library_style_container{width:95%;margin:auto;margin-top:2em;overflow:auto !important}.library_style_container tr{height:32px}tr.light td{background-color:white;color:black}tr.light:hover td{background-color:#f5e8cc}tr.dark td{background-color:#d6b161;color:white}tr.dark:hover td{background-color:#ebd4a4;color:white}a.dark{color:white}.dataset_table tr{border-bottom:1px solid #5f6990 !important}.dataset_table th{border:none !important}.dataset_table td{border:none !important}th.button_heading{width:2em}.bigdrop.select2-container .select2-results{max-height:300px}.bigdrop .select2-results{max-height:300px}.select2-container-multi{width:100%}.roles-selection{width:66%}#library_toolbar{margin-bottom:.5em}#library_toolbar span{margin-right:.2em}#library_toolbar .toolbar-item{margin-left:1em}img.expanderIcon{padding-right:4px}input.datasetCheckbox,li,ul{padding:0;margin:0}.rowTitle{padding:2px}ul{list-style:none}.libraryTitle th{text-align:left}pre.peek{background:white;color:black;overflow:auto}pre.peek th{color:white;background:#ebd9b2}.help-button{float:right}span.expandLink{padding-left:12px;display:inline-block;vertical-align:middle;background:url(../images/silk/resultset_next.png) no-repeat}.folderRow.expanded span.expandLink{background:url(../images/silk/resultset_bottom.png) no-repeat}.folderRow span.rowIcon{float:left;margin-right:5px;width:16px;height:16px;display:inline-block;vertical-align:middle;background:url(../images/silk/folder.png)}.libraryItem-error{margin-right:2px;padding:0 2px 0 2px;border:1px solid #dd1b15;background:#f9c7c5}.libraryItem-queued{margin-right:2px;padding:0 2px 0 2px;border:1px solid #bfbfbf;background:#eee}.libraryItem-running{margin-right:2px;padding:0 2px 0 2px;border:1px solid #AAAA66;background:#FFFFCC}.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #119ac2;background:#a8e5f7}.pagination-sm{height:15px}.library-paginator{margin-left:2em}