diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index bdb8b3654..04097c742 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1985,11 +1985,11 @@ JS // Ok, the text area is drawn here $sHTMLValue = << +
- +
{$sValidationSpan}{$sReloadSpan} HTML; diff --git a/application/forms.class.inc.php b/application/forms.class.inc.php index abea4906d..43e209f66 100644 --- a/application/forms.class.inc.php +++ b/application/forms.class.inc.php @@ -1054,7 +1054,7 @@ class DesignerLongTextField extends DesignerTextField public function __construct($sCode, $sLabel = '', $defaultValue = '') { parent::__construct($sCode, $sLabel, $defaultValue); - $this->aCSSClasses[] = 'ibo-input-text-area'; + $this->aCSSClasses[] = 'ibo-input-text'; } public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog') diff --git a/css/backoffice/components/input/_all.scss b/css/backoffice/components/input/_all.scss index 4248e3651..c0976b967 100644 --- a/css/backoffice/components/input/_all.scss +++ b/css/backoffice/components/input/_all.scss @@ -13,4 +13,4 @@ @import "input-select-icon"; @import "input-string"; @import "input-set"; -@import "input-textarea"; +@import "input-text"; diff --git a/css/backoffice/components/input/_input-text.scss b/css/backoffice/components/input/_input-text.scss new file mode 100644 index 000000000..0a0b4c0e6 --- /dev/null +++ b/css/backoffice/components/input/_input-text.scss @@ -0,0 +1,13 @@ +$ibo-input-text--min-height: 12rem !default; +$ibo-input-text--padding-x: 12px !default; +$ibo-input-text--padding-y: 10px !default; + +.ibo-input-text { + min-height: $ibo-input-text--min-height; + padding: $ibo-input-text--padding-y $ibo-input-text--padding-x; +} + +.ibo-input-text--export { + width: 100%; + min-height: 15em; +} \ No newline at end of file diff --git a/css/backoffice/components/input/_input-textarea.scss b/css/backoffice/components/input/_input-textarea.scss deleted file mode 100644 index aec469af7..000000000 --- a/css/backoffice/components/input/_input-textarea.scss +++ /dev/null @@ -1,10 +0,0 @@ -$ibo-input-text-area--min-height: 4rem !default; - -.ibo-input-text-area { - min-height: $ibo-input-text-area--min-height; -} - -.ibo-input-text-area--export { - width: 100%; - min-height: 15em; -} \ No newline at end of file diff --git a/webservices/export-v2.php b/webservices/export-v2.php index f00826e71..eafc87711 100644 --- a/webservices/export-v2.php +++ b/webservices/export-v2.php @@ -338,7 +338,7 @@ EOF $oBlockResult->AddSubBlock(new Html(Dict::S('Core:BulkExport:ExportResult'))); $oTextArea = new TextArea('export_content', '', 'export_content'); - $oTextArea->AddCSSClass('ibo-input-text-area--export'); + $oTextArea->AddCSSClass('ibo-input-text--export'); $oBlockResult->AddSubBlock($oTextArea); $oP->AddSubBlock($oBlockResult);