]> source.dussan.org Git - vaadin-framework.git/commitdiff
Chameleon theme fixes
authorJouni Koivuviita <jouni.koivuviita@itmill.com>
Fri, 26 Aug 2011 07:08:36 +0000 (07:08 +0000)
committerJouni Koivuviita <jouni.koivuviita@itmill.com>
Fri, 26 Aug 2011 07:08:36 +0000 (07:08 +0000)
 * Button with explicit width now behaves similarly across browsers, either clipping the text or ellipticizing it
 * DateField popup button now same height as the input field
 * Minor stylistic changes

svn changeset:20673/svn branch:6.7

WebContent/VAADIN/themes/chameleon/components/button/button.css
WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css
WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css
WebContent/VAADIN/themes/chameleon/components/selects/selects.css
WebContent/VAADIN/themes/chameleon/components/table/table.css
WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css
WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css

index f3bd5b01d7468495cc94013f8cc691a29bdd720b..13fa53cc3f6c0ac36306229b1de6949fa57482ed 100644 (file)
@@ -26,6 +26,10 @@ div.v-button-down .v-button-wrap {
        background-image: none;
        }
 
+.v-button {
+       overflow: hidden;
+       }
+
 .v-button,
 .v-disabled.v-button:focus,
 .v-disabled.v-button:active {
index 7ea10756582a74848ce535e227077e340bfb030f..71771ad6e19977f837482418db8f963014960622 100644 (file)
@@ -5,9 +5,50 @@
        -webkit-border-bottom-right-radius: 3px;
        -moz-border-radius-topright: 3px;
        -moz-border-radius-bottomright: 3px;
-       height: 1.614999em;
-       padding: 0;
        width: 25px;
+       height: 1.2em;
+       padding: .2em 0;
+       -webkit-box-sizing: content-box;
+       -moz-box-sizing: content-box;
+       -ms-box-sizing: content-box;
+       box-sizing: content-box;
+       }
+
+.v-datefield-small .v-datefield-button {
+       height: 1.2em;
+       }
+
+.v-datefield-big .v-datefield-button {
+       padding: .3em 0;
+       height: 1.2em;
+       }
+
+.v-ie6 .v-datefield-button,
+.v-ie7 .v-datefield-button {
+       height: 1.55em;
+       margin-top: 1px;
+       padding: 0;
+       }
+
+.v-ie7 .v-datefield-button {
+       height: 1.85em;
+       }
+
+.v-ie7 .v-datefield-small .v-datefield-button {
+       height: 1.75em;
+       }
+
+.v-ie7 .v-datefield-big .v-datefield-button {
+       height: 2em;
+       }
+
+.v-ie8 .v-datefield-button {
+       height: 1.6em;
+       padding: 0;
+       }
+
+.v-ie8 .v-datefield-big .v-datefield-button {
+       height: 1.8em;
        }
 
 input.v-datefield-textfield {
@@ -23,7 +64,6 @@ input.v-datefield-textfield {
  * Big
  ******************************************************************************/
 .v-datefield-big .v-datefield-button {
-       height: 1.85em;
        width: 32px;
        background-image: url(../../img/date-btn-big.png);
        }
@@ -33,7 +73,6 @@ input.v-datefield-textfield {
  * Small
  ******************************************************************************/
 .v-datefield-small .v-datefield-button {
-       height: 1.62em;
        width: 19px;
        background-position: 50% -2px;
        }
@@ -239,9 +278,11 @@ td.v-datefield-calendarpanel-nextyear {
        -moz-border-radius: 2px;
        }
 
+.v-datefield-calendarpanel-day-focused,
 .v-datefield-calendarpanel-day:hover {
        margin: 0 0 0 .2em;
        border: 1px solid #b3b3b3;
+       outline: none;
        }
 
 .v-datefield-calendarpanel-day-today {
index 225ccba0338223384bd39f2f6917632fc2b289a0..00c8ed245708821dbae37566157caa6c1b259e9a 100644 (file)
@@ -20,4 +20,9 @@
 
 .v-menubar-submenu .v-menubar-submenu-indicator {
        margin-top: .1em;
+       }
+
+.v-menubar-submenu .v-menubar-menuitem-selected {
+       background-image: url(../../img/grad-light-top2.png);
+       background-position: 0 -1px;
        }
\ No newline at end of file
index f9937d3f973f1006085b6a8befc13126c90634da..1d690f203543606aaa97c9da3e824daa7ac17e1a 100644 (file)
@@ -121,6 +121,11 @@ body .v-filterselect-suggestpopup-big td {
        -ms-user-select: none;
        }
 
+.v-filterselect-suggestmenu .gwt-menuItem-selected {
+       background-image: url(../../img/grad-light-top2.png);
+       background-position: 0 -1px;
+       }
+
 .v-filterselect-suggestpopup-small .v-filterselect-status {
        font-size: .8em;
        }
index 0974f7588bdcf8d9a41d750ad6cf2c2899a84c15..b1aa9bef39c280aec078d55dd7f9f555b3f2eaab 100644 (file)
@@ -38,10 +38,19 @@ div.v-table-focus-slot-left {
        margin: 0;
        }
 
+.v-table-row,
+.v-table-row-odd {
+       background: transparent;
+       }
+
 .v-table-generated-row {
     background: #c9c9c9;
     }
 
+.v-table tr.v-selected {
+       background-image: url(/vaadin-demo-site/VAADIN/themes/chameleon/img/grad-light-top2.png);
+       background-position: 0 -1px;
+       }
 
 div.v-table-focus-slot-right {
        background: transparent;
index 6b5558789a602d1ca0132a9c04af48ce57808dce..9fa38dd73f9791222efb3113cef2d9989abff404 100644 (file)
@@ -12,10 +12,16 @@ textarea.v-textarea,
        -moz-border-radius: 2px;
        -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.2);
        -moz-box-shadow: 0 1px 0 rgba(255,255,255,.2);
-       padding: .1em .2em;
        margin: 0;
        }
 
+input.v-textfield[type="text"],
+textarea.v-textarea,
+.v-filterselect {
+       padding: .2em;
+       height: 1.2em;
+       }
+
 body input.v-textfield,
 body textarea.v-textarea,
 body input.v-filterselect-input {
index 8da35812917e8c0a553c1e0f1cb013aaa1a41b4c..e2ab7f208091933ad9bfdebd334abb2bece84593 100644 (file)
@@ -28,6 +28,8 @@
 .sidebar-menu .selected {
        font-weight: bold;
        background-color: #333;
+       background-image: url(../../img/grad-light-top2.png);
+       background-position: 0 -1px;
        color: #fff;
        }