You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by do...@apache.org on 2013/09/12 05:59:50 UTC
svn commit: r1522282 - in
/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui:
FolderListView.java __OutlinePanel.ui.xml
Author: dongxu
Date: Thu Sep 12 03:59:50 2013
New Revision: 1522282
URL: http://svn.apache.org/r1522282
Log:
fine tuning on folder list footer panel's border
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522282&r1=1522281&r2=1522282&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java Thu Sep 12 03:59:50 2013
@@ -233,7 +233,6 @@ public class FolderListView extends Comp
@AssistedInject
public FolderListView(final FoldersTreeViewModel viewModel,
final EventBus eventBus, @Assisted Place place) {
- System.out.println(place);
if (place instanceof MailFolderPlace) {
cellTree = new CellTree(viewModel, null, Resources.INSTANCE);
cellTree.setAnimationEnabled(true);
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml?rev=1522282&r1=1522281&r2=1522282&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml Thu Sep 12 03:59:50 2013
@@ -13,6 +13,7 @@
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<ui:style>
<<<<<<< HEAD
+<<<<<<< HEAD
.box {
border: 1px solid #A3A3A3;
border-radius: 4px;
@@ -39,6 +40,8 @@
<<<<<<< HEAD
=======
+=======
+>>>>>>> fine tuning on folder list footer panel's border
.box {
border: 1px solid #A3A3A3;
border-radius: 4px;
@@ -50,7 +53,21 @@
background: white;
}
+<<<<<<< HEAD
>>>>>>> split the layout panel to more small ones
+=======
+ .folderList {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ min-width: 144px;
+ bottom: 0;
+ overflow-x: hidden;
+ overflow-y: auto;
+ }
+
+>>>>>>> fine tuning on folder list footer panel's border
.listBox {
background: #D9ECF4;
overflow: hidden;
@@ -59,13 +76,19 @@
.box .boxFooter {
border-radius: 0 0 4px 4px;
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fine tuning on folder list footer panel's border
border-top: 1px solid #ccdde4;
-webkit-box-shadow: inset 0 1px 0 0 #fff;
-moz-box-shadow: inset 0 1px 0 0 #fff;
box-shadow: inset 0 1px 0 0 #fff;
background: #d9ecf4;
+<<<<<<< HEAD
=======
>>>>>>> split the layout panel to more small ones
+=======
+>>>>>>> fine tuning on folder list footer panel's border
}
</ui:style>
<g:DockLayoutPanel unit="PX" ui:field="thisPanel"
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org