Merge branch 'stable-3.1'

* stable-3.1:
  Add copy-to-clipboard for generated password
  Fix assertions to use isEmpty() rather than hasSize(0)
  Fix gr-syntax-params css class
  entities.Comment: remove legacyFormat member
  ChangeUpdate#setStatus: Fix error message
  Enable doctag in syntax highlighter
  Use '2g' when referring to 2 Gigabytes of streamFileThreshold

Change-Id: I2e96c76625e1b115bd3ce2e7f4e1fd6741b7792e
This commit is contained in:
David Pursehouse 2019-11-22 15:13:24 +09:00
commit e8757c992f
5 changed files with 11 additions and 6 deletions

View File

@ -1670,7 +1670,7 @@ Setting this too high may cause the JVM to run out of heap space
when handling very big binary files, such as device firmware or
CD-ROM ISO images.
+
Defaults to 25% of the available JVM heap, limited to 2048m.
Defaults to 25% of the available JVM heap, limited to 2g.
+
Common unit suffixes of 'k', 'm', or 'g' are supported.

View File

@ -100,6 +100,7 @@
'gr-diff gr-syntax gr-syntax-attribute': true,
'gr-diff gr-syntax gr-syntax-built_in': true,
'gr-diff gr-syntax gr-syntax-comment': true,
'gr-diff gr-syntax gr-syntax-doctag': true,
'gr-diff gr-syntax gr-syntax-function': true,
'gr-diff gr-syntax gr-syntax-keyword': true,
'gr-diff gr-syntax gr-syntax-link': true,

View File

@ -99,8 +99,11 @@ limitations under the License.
.gr-syntax-template-tag {
color: var(--syntax-template-tag-color);
}
.gr-syntax-param {
color: var(--syntax-param-color);
.gr-syntax-params {
color: var(--syntax-params-color);
}
.gr-syntax-doctag {
font-weight: var(--syntax-doctag-weight);
}
</style>
</template>

View File

@ -142,6 +142,7 @@ html {
--syntax-built_in-color: #30a;
--syntax-comment-color: #3f7f5f;
--syntax-default-color: var(--primary-text-color);
--syntax-doctag-weight: bold;
--syntax-function-color: var(--primary-text-color);
--syntax-keyword-color: #9e0069;
--syntax-link-color: #219;
@ -149,7 +150,7 @@ html {
--syntax-meta-color: #ff1717;
--syntax-meta-keyword-color: #219;
--syntax-number-color: #164;
--syntax-param-color: var(--primary-text-color);
--syntax-params-color: var(--primary-text-color);
--syntax-regexp-color: #fa8602;
--syntax-selector-attr-color: #fa8602;
--syntax-selector-class-color: #164;
@ -162,7 +163,6 @@ html {
--syntax-title-color: #0000c0;
--syntax-type-color: #2a66d9;
--syntax-variable-color: var(--primary-text-color);
/* misc */
--border-radius: 4px;
--reply-overlay-z-index: 1000;

View File

@ -112,6 +112,7 @@ limitations under the License.
--syntax-built_in-color: #f7c369;
--syntax-comment-color: var(--deemphasized-text-color);
--syntax-default-color: var(--primary-text-color);
--syntax-doctag-weight: bold;
--syntax-function-color: var(--primary-text-color);
--syntax-keyword-color: #cd4cf0;
--syntax-link-color: #c792ea;
@ -119,7 +120,7 @@ limitations under the License.
--syntax-meta-color: #6d7eee;
--syntax-meta-keyword-color: #eefff7;
--syntax-number-color: #00998a;
--syntax-param-color: var(--primary-text-color);
--syntax-params-color: var(--primary-text-color);
--syntax-regexp-color: #f77669;
--syntax-selector-attr-color: #80cbbf;
--syntax-selector-class-color: #ffcb68;