Forráskód Böngészése

fixed placing of geometry tools

Simon Van Mierlo 9 éve
szülő
commit
e80d1f26d9
3 módosított fájl, 26 hozzáadás és 33 törlés
  1. 2 2
      client/atompm.html
  2. 2 2
      client/geometry_utils.js
  3. 22 29
      client/styles.css

+ 2 - 2
client/atompm.html

@@ -71,9 +71,9 @@ with AToMPM.  If not, see <http://www.gnu.org/licenses/>.
 		<div id="rootDiv" class="rootDiv">
 			<div id="commandHistory" class="commandHistory">
 			</div>
-			<div id="inputDiv" class="inputDiv">
+			<!--div id="inputDiv" class="inputDiv">
 				<input placeholder="type 'help' to get information about querying" name="mainInput" type="text" class="mainInput" id="mainInput" onkeyup="InputBarUtils.processKey( event )"/>
-			</div>
+			</div-->
 			<div id="contentDiv" class="contentDiv">
 				<div id="div_container" class="container">
 					<div id="div_canvas" class="canvas"></div>

+ 2 - 2
client/geometry_utils.js

@@ -326,9 +326,9 @@ GeometryUtils = function(){
 		}
 			
 		geometryControlsOverlay.css("top", 
-			bbox.y + bbox.height + 2 - document.body.scrollTop + "px"),
+			bbox.y + bbox.height - $("#div_container").scrollTop() + "px"),
 		geometryControlsOverlay.css("left", 
-			bbox.x + bbox.width/2 - __GEOM_CTRLS_WIDTH/2.0 -  document.body.scrollLeft + "px");
+			bbox.x + bbox.width/2 - __GEOM_CTRLS_WIDTH/2.0 - $("#div_container").scrollLeft() + "px");
 		geometryControlsOverlay.css("display", "inline");
 	
 		GeometryUtils.initSelectionTransformationPreviewOverlay();

+ 22 - 29
client/styles.css

@@ -1,14 +1,15 @@
+
 div, span {
-	cursor:/*url('media/cursor_default.png'),*/default;
+	cursor:default;
 }
 input, textarea {
-	cursor:/*url('media/cursor_text.png'),*/text;
+	cursor:text;
 }
 textarea.string_input {
     resize: none;
 }
 select, option, button {
-	cursor:/*url('media/cursor_pointer.png'),*/pointer;
+	cursor:pointer;
 }
 button {
 	font-family:"lucida grande",tahoma,verdana,arial,sans-serif;
@@ -20,7 +21,7 @@ span.feedback {
 
 html {
 	width: 100%;
-	height: 97%;
+	height: 100%;
 	overflow: hidden;
 }
 
@@ -36,9 +37,8 @@ html {
 	position: absolute;
 	left: 0;
 	right: 0;
-	top: 32px;
+	top: 0;
 	bottom: 0;
-	border-top: 1px solid black;
 	box-shadow: inset 7px 7px 5px rgba(0, 0, 0, 0.1);
 }
 
@@ -77,7 +77,7 @@ html {
 	width:10000;
 	overflow:auto;
 	background: url(media/gridbg.png) top left repeat;
-	cursor:/*url('media/cursor_crosshair.png'),*/crosshair;
+	cursor:crosshair;
 }
 
 
@@ -87,7 +87,7 @@ html {
 	stroke-dasharray:5,5;
 	fill: chartreuse;
 	fill-opacity:0.1;
-	cursor:/*url('media/cursor_move.png'),*/move;
+	cursor:move;
 }
 
 
@@ -95,12 +95,13 @@ html {
 	stroke-width:0.1;
 	fill:#0000ff;
 	fill-opacity:0.10;
-	cursor:/*url('media/cursor_crosshair.png'),*/crosshair;
+	cursor:crosshair;
 }
 
 
+
 .clickable {
-	cursor:/*url('media/cursor_pointer.png'),*/pointer;
+	cursor:pointer;
 }
 
 
@@ -123,7 +124,7 @@ html {
 	stroke-width:1;
 	fill: coral;
 	fill-opacity:0.5;
-	cursor:/*url('media/cursor_move.png'),*/move;
+	cursor:move;
 }
 
 .ctrl_point_center_overlay {
@@ -131,7 +132,7 @@ html {
 	stroke-width:1;
 	fill: khaki;
 	fill-opacity:0.5;
-	cursor:/*url('media/cursor_move.png'),*/move;
+	cursor:move;
 }
 
 
@@ -145,7 +146,7 @@ html {
 	position:fixed;
 	top: 0px;
 	left: 0px;
-	cursor:/*url('media/cursor_not-allowed.png'),*/not-allowed;
+	cursor:not-allowed;
 }
 
 
@@ -190,14 +191,14 @@ html {
 	position:fixed;
 	top: 0px;
 	left: 0px;
-	cursor:/*url('media/cursor_not-allowed.png'),*/not-allowed;
+	cursor:not-allowed;
 }
 
 
 .disabled_link {
 	pointer-events:none;
 	color:grey;
-	cursor:/*url('media/cursor_not-allowed.png'),*/not-allowed;
+	cursor:not-allowed;
 }
 
 .dock {
@@ -234,19 +235,18 @@ html {
 
 .empty_icon {
 	opacity:0;
-	cursor:/*url('media/cursor_pointer.png'),*/pointer;
+	cursor:pointer;
 }
 
 
 .enabled_link {
 	color:indianred;
-	cursor:/*url('media/cursor_pointer.png'),*/pointer;
+	cursor:pointer;
 }
 
 
 .error{
 	color:crimson;
-	/*font-weight: bold;*/
 }
 
 
@@ -296,7 +296,7 @@ html {
 
 .geometry_ctrl {
 	opacity:0.75;
-	cursor:/*url('media/cursor_pointer.png'),*/pointer;
+	cursor:pointer;
 }
 .geometry_ctrl:hover {
 	opacity:1;
@@ -369,7 +369,7 @@ html {
 .toolbar_button {
 	display: inline-block;
 	opacity:0.75;
-	cursor:/*url('media/cursor_pointer.png'),*/pointer;
+	cursor:pointer;
 }
 .toolbar_button:hover {
 	opacity:1;
@@ -387,7 +387,7 @@ html {
 	stroke-dasharray:5,5;
 	fill: lavender;
 	fill-opacity:0.1;
-	cursor:/*url('media/cursor_not-allowed.png'),*/not-allowed;
+	cursor:not-allowed;
 }
 
 .unselectable {
@@ -395,12 +395,6 @@ html {
 	-moz-user-select: none;
 }
 
-
- 
-/* Chat style based on 
-http://net.tutsplus.com/tutorials/javascript-ajax/how-to-create-a-simple-web-based-chat-application/ 
-*/
-
  
 form, p, span {
 	margin:0 auto;
@@ -451,5 +445,4 @@ a {
  
 .logout { float:right; }
  
-.msgln { margin:0 0 2px 0; }
-
+.msgln { margin:0 0 2px 0; }