Move more IE6 urls out of war and into resource space
Review by bobv
Manually tested on Safari, Ie6, Ie7, Mac Chrome
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7333 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml b/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml
index 51ca45e..cf30cca 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml
@@ -3,6 +3,13 @@
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:mail='urn:import:com.google.gwt.sample.mail.client'>
+ <!--
+ GIFs needed for ie6 work arounds. Can't use <ui:image>, it makes PNGs
+ -->
+ <ui:data field='mailboxesgroupIe6Data' src='mailboxesgroup_ie6.gif' />
+ <ui:data field='tasksgroupIe6Data' src='tasksgroup_ie6.gif' />
+ <ui:data field='contactsgroupIe6Data' src='contactsgroup_ie6.gif' />
+
<ui:style>
.shortcuts {
border-left: 1px solid #999;
@@ -24,26 +31,30 @@
}
@if user.agent ie6 {
- .mailboxesIcon {
- background-image: url(mailboxesgroup_ie6.gif);
- width: 31px;
- height: 22px;
- float: left;
- }
-
- .tasksIcon {
- background-image: url(tasksgroup_ie6.gif);
+ @url mailboxesgroupIe6 mailboxesgroupIe6Data;
+ @url tasksgroupIe6 tasksgroupIe6Data;
+ @url contactsgroupIe6 contactsgroupIe6Data;
+
+ .mailboxesIcon {
+ background-image: mailboxesgroupIe6;
width: 31px;
height: 22px;
- float: left;
- }
-
- .contactsIcon {
- background-image: url(contactsgroup_ie6.gif);
+ float: left;
+ }
+
+ .tasksIcon {
+ background-image: tasksgroupIe6;
width: 31px;
height: 22px;
- float: left;
- }
+ float: left;
+ }
+
+ .contactsIcon {
+ background-image: contactsgroupIe6;
+ width: 31px;
+ height: 22px;
+ float: left;
+ }
} @else {
@sprite .mailboxesIcon {
gwt-image: 'mailboxesgroup';
@@ -59,7 +70,7 @@
gwt-image: 'contactsgroup';
float: left;
}
- }
+ }
</ui:style>
<ui:image field='mailboxesgroup' src='mailboxesgroup.png'/>
diff --git a/samples/mail/war/contactsgroup_ie6.gif b/samples/mail/src/com/google/gwt/sample/mail/client/contactsgroup_ie6.gif
similarity index 100%
rename from samples/mail/war/contactsgroup_ie6.gif
rename to samples/mail/src/com/google/gwt/sample/mail/client/contactsgroup_ie6.gif
Binary files differ
diff --git a/samples/mail/war/mailboxesgroup_ie6.gif b/samples/mail/src/com/google/gwt/sample/mail/client/mailboxesgroup_ie6.gif
similarity index 100%
rename from samples/mail/war/mailboxesgroup_ie6.gif
rename to samples/mail/src/com/google/gwt/sample/mail/client/mailboxesgroup_ie6.gif
Binary files differ
diff --git a/samples/mail/war/tasksgroup_ie6.gif b/samples/mail/src/com/google/gwt/sample/mail/client/tasksgroup_ie6.gif
similarity index 100%
rename from samples/mail/war/tasksgroup_ie6.gif
rename to samples/mail/src/com/google/gwt/sample/mail/client/tasksgroup_ie6.gif
Binary files differ
