Merge branch 'master' of github.com:rstudio/rstudio

rstudio · Oct 26, 2011 · 31235cb · 31235cb
2 parents 910a0be + 503ad17
commit 31235cb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/dialog/HistoryPanel.css b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/dialog/HistoryPanel.css
@@ -20,22 +20,17 @@
 }
 
 .head {
-   background-color: rgb(146, 193, 240);
-   border-color: rgb(146, 193, 240);
+   background-color: rgb(182, 231, 231);
 }
 
 .branch {
-   background-color: purple;
-   border-color: purple;
-   color: white;
+   background-color: rgb(206, 182, 251);
 }
 
 .remote {
-   background-color: pink;
-   border-color: pink;
+   background-color: rgb(213, 218, 255);
 }
 
 .tag {
-   font-weight: normal;
-   background-color: #FFA;
+   background-color: rgb(255, 229, 170);
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/dialog/HistoryPanel.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/dialog/HistoryPanel.java
@@ -21,6 +21,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.cellview.client.SimplePager;
 import com.google.gwt.user.cellview.client.SimplePager.Resources;
+import com.google.gwt.user.cellview.client.SimplePager.Style;
 import com.google.gwt.user.cellview.client.SimplePager.TextLocation;
 import com.google.gwt.user.client.ui.*;
 import com.google.gwt.view.client.HasData;
@@ -83,6 +84,16 @@ interface SimplePagerResources extends SimplePager.Resources
       @Override
       @Source("images/PagePreviousButtonDisabled.png")
       ImageResource simplePagerPreviousPageDisabled();
+
+      @Override
+      @Source({"com/google/gwt/user/cellview/client/SimplePager.css",
+              "SimplePagerStyle.css"})
+      SimplePagerStyle simplePagerStyle();
+   }
+
+   interface SimplePagerStyle extends SimplePager.Style
+   {
+
    }
 
    public interface Styles extends SharedStyles
@@ -111,6 +122,7 @@ public HistoryPanel(BranchToolbarButton branchToolbarButton,
             TextLocation.CENTER,
             GWT.<SimplePagerResources>create(SimplePagerResources.class),
             true, 500, true);
+      pager_.getElement().setAttribute("align", "center");
 
       initWidget(GWT.<Binder>create(Binder.class).createAndBindUi(this));
 

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/dialog/SimplePagerStyle.css b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/dialog/SimplePagerStyle.css
@@ -0,0 +1,8 @@
+.pageDetails {
+   min-width: 120px;
+}
+
+.button img {
+   display: block;
+   position: relative;
+}