summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorHenri Kerola <henri.kerola@itmill.com>2010-09-20 15:20:47 +0000
committerHenri Kerola <henri.kerola@itmill.com>2010-09-20 15:20:47 +0000
commit403db1577a07db0b4eb5ac6c51fba3205f77a47d (patch)
tree243032a0414d28d4969ff432c6f69e527e04d3aa /WebContent/VAADIN/themes
parent6be3c8a27296b842df0702da538103fe106122ea (diff)
downloadvaadin-framework-403db1577a07db0b4eb5ac6c51fba3205f77a47d.tar.gz
vaadin-framework-403db1577a07db0b4eb5ac6c51fba3205f77a47d.zip
Minor fixes to liferay theme (#5517)
svn changeset:15081/svn branch:6.4
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/liferay/button/button.css29
-rw-r--r--WebContent/VAADIN/themes/liferay/datefield/datefield.css4
-rw-r--r--WebContent/VAADIN/themes/liferay/notification/notification.css (renamed from WebContent/VAADIN/themes/liferay/notofication/notification.css)0
-rw-r--r--WebContent/VAADIN/themes/liferay/select/select.css4
-rw-r--r--WebContent/VAADIN/themes/liferay/styles.css123
-rw-r--r--WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css21
-rw-r--r--WebContent/VAADIN/themes/liferay/tree/tree.css4
-rw-r--r--WebContent/VAADIN/themes/liferay/window/window.css8
8 files changed, 159 insertions, 34 deletions
diff --git a/WebContent/VAADIN/themes/liferay/button/button.css b/WebContent/VAADIN/themes/liferay/button/button.css
index 8b17fcbbb3..7ba962d596 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.css
+++ b/WebContent/VAADIN/themes/liferay/button/button.css
@@ -26,7 +26,7 @@
background: #d4d4d4 url(/html/themes/classic/images/portlet/header_bg.png) repeat-x 0 0;
-webkit-background-origin: padding;
-moz-background-origin: padding;
- padding: 3px 8px 4px 8px;
+ padding: 4px 4px 0px 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -36,6 +36,25 @@
color: #34404f;
overflow: hidden;
text-overflow: ellipsis;
+ height: 26px;
+}
+
+.v-button-wrap {
+ display: block;
+ height: 19px;
+}
+
+.v-button-caption {
+ line-height: 16px;
+}
+
+.v-ie6 .v-button {
+ height: 20px;
+}
+.v-ie6 .v-button .v-button-wrap {
+ height: 17px;
+ display: inline;
+ zoom: 1;
}
/* Link style button */
@@ -50,7 +69,12 @@ button.v-nativebutton-link,
button.v-nativebutton-link:focus,
button.v-nativebutton-link:active,
button.v-nativebutton-link:hover,
-button.v-nativebutton-link-pressed {
+button.v-nativebutton-link-pressed,
+.v-button.v-button-link .v-button-wrap,
+.v-button.v-button-link:focus .v-button-wrap,
+.v-button.v-button-link:active .v-button-wrap,
+.v-button-link.v-pressed .v-button-wrap,
+.v-disabled.v-button.v-button-link .v-button-wrap {
color: #5B677D;
font-weight: normal;
border: none;
@@ -64,6 +88,7 @@ button.v-nativebutton-link-pressed {
-moz-border-radius: 0;
border-radius: 0;
text-shadow: none;
+ height: auto;
}
.v-button-link:hover {
diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.css b/WebContent/VAADIN/themes/liferay/datefield/datefield.css
index befa8b6875..4307658449 100644
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.css
@@ -5,6 +5,10 @@
border-radius: 4px;
}
+.v-datefield-calendarpanel-header {
+ height: 28px;
+}
+
.v-datefield-calendarpanel:focus {
outline: none;
}
diff --git a/WebContent/VAADIN/themes/liferay/notofication/notification.css b/WebContent/VAADIN/themes/liferay/notification/notification.css
index 10168fecbd..10168fecbd 100644
--- a/WebContent/VAADIN/themes/liferay/notofication/notification.css
+++ b/WebContent/VAADIN/themes/liferay/notification/notification.css
diff --git a/WebContent/VAADIN/themes/liferay/select/select.css b/WebContent/VAADIN/themes/liferay/select/select.css
index 7710f6cfc3..323c730d29 100644
--- a/WebContent/VAADIN/themes/liferay/select/select.css
+++ b/WebContent/VAADIN/themes/liferay/select/select.css
@@ -3,6 +3,10 @@
padding: 1px;
}
+select {
+ background-color: #fff;
+}
+
.v-filterselect-button {
width: 24px;
height: 24px;
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index ab632e4b5e..322976105b 100644
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_4_5_dev-20100917";}
-.v-theme-version-6_4_5_dev-20100917 {display: none;}
+.v-theme-version:after {content:"6_4_5_dev-20100920";}
+.v-theme-version-6_4_5_dev-20100920 {display: none;}
/* Automatically compiled css file from subdirectories. */
.v-absolutelayout-wrapper {
@@ -2277,7 +2277,7 @@ div.v-window-header {
background: #d4d4d4 url(/html/themes/classic/images/portlet/header_bg.png) repeat-x 0 0;
-webkit-background-origin: padding;
-moz-background-origin: padding;
- padding: 3px 8px 4px 8px;
+ padding: 4px 4px 0px 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -2287,6 +2287,25 @@ div.v-window-header {
color: #34404f;
overflow: hidden;
text-overflow: ellipsis;
+ height: 26px;
+}
+
+.v-button-wrap {
+ display: block;
+ height: 19px;
+}
+
+.v-button-caption {
+ line-height: 16px;
+}
+
+.v-ie6 .v-button {
+ height: 20px;
+}
+.v-ie6 .v-button .v-button-wrap {
+ height: 17px;
+ display: inline;
+ zoom: 1;
}
/* Link style button */
@@ -2301,7 +2320,12 @@ button.v-nativebutton-link,
button.v-nativebutton-link:focus,
button.v-nativebutton-link:active,
button.v-nativebutton-link:hover,
-button.v-nativebutton-link-pressed {
+button.v-nativebutton-link-pressed,
+.v-button.v-button-link .v-button-wrap,
+.v-button.v-button-link:focus .v-button-wrap,
+.v-button.v-button-link:active .v-button-wrap,
+.v-button-link.v-pressed .v-button-wrap,
+.v-disabled.v-button.v-button-link .v-button-wrap {
color: #5B677D;
font-weight: normal;
border: none;
@@ -2315,6 +2339,7 @@ button.v-nativebutton-link-pressed {
-moz-border-radius: 0;
border-radius: 0;
text-shadow: none;
+ height: auto;
}
.v-button-link:hover {
@@ -2393,6 +2418,10 @@ div.v-app {
border-radius: 4px;
}
+.v-datefield-calendarpanel-header {
+ height: 28px;
+}
+
.v-datefield-calendarpanel:focus {
outline: none;
}
@@ -2625,6 +2654,55 @@ span.v-datefield-calendarpanel-month {
color: #999;
}
+.v-Notification {
+ background: #dff4ff;
+ color: #34404F;
+ font-weight: bold;
+ cursor: pointer;
+ overflow: hidden;
+ padding: 1em;
+ max-width: 85%;
+ border: 1px solid #a7cedf;
+}
+
+.v-Notification h1,
+.v-Notification p,
+.v-Notification-error h1,
+.v-Notification-error p,
+.v-Notification-warning h1,
+.v-Notification-warning p {
+ display: inline;
+ margin: 0 0.5em 0 0;
+}
+.v-Notification-warning {
+ background: #ffc;
+ border-color: #fc0;
+}
+.v-Notification-error {
+ background-color: #ffdddd;
+ border-color: #ff0000;
+}
+
+.v-Notification-tray {
+ color: #111111;
+ background-color: #e5e5e5;
+ border-color: #b5b5b5;
+}
+.v-Notification-tray h1 {
+ display: block;
+}
+.v-Notification-tray p {
+ display: block;
+}
+.v-Notification-system {
+ background-color: #ffdddd;
+ border-color: #ff0000;
+}
+.v-Notification-system h1 {
+ display: block;
+ margin: 0;
+}
+
.v-panel-caption {
text-shadow: 1px 1px #fff;
font-size: 12px;
@@ -2708,6 +2786,10 @@ span.v-datefield-calendarpanel-month {
padding: 1px;
}
+select {
+ background-color: #fff;
+}
+
.v-filterselect-button {
width: 24px;
height: 24px;
@@ -3031,10 +3113,13 @@ span.v-datefield-calendarpanel-month {
margin-left: -10px;
position: absolute;
text-indent: -9999px;
- z-index: 9999;
width: 0;
}
+.v-tabsheet-tabs {
+ height: 35px;
+}
+
.v-tabsheet-tabcontainer,
.v-tabsheet-tabs {
overflow: visible !important;
@@ -3047,20 +3132,18 @@ span.v-datefield-calendarpanel-month {
border-radius: 4px 0 0 4px;
}
+.v-tabsheet-tabitemcell, .v-tabsheet-spacertd {
+ vertical-align: top;
+}
+
.v-tabsheet-spacertd div {
- height: 23px;
+ height: 28px;
border: 1px solid #c8c9ca;
border-left: none;
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
-}
-
-.v-ie6 .v-tabsheet-spacertd div,
-.v-ie7 .v-tabsheet-spacertd div,
-.v-op .v-tabsheet-spacertd div,
-.v-sa .v-tabsheet-spacertd div {
- height: 24px;
+ padding: 0;
}
.v-tabsheet-tabitem {
@@ -3074,7 +3157,7 @@ span.v-datefield-calendarpanel-month {
float: right;
width: 33px;
height: 28px;
- margin-top: -30px;
+ margin-top: -35px;
background-color: #eef0f2;
border: 1px solid #c8c9ca;
border-left: none;
@@ -3137,10 +3220,6 @@ textarea.v-textarea-prompt {
font-style: normal;
}
-.v-tree {
- outline: none;
-}
-
.v-tree-node {
background: transparent url(tree/arrows_sprites.png) no-repeat -42px 1px;
}
@@ -3268,3 +3347,11 @@ textarea.v-textarea-prompt {
width: 14px;
height: 16px;
}
+
+.v-shadow-window {
+ padding-bottom: 11px;
+}
+
+.v-ie .v-shadow-window {
+ padding-bottom: 0;
+}
diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
index 9fd7aa2c7d..9b99ee6e5b 100644
--- a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
@@ -51,10 +51,13 @@
margin-left: -10px;
position: absolute;
text-indent: -9999px;
- z-index: 9999;
width: 0;
}
+.v-tabsheet-tabs {
+ height: 35px;
+}
+
.v-tabsheet-tabcontainer,
.v-tabsheet-tabs {
overflow: visible !important;
@@ -67,20 +70,18 @@
border-radius: 4px 0 0 4px;
}
+.v-tabsheet-tabitemcell, .v-tabsheet-spacertd {
+ vertical-align: top;
+}
+
.v-tabsheet-spacertd div {
- height: 23px;
+ height: 28px;
border: 1px solid #c8c9ca;
border-left: none;
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
-}
-
-.v-ie6 .v-tabsheet-spacertd div,
-.v-ie7 .v-tabsheet-spacertd div,
-.v-op .v-tabsheet-spacertd div,
-.v-sa .v-tabsheet-spacertd div {
- height: 24px;
+ padding: 0;
}
.v-tabsheet-tabitem {
@@ -94,7 +95,7 @@
float: right;
width: 33px;
height: 28px;
- margin-top: -30px;
+ margin-top: -35px;
background-color: #eef0f2;
border: 1px solid #c8c9ca;
border-left: none;
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css
index 316721d60f..33da398736 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.css
+++ b/WebContent/VAADIN/themes/liferay/tree/tree.css
@@ -1,7 +1,3 @@
-.v-tree {
- outline: none;
-}
-
.v-tree-node {
background: transparent url(arrows_sprites.png) no-repeat -42px 1px;
}
diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css
index 4c22298b5a..58cf86be65 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.css
+++ b/WebContent/VAADIN/themes/liferay/window/window.css
@@ -65,4 +65,12 @@
background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -64px -228px;
width: 14px;
height: 16px;
+}
+
+.v-shadow-window {
+ padding-bottom: 11px;
+}
+
+.v-ie .v-shadow-window {
+ padding-bottom: 0;
} \ No newline at end of file