diff core.css @ 517:7e85ebcab737

Merge - pre-release of 1.2.0

--- a/core.css	Mon Jan 04 11:59:21 2016 +0100
+++ b/core.css	Wed Feb 17 11:16:08 2016 +0000
@@ -21,14 +21,13 @@
 }
 
 div.comment-div {
-	border:#444444;
-	border-style:solid;
-	border-width:1px;
+	border:1px solid #444444;
 	max-width: 600px;
 	min-width: 400px;
 	float: left;
-	margin: 5px;
+	margin: 5px 10px 5px 5px;
 	height: 90px;
+    border-radius: 10px;
 }
 
 div.comment-div span {
@@ -43,6 +42,28 @@
 	border-radius: 10px;
 	box-shadow: 0px 0px 50px #000;
 	z-index: 2;
+    position: absolute;
+}
+
+div#popupContent {
+    margin-top: 20px;
+    margin-bottom: 5px;
+}
+
+div#popupTitle {
+    width: inherit;
+    min-height: 25px;
+    max-height: 250px;
+    overflow: auto;
+    margin-bottom: 5px;
+}
+
+div#popupResponse {
+    width: inherit;
+    min-height: 50px;
+    max-height: 320px;
+    overflow: auto;
+    position: relative;
 }
 
 button.popupButton {
@@ -50,7 +71,7 @@
 	 */
 	width: 50px;
 	height: 25px;
-	position: relative;
+	position: absolute;
 	border-radius: 5px;
 	border: #444;
 	border-width: 1px;
@@ -58,6 +79,16 @@
 	background-color: #fff;
 }
 
+button#popup-proceed {
+    bottom: 10px;
+    right: 10px;
+}
+
+button#popup-previous {
+    bottom: 10px;
+    left: 10px;
+}
+
 div.testHalt {
 	/* Specify any colouring during the test halt for pre/post questions */
 	background-color: rgba(0,0,0,0.5);
@@ -73,8 +104,8 @@
 textarea.trackComment {
 	max-width: 594px;
 	min-width: 350px;
-	margin-right:15px;
 	max-height: 60px;
+    resize: none;
 }
 
 div.playhead {
@@ -98,3 +129,26 @@
 	position: relative;
 	background-color: #000;
 }
+
+div#master-volume-holder {
+    width: 250px;
+    float: left;
+    border: black 1px solid;
+    border-radius: 5px;
+    padding: 5px;
+}
+
+input#master-volume-control {
+    width: 200px;
+    height: 25px;
+    float: left;
+    margin: 0px;
+    padding: 0px;
+}
+
+span#master-volume-feedback {
+    width: 45px;
+    height: 25px;
+    margin-left: 5px;
+    float: left;
+}
\ No newline at end of file