summaryrefslogtreecommitdiffstats
path: root/devtools
diff options
context:
space:
mode:
Diffstat (limited to 'devtools')
-rw-r--r--devtools/client/menus.js2
-rw-r--r--devtools/shared/css/generated/properties-db.js21
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": [