Merge branch 'master' of github.com:Sankore/Sankore-3.1

fc00b130 · Anatoly Mihalchenko · 42d519e6 · 0017315c · fc00b130 · fc00b130
Commit fc00b130 authored Aug 29, 2011 by Anatoly Mihalchenko
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

config.xml resources/library/interactive/GeoInfo.wgt/config.xml +1 -1

preview.css ...brary/interactive/Html.wgt/markitup/templates/preview.css +1 -1

No files found.
--- a/resources/library/interactive/GeoInfo.wgt/config.xml
+++ b/resources/library/interactive/GeoInfo.wgt/config.xml
@@ -3,7 +3,7 @@
        version="1.0"
        width="680"
        height="400" 
-		ub:resizable="true">
+		ub:resizable="false">
  <name>GeoInfo</name>
  <content src="GeoInfo.html"/>
 </widget>
--- a/resources/library/interactive/Html.wgt/markitup/templates/preview.css
+++ b/resources/library/interactive/Html.wgt/markitup/templates/preview.css
 body {
 	font:70% Verdana, Arial, Helvetica, sans-serif;
-	color: orange;
+	color: black;
 }
\ No newline at end of file