Revision: 6886
Author: [email protected]
Date: Thu Nov 12 14:52:16 2009
Log: Merging /tr...@r6883 into /releases/2.0.

http://code.google.com/p/google-web-toolkit/source/detail?r=6886

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/branch-info.txt       Thu Nov 12 14:39:43 2009
+++ /releases/2.0/branch-info.txt       Thu Nov 12 14:52:16 2009
@@ -617,3 +617,8 @@
  tr...@6884 was merged into this branch
   Synchronizing OophmSessionHandler#loadModule() to prevent multiple  
modules from loading at the same time.
      svn merge --ignore-ancestry -c6884  
http://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@6883 was merged into this branch
+ Fixed stupid style error in Mail's stack panel headers.
+    svn merge --ignore-ancestry -c6883  
http://google-web-toolkit.googlecode.com/svn/trunk/ .
+
=======================================
---  
/releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml
        
Tue Nov 10 14:44:37 2009
+++  
/releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.ui.xml
        
Thu Nov 12 14:52:16 2009
@@ -45,17 +45,17 @@

    <g:StackLayoutPanel styleName='{style.shortcuts}' unit='EM'>
      <g:stack>
-      <g:header size='3'><div class='{style.mailboxesIcon}'/>  
Mailboxes</g:header>
+      <g:header size='3'><div class='{style.stackHeader}'><div  
class='{style.mailboxesIcon}'/> Mailboxes</div></g:header>
        <mail:Mailboxes ui:field='mailboxes'/>
      </g:stack>

      <g:stack>
-      <g:header size='3'><div class='{style.tasksIcon}'/> Tasks</g:header>
+      <g:header size='3'><div class='{style.stackHeader}'><div  
class='{style.tasksIcon}'/> Tasks</div></g:header>
        <mail:Tasks ui:field='tasks'/>
      </g:stack>

      <g:stack>
-      <g:header size='3'><div class='{style.contactsIcon}'/>  
Contacts</g:header>
+      <g:header size='3'><div class='{style.stackHeader}'><div  
class='{style.contactsIcon}'/> Contacts</div></g:header>
        <mail:Contacts ui:field='contacts'/>
      </g:stack>
    </g:StackLayoutPanel>

-- 
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to