Merge branch 'master' of github.com:ging/vish_editor

CyberAula · Feb 23, 2012 · 97165da · 97165da
2 parents f25dab8 + 13ee3e2
commit 97165da
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/README b/README
@@ -1,3 +1,5 @@
 VishEditor allows to create and play HTML5 excursions.
 
 TO-DO 2
+
+Dani just joined the project
diff --git a/VISHEditor/framed.html b/VISHEditor/framed.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+<iframe src="slides.html" width="800" height="600"></iframe>
+</body>
+</html>
diff --git a/VISHEditor/js/VISH.js b/VISHEditor/js/VISH.js
@@ -1,4 +1,4 @@
 var VISH = VISH || {};
 
 VISH.VERSION = '0.1';
-VISH.AUTHORS = 'Enrique Barra & Víctor Sánchez';
+VISH.AUTHORS = 'GING';
diff --git a/VISHEditor/slides.html b/VISHEditor/slides.html
@@ -19,7 +19,7 @@
        }
       </style>
 
-  	  <meta name="viewport" content="width=1100,height=750">
+  	  <meta name="viewport" content="width=800,height=600">
   	  <meta name="apple-mobile-web-app-capable" content="yes">
 
 	  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>

diff --git a/VISHEditor/stylesheets/styles.css b/VISHEditor/stylesheets/styles.css
@@ -23,7 +23,7 @@ body {
   display: block !important;
 
   height: 100%;
-  min-height: 740px;
+  min-height: 600px;
 
   overflow-x: hidden;
   overflow-y: auto;
@@ -54,14 +54,14 @@ body {
   position: absolute;
   overflow: hidden;
 
-  width: 900px;
-  height: 700px;
+  width: 600px;
+  height: 467px;
 
   left: 50%;
   top: 50%;
 
-  margin-left: -450px;
-  margin-top: -350px;
+  margin-left: -300px;
+  margin-top: -233px;
 
   padding: 40px 60px;
 

diff --git a/VISHEditor/stylesheets/templates/pack1.css b/VISHEditor/stylesheets/templates/pack1.css
@@ -34,7 +34,7 @@
 .t1_right{
 	margin-top: 5px;
 	position:relative;
-	width: 49%;
+	width: 48%;
 	height: 90%;
 	float: right;
 	border: 2px double grey;