k12 tool mods from doc

btaylor-sesda · Jun 29, 2018 · 696c5f2 · 696c5f2
1 parent 56e5035
commit 696c5f2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/resources/css/helioviewer-views.css b/resources/css/helioviewer-views.css
@@ -250,6 +250,7 @@
 	left:10px;
 	top:10px;
 	position:absolute;
-	height: auto;
+    height: auto;
+    width: 27em;
 	overflow: hidden;
 }
diff --git a/resources/css/helioviewer-web.css b/resources/css/helioviewer-web.css
@@ -1521,4 +1521,23 @@ span.ui-icon-hover, div.ui-icon-hover {
 	/*margin-top:7px;*/
 }
 
-.dropdown-holder .item-list:hover .item-list-remove { display:block; }
+.dropdown-holder .item-list:hover .item-list-remove { display:block; }
+
+
+/*
+*
+*   k12 specific style changes
+*
+*/
+
+.k12-timeNowBtn {
+    /*margin-top: -3.3em;*/
+    margin-top: -6.9em;
+    border: 1px solid #cccccc;
+    border-radius: 1.0em;
+    padding: 0.4em;
+}
+
+.k12-timeNowBtn:hover{
+    border: 1px solid yellow;
+}
diff --git a/resources/css/layout.css b/resources/css/layout.css
@@ -157,6 +157,15 @@
     text-align: left;
 }
 
+#k12-accordion-date .row .label {
+    width: 20%;
+    text-align: right;
+}
+#k12-accordion-date .row .field {
+    width: 75%;
+    text-align: left;
+}
+
 .drawer-contents .row .label {
     width: 30%;
     text-align: right;

diff --git a/resources/js/UI/ImagePresets.js b/resources/js/UI/ImagePresets.js
@@ -634,5 +634,11 @@ var SystemLayersPresets = [
 		'observationDate':'',
 		'events':'[CH,all,1]',
 		'layers':'[SDO,AIA,211,1,100,0,60,1,2017-11-16T09:02:20.000Z]'
-	}
+	},
+	{
+		'name':'Sunspots',
+		'observationDate':'',
+		'events':'[SS,all,1]',
+		'layers':'[SDO,HMI,continuum,1,100,0,60,1,2017-11-16T09:02:20.000Z]'
+	},
 ];
diff --git a/resources/js/UI/TimelineEvents.js b/resources/js/UI/TimelineEvents.js
@@ -595,15 +595,15 @@ var TimelineEvents = Class.extend({
 
 					var x = this.chart.mouseCoords.x;
 					var y = this.chart.mouseCoords.y;
-					var xOffset = 32;
+					var xOffset = 12;
 					var eventPopUpWidth = 350;
 					var eventPopUpHeight = 150;
 					var timelineRectHeight = 20;
 
 					if (x + xOffset + eventPopUpWidth > this.chart.plotWidth) {
 						tooltipX = x - eventPopUpWidth - xOffset;
 					} else {
-						tooltipX = x + (xOffset/2);
+						tooltipX = x;
 					}
 
 					if(y < eventPopUpHeight){