Merge branch 'gh-pages'

DECIPHER-genomics · Sep 2, 2015 · c904b73 · c904b73
2 parents dae188e + 508f4f3
commit c904b73
Show file tree

Hide file tree

Showing 43 changed files with 6,111 additions and 1,732 deletions.
diff --git a/combined.html b/combined.html
@@ -3,7 +3,7 @@
     // If no genome supplied, it must have at least chromosomeSize, e.g.:
     // chromosomeSize : 249250621, // chromosome 1, human
     genome  : 'grch38', // see js/genomes/
-    plugins : [ 'controlPanel', 'karyotype', 'trackControls', 'resizer', 'tooltips', 'fileDrop' ],
+    plugins : [ 'controlPanel', 'karyotype', 'trackControls', 'resizer', 'focusRegion', 'fullscreen', 'tooltips', 'fileDrop' ],
     tracks  : [
       Genoverse.Track.Scalebar,
       Genoverse.Track.extend({
@@ -21,7 +21,8 @@
         resizable       : 'auto',
         model           : Genoverse.Track.Model.extend({ dataRequestLimit : 5000000 }),
         setFeatureColor : function (f) { f.color = '#AAA'; }
-      })
+      }),
+      Genoverse.Track.dbSNP
     ]
   }
 </script>
diff --git a/css/controlPanel.css b/css/controlPanel.css
@@ -35,10 +35,6 @@
   margin: 0;
 }
 
-.gv-control-panel-plugin .gv-panel button.gv-button-large {
-  font-size: 25px;
-}
-
 .gv-control-panel-plugin .gv-panel button:only-child {
   width: 100%;
 }
@@ -47,6 +43,10 @@
   border-left: 1px solid #1C5380;
 }
 
+.gv-control-panel-plugin .gv-panel button.gv-button-large {
+  font-size: 25px;
+}
+
 .gv-control-panel-plugin .gv-panel div.gv-button-set:not(:first-child) > button {
   box-shadow: 0 1px 1px rgba(255, 255, 255, 0.12) inset;
 }
@@ -75,6 +75,16 @@
   border-left: 0;
 }
 
+.gv-control-panel-plugin .gv-panel-right button.gv-wheel-zoom {
+  font-weight: bold;
+}
+
+.gv-control-panel-plugin .gv-panel-right button.gv-drag-select i {
+  border: 1px dashed #FFF;
+  padding: 0 5px;
+  box-shadow: 0px 0px 1px #FFF inset, 0px 1px 3px rgba(0, 0, 0, 0.1), 2px 2px rgba(0, 0, 0, 0.2);
+}
+
 .gv-control-panel-plugin .gv-panel-left {
   background-image: -webkit-linear-gradient(right, #5F8CB0, #4A7496);
   background-image: -moz-linear-gradient(right center, #5F8CB0, #4A7496);
@@ -105,32 +115,54 @@
   top: 70px;
 }
 
+.gv-control-panel-plugin .gv-tracks-menu .gv-close {
+  font-size: 20px;
+}
+
+.gv-control-panel-plugin .gv-tracks-menu .gv-menu-content {
+  font-size: 13px;
+}
+
+.gv-control-panel-plugin .gv-tracks-menu table {
+  margin: 0 0 10px;
+}
+
 .gv-control-panel-plugin .gv-tracks-menu td {
-  padding: 5px!important;
+  padding: 5px 10px!important;
   vertical-align: top;
   width: 50%;
 }
 
 .gv-control-panel-plugin .gv-tracks-menu tr:first-child td {
   font-weight: bold;
-  font-size: 1.2em;
   white-space: nowrap;
+  padding: 5px 30px 5px 10px;
+  margin-bottom: 5px;
+  background: rgba(6, 54, 95, 0.35);
+  line-height: normal;
+}
+
+.gv-control-panel-plugin .gv-tracks-menu tr:first-child td:last-child {
+  border-radius: 0 12px 0 0;
 }
 
 .gv-control-panel-plugin .gv-tracks-menu tr td:first-child {
   padding-right: 50px!important;
 }
 
+.gv-control-panel-plugin .gv-tracks-menu .gv-tracks-library-item,
+.gv-control-panel-plugin .gv-tracks-menu .gv-current-tracks {
+  white-space: nowrap;
+}
+
+.gv-control-panel-plugin .gv-tracks-menu .gv-current-tracks.ui-sortable {
+  cursor: move;
+}
+
 .gv-control-panel-plugin .gv-tracks-menu .gv-remove-track,
 .gv-control-panel-plugin .gv-tracks-menu .gv-add-track {
-  border-radius: 3px;
-  display: inline-block;
-  font-weight: bold;
-  height: 15px;
-  line-height: 14px;
+  font-size: 14px;
   margin: 2px 5px 0 0;
-  padding: 0 0 0 1px;
-  width: 18px;
 }
 
 .gv-control-panel-plugin .gv-tracks-menu input {