aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-sheet.reel/style-sheet.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/css-panel/style-sheet.reel/style-sheet.html
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/css-panel/style-sheet.reel/style-sheet.html')
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html
index 7e27dd93..d08453fa 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
27 "properties": { 27 "properties": {
28 "element": {"#": "sheet-name"}, 28 "element": {"#": "sheet-name"},
29 "identifier": "nameText", 29 "identifier": "nameText",
30 "defaultText": "Style sheet" 30 "defaultValue": "Style sheet"
31 }, 31 },
32 "bindings": { 32 "bindings": {
33 "value": {"<-": "@owner.name"} 33 "value": {"<-": "@owner.name"}