Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git

htdocs/artefact/internal/index.php

@@ -73,11 +73,11 @@ foreach ( $element_list as $element => $type ) {
 
     if ($type == 'wysiwyg') {
         $elements[$element]['rows'] = 7;
-        $elements[$element]['cols'] = 80;
+        $elements[$element]['cols'] = 60;
     }
     if ($type == 'textarea') {
         $elements[$element]['rows'] = 4;
-        $elements[$element]['cols'] = 80;
+        $elements[$element]['cols'] = 60;
     }
     if ($element == 'country') {
         $elements[$element]['options'] = getoptions_country();

htdocs/theme/default/static/style/style.css

@@ -403,12 +403,12 @@ div.sidebar {
 	float: left;
 }
 
-.content textarea {
+/*.content textarea {
 	width: 450px;
 }
 .content textarea.wysiwyg {
 	width: 500px;
-}
+}*/
 
 #messages {
 	margin: 0 3px 3px 3px;
@@ -420,8 +420,7 @@ div.sidebar {
 	padding: 0 0 0 17px;
 }
 
-#messages .error
-/*#messages .err*/ {
+#messages .error {
 	color: #dd0221;
 	background: #ffd3d9 url(../images/icon_problem.gif) no-repeat left;
 	padding: 0 0 0 17px;