| commit | 1f277d5c43904b083b3b2731dc88044005194d79 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Dec 04 09:45:22 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 04 09:45:22 2015 +0000 |
| tree | cacb0db6da5fdb906d55457fcae70eba75ae0438 | |
| parent | 9d60d90661d5ec74bebaf1e996c4456ecabea3df [diff] | |
| parent | 6838481185e10988a764503d0a8f2621c387bd13 [diff] |
Merge "Do not wrap nav links in unified diff view" into stable-2.12
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java index d7f878f..7735e1d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
@@ -142,6 +142,7 @@ String needsReview(); String negscore(); String noborder(); + String nowrap(); String pagingLink(); String patchBrowserPopup(); String patchBrowserPopupBody();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css index 0987e83..a511550 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -630,6 +630,10 @@ padding-right: 3px; } +.nowrap { + white-space: nowrap; +} + /** PatchContentTable **/ .patchContentTable {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/NavLinks.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/NavLinks.java index 8491c61..c7f9859 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/NavLinks.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/NavLinks.java
@@ -99,6 +99,7 @@ /* setup the cells */ if (link != null) { + link.addStyleName(Gerrit.RESOURCES.css().nowrap()); table.setWidget(0, nav.col, link); } else { table.clearCell(0, nav.col);