Revision: 6972 Author: j...@google.com Date: Tue Nov 17 14:29:07 2009 Log: Merging trunk c6970 into releases/2.0.
http://code.google.com/p/google-web-toolkit/source/detail?r=6972 Added: /releases/2.0/samples/mail/war/contactsgroup_ie6.gif /releases/2.0/samples/mail/war/logo_ie6.gif /releases/2.0/samples/mail/war/mailboxesgroup_ie6.gif /releases/2.0/samples/mail/war/tasksgroup_ie6.gif Modified: /releases/2.0/branch-info.txt /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/TopPanel.ui.xml ======================================= --- /dev/null +++ /releases/2.0/samples/mail/war/contactsgroup_ie6.gif Tue Nov 17 14:29:07 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /releases/2.0/samples/mail/war/logo_ie6.gif Tue Nov 17 14:29:07 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /releases/2.0/samples/mail/war/mailboxesgroup_ie6.gif Tue Nov 17 14:29:07 2009 Binary file, no diff available. ======================================= --- /dev/null +++ /releases/2.0/samples/mail/war/tasksgroup_ie6.gif Tue Nov 17 14:29:07 2009 Binary file, no diff available. ======================================= --- /releases/2.0/branch-info.txt Tue Nov 17 14:26:01 2009 +++ /releases/2.0/branch-info.txt Tue Nov 17 14:29:07 2009 @@ -737,3 +737,8 @@ Fix font in bottom part of Swing tree logger. svn merge --ignore-ancestry -c6969 \ https://google-web-toolkit.googlecode.com/svn/trunk/ . + +tr...@6970 was merged into this branch + Now using CssResource's @if to provide 1-bit-alpha images on IE6. + svn merge --ignore-ancestry -c6970 https://google-web-toolkit.googlecode.com/svn/trunk/ . + ======================================= --- /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml Thu Nov 12 14:52:16 2009 +++ /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml Tue Nov 17 14:29:07 2009 @@ -22,20 +22,43 @@ border-top: 1px solid #888; } - @sprite .mailboxesIcon { - gwt-image: 'mailboxesgroup'; - float: left; - } - - @sprite .tasksIcon { - gwt-image: 'tasksgroup'; - float: left; - } - - @sprite .contactsIcon { - gwt-image: 'contactsgroup'; - float: left; - } + @if user.agent ie6 { + .mailboxesIcon { + background-image: url(mailboxesgroup_ie6.gif); + width: 31px; + height: 22px; + float: left; + } + + .tasksIcon { + background-image: url(tasksgroup_ie6.gif); + width: 31px; + height: 22px; + float: left; + } + + .contactsIcon { + background-image: url(contactsgroup_ie6.gif); + width: 31px; + height: 22px; + float: left; + } + } @else { + @sprite .mailboxesIcon { + gwt-image: 'mailboxesgroup'; + float: left; + } + + @sprite .tasksIcon { + gwt-image: 'tasksgroup'; + float: left; + } + + @sprite .contactsIcon { + gwt-image: 'contactsgroup'; + float: left; + } + } </ui:style> <ui:image field='mailboxesgroup' src='mailboxesgroup.png'/> ======================================= --- /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/TopPanel.ui.xml Mon Nov 9 11:00:52 2009 +++ /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/TopPanel.ui.xml Tue Nov 17 14:29:07 2009 @@ -18,9 +18,18 @@ text-align: right; } - @sprite .logo { - gwt-image: 'logo'; - position: absolute; + @if user.agent ie6 { + .logo { + background-image: url(logo_ie6.gif); + width: 140px; + height: 75px; + position: absolute; + } + } @else { + @sprite .logo { + gwt-image: 'logo'; + position: absolute; + } } </ui:style> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
