summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2010-05-25 08:32:11 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2010-05-25 08:32:11 +0000
commitac7606430d1bb5e77cfa3df38333d03e85c69894 (patch)
treefbbc7434fc9c6444e00220f34841522de1328f4b /WebContent
parentd670a3f177a5ee3287b14744aad18043747cc05d (diff)
downloadvaadin-framework-ac7606430d1bb5e77cfa3df38333d03e85c69894.tar.gz
vaadin-framework-ac7606430d1bb5e77cfa3df38333d03e85c69894.zip
Fixes #4571: Icon for Table Footer sample
Additional style fixes as well for table footers. svn changeset:13344/svn branch:6.4
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/styles.css3
-rw-r--r--WebContent/VAADIN/themes/reindeer/styles.css30
-rw-r--r--WebContent/VAADIN/themes/reindeer/table/table.css30
-rw-r--r--WebContent/VAADIN/themes/runo/styles.css34
-rw-r--r--WebContent/VAADIN/themes/runo/table/table.css11
-rw-r--r--WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gifbin0 -> 1990 bytes
6 files changed, 86 insertions, 22 deletions
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index a4ba40b756..ab170b65ca 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -493,7 +493,7 @@ div.v-app-loading {
.v-datefield-button {
cursor: pointer;
}
-.v-readonly .v-datefield-button {
+.v-datefield .v-datefield-button-readonly {
display: none;
}
.v-datefield-calendarpanel table {
@@ -1851,6 +1851,7 @@ textarea.v-textarea-readonly:focus {
text-align: left; /* Force default alignment */
overflow: hidden;
padding: 1px 0;
+ outline: none;
}
.v-tree-node {
background: transparent url(common/img/sprites.png) no-repeat 5px -37px;
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index 571e539eaa..7c65a825bc 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -4160,7 +4160,9 @@ td.v-datefield-calendarpanel-nextyear {
/* Default & white style */
.v-table-header-wrap,
-.white .v-table-header-wrap {
+.white .v-table-header-wrap,
+.v-table-footer-wrap,
+.white .v-table-footer-wrap {
border-color: #c2c3c4;
background: transparent repeat-x;
background-image: url(common/img/vertical-sprites.png);
@@ -4171,24 +4173,34 @@ td.v-datefield-calendarpanel-nextyear {
font-size: 10px;
font-weight: bold;
color: #222;
- text-shadow: #fff 0 1px 0;
+ text-shadow: #f3f5f8 0 1px 0;
line-height: normal;
}
.v-table-footer-wrap,
-.white .v-table-footer-wrap{
+.white .v-table-footer-wrap {
+ text-transform: none;
+ font-size: 12px;
+ font-weight: normal;
+}
+
+.v-table-footer td,
+.white .v-table-footer td {
border-color: #c2c3c4;
- background: transparent repeat-x;
- background-image: url(table/img/header-bg-light.png);
- height: 20px;
}
-.v-table-header {
- height: 20px;
+.v-table-footer td:last-child {
+ border-right-color: transparent;
}
+
+.v-table-footer-container {
+ padding-right: 7px;
+}
+
+.v-table-header,
.v-table-footer,
.v-table-footer table {
- height: 20px;
+ height: 20px;
}
.v-table-caption-container {
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css
index fc9db768df..3a43a0fb49 100644
--- a/WebContent/VAADIN/themes/reindeer/table/table.css
+++ b/WebContent/VAADIN/themes/reindeer/table/table.css
@@ -9,7 +9,9 @@
/* Default & white style */
.v-table-header-wrap,
-.white .v-table-header-wrap {
+.white .v-table-header-wrap,
+.v-table-footer-wrap,
+.white .v-table-footer-wrap {
border-color: #c2c3c4;
background: transparent repeat-x;
background-image: url(img/header-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */
@@ -18,24 +20,34 @@
font-size: 10px;
font-weight: bold;
color: #222;
- text-shadow: #fff 0 1px 0;
+ text-shadow: #f3f5f8 0 1px 0;
line-height: normal;
}
.v-table-footer-wrap,
-.white .v-table-footer-wrap{
+.white .v-table-footer-wrap {
+ text-transform: none;
+ font-size: 12px;
+ font-weight: normal;
+}
+
+.v-table-footer td,
+.white .v-table-footer td {
border-color: #c2c3c4;
- background: transparent repeat-x;
- background-image: url(img/header-bg-light.png);
- height: 20px;
}
-.v-table-header {
- height: 20px;
+.v-table-footer td:last-child {
+ border-right-color: transparent;
+}
+
+.v-table-footer-container {
+ padding-right: 7px;
}
+
+.v-table-header,
.v-table-footer,
.v-table-footer table {
- height: 20px;
+ height: 20px;
}
.v-table-caption-container {
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index d8ccc2835d..afa5660cad 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -493,7 +493,7 @@ div.v-app-loading {
.v-datefield-button {
cursor: pointer;
}
-.v-readonly .v-datefield-button {
+.v-datefield .v-datefield-button-readonly {
display: none;
}
.v-datefield-calendarpanel table {
@@ -1851,6 +1851,7 @@ textarea.v-textarea-readonly:focus {
text-align: left; /* Force default alignment */
overflow: hidden;
padding: 1px 0;
+ outline: none;
}
.v-tree-node {
background: transparent url(../base/common/img/sprites.png) no-repeat 5px -37px;
@@ -3279,6 +3280,12 @@ div.v-csslayout-box-shadow {
border-top: 1px solid #b6bbbc;
}
+/* IE6 needs some help identifying when the input is readonly */
+.v-ie6 .v-filterselect.v-readonly,
+.v-ie6 .v-filterselect .v-filterselect-input-readonly {
+ background: transparent;
+}
+
/* Error styles (disabled by default)
----------------------------------
@@ -3578,11 +3585,20 @@ div.v-csslayout-box-shadow {
height: 36px;
border: 1px solid #b6bbbc;
border-bottom: none;
- background: #e7edf3 url(table/img/header-bg.png) repeat-x;
+ background: #e7e9ea url(table/img/header-bg.png) repeat-x;
}
.v-table-header {
height: 36px;
}
+.v-table-footer-wrap {
+ border-color: #b6bbbc;
+ background: #e7e9ea url(table/img/header-bg.png) repeat-x;
+}
+.v-table-footer td {
+ border-right-color: #e8eaec;
+ padding-top: 3px;
+ padding-bottom: 3px;
+}
.v-table-resizer {
height: 36px;
width: 4px;
@@ -4144,6 +4160,20 @@ textarea.v-textarea-small {
height: 10px;
padding: 1px;
}
+.v-tree{
+ outline:none;
+}
+.v-tree-node-caption.v-tree-node-focused span{
+ padding-left: 1px;
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+.v-tree-node-focused span{
+ border: 1px dotted black;
+}
+.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{
+ padding-left: 0px;
+}
/***************************************
* Drag'n'drop styles
***************************************/
diff --git a/WebContent/VAADIN/themes/runo/table/table.css b/WebContent/VAADIN/themes/runo/table/table.css
index be0c1add41..499844e4d3 100644
--- a/WebContent/VAADIN/themes/runo/table/table.css
+++ b/WebContent/VAADIN/themes/runo/table/table.css
@@ -2,11 +2,20 @@
height: 36px;
border: 1px solid #b6bbbc;
border-bottom: none;
- background: #e7edf3 url(img/header-bg.png) repeat-x;
+ background: #e7e9ea url(img/header-bg.png) repeat-x;
}
.v-table-header {
height: 36px;
}
+.v-table-footer-wrap {
+ border-color: #b6bbbc;
+ background: #e7e9ea url(img/header-bg.png) repeat-x;
+}
+.v-table-footer td {
+ border-right-color: #e8eaec;
+ padding-top: 3px;
+ padding-bottom: 3px;
+}
.v-table-resizer {
height: 36px;
width: 4px;
diff --git a/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gif b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gif
new file mode 100644
index 0000000000..0316afa58c
--- /dev/null
+++ b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gif
Binary files differ