Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.438
diff -u -p -F '^f' -r1.438 form.inc
--- includes/form.inc 7 Mar 2010 23:14:20 -0000 1.438
+++ includes/form.inc 8 Mar 2010 09:17:01 -0000
@@ -2801,16 +2801,24 @@ function theme_form($variables) {
*/
function theme_textarea($variables) {
$element = $variables['element'];
+ $wrapper_attributes = array(
+ 'class' => array('form-textarea-wrapper'),
+ );
$class = array('form-textarea');
- // Add resizable behavior
- if ($element['#resizable'] !== FALSE) {
+ // Add resizable behavior.
+ if (!empty($element['#resizable'])) {
drupal_add_js('misc/textarea.js');
- $class[] = 'resizable';
+ $wrapper_attributes['class'][] = 'resizable';
}
+ $output = '
';
+
_form_set_class($element, $class);
- return '';
+ $output .= '';
+
+ $output .= '
';
+ return $output;
}
/**
Index: misc/textarea.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/textarea.js,v
retrieving revision 1.30
diff -u -p -F '^f' -r1.30 textarea.js
--- misc/textarea.js 31 Aug 2009 05:51:08 -0000 1.30
+++ misc/textarea.js 8 Mar 2010 09:17:02 -0000
@@ -3,16 +3,14 @@
Drupal.behaviors.textarea = {
attach: function (context, settings) {
- $('textarea.resizable', context).once('textarea', function () {
+ $('.form-textarea-wrapper.resizable', context).once('textarea', function () {
// When wrapping the text area, work around an IE margin bug. See:
// http://jaspan.com/ie-inherited-margin-bug-form-elements-and-haslayout
var staticOffset = null;
- var textarea = $(this).wrap('
');
+ var textarea = $(this).addClass('resizable-textarea').find('textarea').wrap('');
var grippie = $('').mousedown(startDrag);
- grippie
- .insertAfter(textarea)
- .css('margin-right', grippie.width() - textarea.width());
+ grippie.insertAfter(textarea);
function startDrag(e) {
staticOffset = textarea.height() - e.pageY;
Index: modules/filter/filter.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.css,v
retrieving revision 1.3
diff -u -p -F '^f' -r1.3 filter.css
--- modules/filter/filter.css 7 Mar 2010 23:14:20 -0000 1.3
+++ modules/filter/filter.css 8 Mar 2010 09:17:03 -0000
@@ -5,7 +5,6 @@
}
.filter-wrapper {
border-top: 0;
- width: 95%;
margin: 0;
padding: 1.5em 0 1.5em;
}
Index: modules/node/node.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.css,v
retrieving revision 1.13
diff -u -p -F '^f' -r1.13 node.css
--- modules/node/node.css 17 Feb 2010 03:37:12 -0000 1.13
+++ modules/node/node.css 8 Mar 2010 09:17:03 -0000
@@ -31,10 +31,6 @@ td.revision-current {
.node-form .standard {
clear: both;
}
-.node-form textarea {
- display: block;
- width: 95%;
-}
.node-form .attachments fieldset {
float: none;
display: block;
Index: modules/system/system-behavior.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system-behavior.css,v
retrieving revision 1.5
diff -u -p -F '^f' -r1.5 system-behavior.css
--- modules/system/system-behavior.css 3 Mar 2010 19:46:26 -0000 1.5
+++ modules/system/system-behavior.css 8 Mar 2010 09:17:04 -0000
@@ -79,8 +79,13 @@ html.js fieldset.collapsible .fieldset-w
/**
* Resizable textareas
*/
-.resizable-textarea {
- width: 95%;
+.form-textarea-wrapper textarea {
+ margin: 0;
+ width: 100%;
+ display: block;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
.resizable-textarea .grippie {
height: 9px;
@@ -90,11 +95,6 @@ html.js fieldset.collapsible .fieldset-w
border-top-width: 0;
cursor: s-resize;
}
-html.js .resizable-textarea textarea {
- margin-bottom: 0;
- width: 100%;
- display: block;
-}
/**
* Table drag and drop
Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.47
diff -u -p -F '^f' -r1.47 style.css
--- themes/seven/style.css 5 Mar 2010 15:23:25 -0000 1.47
+++ themes/seven/style.css 8 Mar 2010 09:17:05 -0000
@@ -607,7 +607,6 @@ div.teaser-checkbox .form-item,
/* Filter */
.filter-wrapper {
border-top: 0;
- width: 95%;
padding: 10px 2px;
}
.filter-wrapper > div {
@@ -692,10 +691,6 @@ select.form-select:focus {
color: #000;
border-color: #ace;
}
-.resizable-textarea .grippie {
- width: 100%;
- padding: 0 2px;
-}
html.js input.form-autocomplete {
background-position: 100% 4px;
}