From bdee6749d449ffdf7cf6584d9d67bca6f3d0dd79 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Mon, 6 Apr 2009 13:27:02 +0000 Subject: (merged from 5.4) Implements "input prompt" for ComboBox and TextField. Also includes Sampler samples. Fixes #1455 svn changeset:7337/svn branch:6.0 --- WebContent/ITMILL/themes/default/select/select.css | 6 +++++- WebContent/ITMILL/themes/default/styles.css | 18 ++++++++++++++---- .../ITMILL/themes/default/textfield/textfield.css | 7 ++++++- 3 files changed, 25 insertions(+), 6 deletions(-) (limited to 'WebContent') diff --git a/WebContent/ITMILL/themes/default/select/select.css b/WebContent/ITMILL/themes/default/select/select.css index 52c000998d..5c5d57507a 100644 --- a/WebContent/ITMILL/themes/default/select/select.css +++ b/WebContent/ITMILL/themes/default/select/select.css @@ -102,7 +102,11 @@ outline: 5px auto -webkit-focus-ring-color; outline-offset: -4px; } - +.i-filterselect-prompt .i-filterselect-input { + /* input prompt active, i.e empty select */ + color: #999; + font-style: italic; +} .i-filterselect-button { float: right; width: 25px; diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css index 2e9c637b01..439f4f2aec 100644 --- a/WebContent/ITMILL/themes/default/styles.css +++ b/WebContent/ITMILL/themes/default/styles.css @@ -1384,7 +1384,11 @@ input.i-modified, outline: 5px auto -webkit-focus-ring-color; outline-offset: -4px; } - +.i-filterselect-prompt .i-filterselect-input { + /* input prompt active, i.e empty select */ + color: #999; + font-style: italic; +} .i-filterselect-button { float: right; width: 25px; @@ -2483,6 +2487,12 @@ input.i-modified, border-color: #5daee8; } +input.i-textfield-prompt, +textarea.i-textarea-prompt { + color: #999; + font-style: italic; +} + .i-textfield.i-readonly, .i-textarea.i-readonly { background: transparent; @@ -2490,7 +2500,6 @@ input.i-modified, border: none; } - .i-richtextarea { border: 1px solid #b6b6b6; overflow: hidden; @@ -2651,8 +2660,9 @@ input.i-modified, .i-window-footer { height: 8px; margin-left: 9px; - background: transparent url(window/img/bottom-right.png) no-repeat right top; - /* IE7 bug fix */ + background: transparent url(window/img/bottom-right.png) no-repeat right top; +} +.i-ie7 .i-window-footer { position:relative; } diff --git a/WebContent/ITMILL/themes/default/textfield/textfield.css b/WebContent/ITMILL/themes/default/textfield/textfield.css index 0a91a97b2e..16d36e3256 100644 --- a/WebContent/ITMILL/themes/default/textfield/textfield.css +++ b/WebContent/ITMILL/themes/default/textfield/textfield.css @@ -27,6 +27,12 @@ border-color: #5daee8; } +input.i-textfield-prompt, +textarea.i-textarea-prompt { + color: #999; + font-style: italic; +} + .i-textfield.i-readonly, .i-textarea.i-readonly { background: transparent; @@ -34,7 +40,6 @@ border: none; } - .i-richtextarea { border: 1px solid #b6b6b6; overflow: hidden; -- cgit v1.2.3