Author: dongxu
Date: Thu Sep 12 03:58:57 2013
New Revision: 1522280
URL: http://svn.apache.org/r1522280
Log:
make fine tuning with tool buttons in toolbar
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522280&r1=1522279&r2=1522280&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Thu Sep 12 03:58:57 2013
@@ -232,10 +232,14 @@
</g:center>
</g:DockLayoutPanel>
</g:layer>
+<<<<<<< HEAD
=======
<g:layer left='10px' right='10px' top='88px' bottom="20px">
+=======
+ <g:layer left='10px' right='10px' top='84px' bottom="20px">
+>>>>>>> make fine tuning with tool buttons in toolbar
<g:DockLayoutPanel ui:field="mainBox">
- <g:north size="40">
+ <g:north size="44">
<hupa:_ToolPanel ui:field="toolPanel" />
</g:north>
<g:center>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml?rev=1522280&r1=1522279&r2=1522280&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.ui.xml
Thu Sep 12 03:58:57 2013
@@ -37,7 +37,7 @@
>>>>>>> beautify message list and content
right: 390px;
left: 0;
- height: 36px;
+ height: 40px;
white-space: nowrap;
z-index: 10;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
