Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (40 commits) Poll, StatusContent: Move emoji css to status body. remove recentqueries thing fix width of long field value change key-value to look like one revert import style return the correct promise type from action update changelog remove search blocker, fix debounce params resume the previous emoji size for now restyle the fields Update popover.js update changelog disable subject field when posting remove log whoops fix popovers cutting off in notifications, port popover changes from chats mr Changelog: Add info about poll option emoji. changelog Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js Polls: Construct an html field during normalization. fix #866 ...
This commit is contained in:
commit
eb10e7edf6
30 changed files with 226 additions and 181 deletions
|
|
@ -286,7 +286,9 @@
|
|||
"cGreen": "#008000",
|
||||
"cOrange": "#808000",
|
||||
"highlight": "--accent",
|
||||
"selectedPost": "--bg,-10"
|
||||
"selectedPost": "--bg,-10",
|
||||
"selectedMenu": "--accent",
|
||||
"selectedMenuPopover": "--accent"
|
||||
},
|
||||
"radii": {
|
||||
"btn": "0",
|
||||
|
|
|
|||
|
|
@ -277,7 +277,9 @@
|
|||
"cGreen": "#008000",
|
||||
"cOrange": "#808000",
|
||||
"highlight": "--accent",
|
||||
"selectedPost": "--bg,-10"
|
||||
"selectedPost": "--bg,-10",
|
||||
"selectedMenu": "--accent",
|
||||
"selectedMenuPopover": "--accent"
|
||||
},
|
||||
"radii": {
|
||||
"btn": "0",
|
||||
|
|
|
|||
|
|
@ -259,7 +259,9 @@
|
|||
"cGreen": "#669966",
|
||||
"cOrange": "#cc6633",
|
||||
"highlight": "--accent",
|
||||
"selectedPost": "--bg,-10"
|
||||
"selectedPost": "--bg,-10",
|
||||
"selectedMenu": "--accent",
|
||||
"selectedMenuPopover": "--accent"
|
||||
},
|
||||
"radii": {
|
||||
"btn": "0",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue