diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-04-30 12:12:31 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-04-30 12:12:31 +0000 |
| commit | 891ccaa2eca38b3462950e0dd9362f8be9c2cef4 (patch) | |
| tree | c2b927014af1bf5092859774b61558c33e3bf20a /WebContent/ITMILL/themes/base | |
| parent | b1ea80e751fbc7ad8d7c70ba3f6260eaaead2967 (diff) | |
| download | vaadin-framework-891ccaa2eca38b3462950e0dd9362f8be9c2cef4.tar.gz vaadin-framework-891ccaa2eca38b3462950e0dd9362f8be9c2cef4.zip | |
New theme button almost themed (error indicator missing). Includes SmartSprites syntax as well.
svn changeset:7597/svn branch:theme_2009_03
Diffstat (limited to 'WebContent/ITMILL/themes/base')
| -rw-r--r-- | WebContent/ITMILL/themes/base/button/button.css | 35 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/base/styles.css | 34 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/base/window/window.css | 1 |
3 files changed, 33 insertions, 37 deletions
diff --git a/WebContent/ITMILL/themes/base/button/button.css b/WebContent/ITMILL/themes/base/button/button.css index f7a3e6ae28..ce0e0d430f 100644 --- a/WebContent/ITMILL/themes/base/button/button.css +++ b/WebContent/ITMILL/themes/base/button/button.css @@ -3,6 +3,9 @@ white-space: nowrap;
margin: 0;
}
+.i-button span {
+ white-space: nowrap;
+}
.i-checkbox input {
vertical-align: middle;
}
@@ -12,7 +15,8 @@ vertical-align: middle;
margin-right: 3px;
}
-.i-button span, .i-checkbox label {
+.i-button span,
+.i-checkbox label {
vertical-align: middle;
}
.i-button-link {
@@ -37,22 +41,17 @@ padding-left: 1em;
background-position: left;
}
-
-/* Fixes streched buttons in IE6 */
+/* Fixes streched buttons in IE6 and IE7*/
.i-ie6 .i-button {
width: 1px;
- overflow: visible;
- padding-left: 1em;
- padding-right: 1em;
}
-
-/* Fixes streched buttons in IE7 */
-.i-ie7 .i-button {
+.i-ie6 .i-button,
+.i-ie7 .i-button,
+.i-ie8 .i-button {
overflow: visible;
padding-left: 1em;
padding-right: 1em;
}
-
/* Error indicator on checkbox fix for IE6 */
.i-ie6 .i-checkbox * {
float: left;
@@ -65,34 +64,32 @@ padding-left: 0;
padding-right: 0.4em;
}
-
/* Error indicator on checkbox fix for IE7 */
-.i-ie7 .i-checkbox * {
+.i-ie7 .i-checkbox *,
+.i-ie8 .i-checkbox * {
float: left;
}
-.i-ie7 .i-checkbox .i-errorindicator {
+.i-ie7 .i-checkbox .i-errorindicator,
+.i-ie8 .i-checkbox .i-errorindicator {
background-position: right;
float: left;
padding-left: 0;
padding-right: 0.7em;
}
-
/* Error indicator on button fix for IE */
.i-ie6 button .i-errorindicator,
-.i-ie7 button .i-errorindicator {
+.i-ie7 button .i-errorindicator,
+.i-ie8 button .i-errorindicator {
display: inline;
padding-right: 0.5em;
}
-
-
/* Disabled by default
.i-checkbox-error {
background: #ffe0e0;
}
*/
-
/* Disabled by default
.i-checkbox-required {
background: #ffe0e0;
}
-*/
+*/
\ No newline at end of file diff --git a/WebContent/ITMILL/themes/base/styles.css b/WebContent/ITMILL/themes/base/styles.css index 5d059fb2b8..3a7f29ea22 100644 --- a/WebContent/ITMILL/themes/base/styles.css +++ b/WebContent/ITMILL/themes/base/styles.css @@ -40,6 +40,9 @@ white-space: nowrap; margin: 0; } +.i-button span { + white-space: nowrap; +} .i-checkbox input { vertical-align: middle; } @@ -49,7 +52,8 @@ vertical-align: middle; margin-right: 3px; } -.i-button span, .i-checkbox label { +.i-button span, +.i-checkbox label { vertical-align: middle; } .i-button-link { @@ -74,22 +78,17 @@ padding-left: 1em; background-position: left; } - -/* Fixes streched buttons in IE6 */ +/* Fixes streched buttons in IE6 and IE7*/ .i-ie6 .i-button { width: 1px; - overflow: visible; - padding-left: 1em; - padding-right: 1em; } - -/* Fixes streched buttons in IE7 */ -.i-ie7 .i-button { +.i-ie6 .i-button, +.i-ie7 .i-button, +.i-ie8 .i-button { overflow: visible; padding-left: 1em; padding-right: 1em; } - /* Error indicator on checkbox fix for IE6 */ .i-ie6 .i-checkbox * { float: left; @@ -102,32 +101,30 @@ padding-left: 0; padding-right: 0.4em; } - /* Error indicator on checkbox fix for IE7 */ -.i-ie7 .i-checkbox * { +.i-ie7 .i-checkbox *, +.i-ie8 .i-checkbox * { float: left; } -.i-ie7 .i-checkbox .i-errorindicator { +.i-ie7 .i-checkbox .i-errorindicator, +.i-ie8 .i-checkbox .i-errorindicator { background-position: right; float: left; padding-left: 0; padding-right: 0.7em; } - /* Error indicator on button fix for IE */ .i-ie6 button .i-errorindicator, -.i-ie7 button .i-errorindicator { +.i-ie7 button .i-errorindicator, +.i-ie8 button .i-errorindicator { display: inline; padding-right: 0.5em; } - - /* Disabled by default .i-checkbox-error { background: #ffe0e0; } */ - /* Disabled by default .i-checkbox-required { background: #ffe0e0; @@ -1418,6 +1415,7 @@ div.i-tree-node-leaf { div.i-window-header { white-space: nowrap; text-overflow: ellipsis; + -ms-text-overflow: ellipsis; overflow: hidden; padding: 0; } diff --git a/WebContent/ITMILL/themes/base/window/window.css b/WebContent/ITMILL/themes/base/window/window.css index 3a9094dc4c..75bd915a7b 100644 --- a/WebContent/ITMILL/themes/base/window/window.css +++ b/WebContent/ITMILL/themes/base/window/window.css @@ -13,6 +13,7 @@ div.i-window-header { white-space: nowrap; text-overflow: ellipsis; + -ms-text-overflow: ellipsis; overflow: hidden; padding: 0; } |