diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /devtools | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.gz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.lz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.tar.xz UXP-5165ed02285315cc0bed7977c7bac6d0a90ca43c.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/client/menus.js | 2 | ||||
| -rw-r--r-- | devtools/shared/css/generated/properties-db.js | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/devtools/client/menus.js b/devtools/client/menus.js index 23f024f04..9b3d3c0b3 100644 --- a/devtools/client/menus.js +++ b/devtools/client/menus.js @@ -94,7 +94,7 @@ exports.menuitems = [ }, key: { id: "browserToolbox", - modifiers: "accel,alt,shift", + modifiers: isMac ? "accel,alt" : "accel,shift", keytext: true } }, diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js index 01358a033..d149995d9 100644 --- a/devtools/shared/css/generated/properties-db.js +++ b/devtools/shared/css/generated/properties-db.js @@ -1233,7 +1233,7 @@ exports.CSS_PROPERTIES = { "-moz-tab-size": { "isInherited": true, "subproperties": [ - "-moz-tab-size" + "tab-size" ], "supports": [ 7 @@ -3052,7 +3052,7 @@ exports.CSS_PROPERTIES = { "stroke-opacity", "stroke-width", "-x-system-font", - "-moz-tab-size", + "tab-size", "table-layout", "text-align", "text-align-last", @@ -8650,6 +8650,23 @@ exports.CSS_PROPERTIES = { "unset" ] }, + "tab-size": { + "isInherited": true, + "subproperties": [ + "tab-size" + ], + "supports": [ + 6, + 7 + ], + "values": [ + "-moz-calc", + "calc", + "inherit", + "initial", + "unset" + ] + }, "table-layout": { "isInherited": false, "subproperties": [ |