summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2008-12-04 19:15:42 -0800
committerShawn O. Pearce <sop@google.com>2008-12-04 19:15:42 -0800
commit59ee46c677c89a90c8e315d2264a990f504d8886 (patch)
tree1e5d09d2ee0c783aa250fcaf08799f3769d8e3aa /webapp
parentf1fe3367a0e2a43107aaf60ad14e395689acc842 (diff)
Cleanup formatting on Firefox 2, 3 and Safari
The sign in dialog wasn't quite tall enough, now it is. But its far too large for the Android web browser. The change info block is now folded up with the description, fixing the layout problems it was having on Firefox 3 where it forced the description down lower on the page, and on Firefox 2 when the window was too narrow. Signed-off-by: Shawn O. Pearce <sop@google.com>
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/com/google/gerrit/client/SignInDialog.java2
-rw-r--r--webapp/src/com/google/gerrit/client/changes/ApprovalTable.java1
-rw-r--r--webapp/src/com/google/gerrit/client/changes/ChangeScreen.java17
-rw-r--r--webapp/src/com/google/gerrit/client/changes/PatchTable.java9
-rw-r--r--webapp/src/com/google/gerrit/public/Gerrit.css20
5 files changed, 39 insertions, 10 deletions
diff --git a/webapp/src/com/google/gerrit/client/SignInDialog.java b/webapp/src/com/google/gerrit/client/SignInDialog.java
index 5344fbb926..66129ad0b5 100644
--- a/webapp/src/com/google/gerrit/client/SignInDialog.java
+++ b/webapp/src/com/google/gerrit/client/SignInDialog.java
@@ -71,7 +71,7 @@ public class SignInDialog extends DialogBox {
loginFrame = new Frame();
loginFrame.setWidth("630px");
- loginFrame.setHeight("420px");
+ loginFrame.setHeight("440px");
add(loginFrame);
setText(Gerrit.C.signInDialogTitle());
}
diff --git a/webapp/src/com/google/gerrit/client/changes/ApprovalTable.java b/webapp/src/com/google/gerrit/client/changes/ApprovalTable.java
index 1c86dbba25..5afb2b7291 100644
--- a/webapp/src/com/google/gerrit/client/changes/ApprovalTable.java
+++ b/webapp/src/com/google/gerrit/client/changes/ApprovalTable.java
@@ -61,6 +61,7 @@ public class ApprovalTable extends Composite {
private void applyEdgeStyles(final int row) {
final CellFormatter fmt = table.getCellFormatter();
fmt.addStyleName(row, 0, "leftmost");
+ fmt.addStyleName(row, 0, "reviewer");
fmt.addStyleName(row, 1, "approvalrole");
fmt.addStyleName(row, 1 + types.size(), "rightmost");
fmt.addStyleName(row, 2 + types.size(), "approvalhint");
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeScreen.java b/webapp/src/com/google/gerrit/client/changes/ChangeScreen.java
index e80f96682c..3bcde25ca0 100644
--- a/webapp/src/com/google/gerrit/client/changes/ChangeScreen.java
+++ b/webapp/src/com/google/gerrit/client/changes/ChangeScreen.java
@@ -27,6 +27,7 @@ import com.google.gwt.i18n.client.LocaleInfo;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.DisclosurePanel;
import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
@@ -80,15 +81,23 @@ public class ChangeScreen extends Screen {
addStyleName("gerrit-ChangeScreen");
infoBlock = new ChangeInfoBlock();
- add(infoBlock);
description = new Label();
description.setStyleName("gerrit-ChangeScreen-Description");
descriptionPanel = new DisclosurePanel(Util.C.changeScreenDescription());
- descriptionPanel.setContent(description);
- descriptionPanel.setWidth("100%");
- add(descriptionPanel);
+ {
+ final Label glue = new Label();
+ final HorizontalPanel hp = new HorizontalPanel();
+ hp.add(description);
+ hp.add(glue);
+ hp.add(infoBlock);
+ hp.setCellWidth(glue, "100%");
+ add(hp);
+ descriptionPanel.setContent(hp);
+ descriptionPanel.setWidth("100%");
+ add(descriptionPanel);
+ }
dependencies = new ChangeTable();
dependsOn = new ChangeTable.Section(Util.C.changeScreenDependsOn());
diff --git a/webapp/src/com/google/gerrit/client/changes/PatchTable.java b/webapp/src/com/google/gerrit/client/changes/PatchTable.java
index 1baacc7a35..257e4b0648 100644
--- a/webapp/src/com/google/gerrit/client/changes/PatchTable.java
+++ b/webapp/src/com/google/gerrit/client/changes/PatchTable.java
@@ -63,13 +63,20 @@ public class PatchTable extends FancyFlexTable<Patch> {
super.applyDataRowStyle(row);
final CellFormatter fmt = table.getCellFormatter();
fmt.addStyleName(row, C_TYPE, "ChangeTypeCell");
+
fmt.addStyleName(row, C_NAME, S_DATA_CELL);
- fmt.addStyleName(row, C_NAME, "NoWrap");
+ fmt.addStyleName(row, C_NAME, "FilePathCell");
+
fmt.addStyleName(row, C_DELTA, S_DATA_CELL);
+
fmt.addStyleName(row, C_COMMENTS, S_DATA_CELL);
fmt.addStyleName(row, C_COMMENTS, "CommentCell");
+
fmt.addStyleName(row, C_DIFF + 0, S_DATA_CELL);
+ fmt.addStyleName(row, C_DIFF + 0, "DiffLinkCell");
+
fmt.addStyleName(row, C_DIFF + 1, S_DATA_CELL);
+ fmt.addStyleName(row, C_DIFF + 1, "DiffLinkCell");
}
public void display(final List<Patch> list) {
diff --git a/webapp/src/com/google/gerrit/public/Gerrit.css b/webapp/src/com/google/gerrit/public/Gerrit.css
index fc616d3178..0d3d011fcd 100644
--- a/webapp/src/com/google/gerrit/public/Gerrit.css
+++ b/webapp/src/com/google/gerrit/public/Gerrit.css
@@ -137,8 +137,12 @@
white-space: nowrap;
}
-.gerrit-ChangeTable .NoWrap {
- white-space: nowrap;
+.gerrit-ChangeTable .FilePathCell {
+ white-space: nowrap;
+}
+
+.gerrit-ChangeTable .DiffLinkCell {
+ white-space: nowrap;
}
.gerrit-ChangeTable .DataCell {
@@ -189,6 +193,10 @@
font-weight: bold;
}
+.gerrit-ChangeScreen .gwt-DisclosurePanel .content {
+ margin-bottom: 10px;
+}
+
.gerrit-ChangeScreen-Description {
white-space: pre;
font-family: Courier New, Courier, monospace;
@@ -224,10 +232,15 @@
border-right: 1px solid #d4e9a9;
}
+.gerrit-InfoTable td.reviewer {
+ white-space: nowrap;
+}
+
.gerrit-InfoTable td.approvalrole {
width: 5em;
border-left: none;
font-style: italic;
+ white-space: nowrap;
}
.gerrit-InfoTable td.approvalscore {
@@ -241,6 +254,7 @@
}
.gerrit-InfoTable td.approvalhint {
+ white-space: nowrap;
background-left: 1px none;
background-bottom: 1px none;
border: none;
@@ -248,8 +262,6 @@
}
.gerrit-ChangeInfoBlock {
- float: right;
- clear: right;
}
.gerrit-InfoBlock {