Merge "ChangeScreen2: Fix click inside of messages" into stable-2.8
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.ui.xml
index bb2a04e..a4b19ff 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Actions.ui.xml
@@ -27,7 +27,7 @@
margin: 6px 3px 0 0;
border-color: rgba(0, 0, 0, 0.1);
text-align: center;
- font-size: 11px;
+ font-size: 8pt;
font-weight: bold;
border: 1px solid;
cursor: pointer;
@@ -61,7 +61,6 @@
#change_actions button.submit {
float: right;
- color: white;
background-color: #4d90fe;
background-image: -webkit-linear-gradient(top, #4d90fe, #4d90fe);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
index ce8a062..9f9bdce 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
@@ -213,7 +213,7 @@
margin: 6px 3px 0 0;
border-color: rgba(0, 0, 0, 0.1);
text-align: center;
- font-size: 11px;
+ font-size: 8pt;
font-weight: bold;
border: 1px solid;
cursor: pointer;
@@ -231,7 +231,6 @@
white-space: nowrap;
}
button.quickApprove {
- color: #fff;
background-color: #4d90fe;
background-image: -webkit-linear-gradient(top, #4d90fe, #4d90fe);
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
index 2579cb8..b757dd1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
@@ -95,8 +95,8 @@
cursor: pointer;
}
.difftable .CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
- opacity: 0.8;
- z-index: 2;
+ background: transparent;
+ text-decoration: underline;
}
.showtabs .cm-tab:before {
content: "\00bb";
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index 9897f9a..393ff73 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -463,6 +463,8 @@
}
Configuration cfg = Configuration.create()
.set("readOnly", true)
+ .set("cursorBlinkRate", 0)
+ .set("cursorHeight", 0.85)
.set("lineNumbers", true)
.set("tabSize", pref.getTabSize())
.set("mode", getContentType(meta))
diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java
index 862e0f7..ab031eb 100644
--- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java
+++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java
@@ -33,6 +33,9 @@
public final native Configuration set(String name, int val)
/*-{ this[name] = val; return this; }-*/;
+ public final native Configuration set(String name, double val)
+ /*-{ this[name] = val; return this; }-*/;
+
public final native Configuration set(String name, boolean val)
/*-{ this[name] = val; return this; }-*/;
