Merge branch 'Microsoft/master' into update-css-intellisense

# Conflicts:
#	src/vs/languages/html/common/htmlTags.ts
This commit is contained in:
David Storey
2015-12-08 17:03:17 -08:00
parent db6f0f960e
commit 23db8835f5
504 changed files with 30211 additions and 27525 deletions

View File

@@ -14,5 +14,15 @@
"border: ${width} ${border-style} ${color};$0"
],
"description": "[width] [border-style] [color]"
},
"gradient": {
"prefix": "gradient",
"body": [
"background-image: -moz-linear-gradient(top, ${start-color}, ${end-color});",
"background-image: -webkit-gradient(linear, left top, left bottom, from(${start-color}), to(${end-color}));",
"background-image: -webkit-linear-gradient(top, ${start-color}, ${end-color});",
"background-image: linear-gradient(top, ${start-color}, ${end-color});"
],
"description": "Set the 'background-image' property to a linear gradient"
}
}
}