diff options
| author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
| commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
| tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/components/tools-properties/tag-properties.reel | |
| parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
| parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
| download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel')
| -rw-r--r-- | js/components/tools-properties/tag-properties.reel/tag-properties.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index c7588b9e..2b81bb71 100644 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html | |||
| @@ -56,9 +56,9 @@ | |||
| 56 | <label class="label"> Tag Name:</label> | 56 | <label class="label"> Tag Name:</label> |
| 57 | 57 | ||
| 58 | <select id="customTagCB" class="nj-skinned"> | 58 | <select id="customTagCB" class="nj-skinned"> |
| 59 | <option>Article</option> | 59 | <option>article</option> |
| 60 | <option>Aside</option> | 60 | <option>aside</option> |
| 61 | <option>Section</option> | 61 | <option>section</option> |
| 62 | </select> | 62 | </select> |
| 63 | </div> | 63 | </div> |
| 64 | 64 | ||