diff options
author | Nivesh Rajbhandari | 2012-04-05 10:31:45 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-05 10:31:45 -0700 |
commit | 55f4835aa33546f5cd27e501ed461a0f7eb5038b (patch) | |
tree | 2bac6f39d12fcf2116a7f79acf45c1672d6f5522 /js/panels/presets/default-style-presets.js | |
parent | 4ae2fd54e3844d788536dd00814c6aad0aa9f121 (diff) | |
download | ninja-55f4835aa33546f5cd27e501ed461a0f7eb5038b.tar.gz |
Undoing mistakes from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/presets/default-style-presets.js')
-rw-r--r-- | js/panels/presets/default-style-presets.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js index 82bec34f..10b24ff4 100644 --- a/js/panels/presets/default-style-presets.js +++ b/js/panels/presets/default-style-presets.js | |||
@@ -11,9 +11,9 @@ exports.stylePresets = { | |||
11 | "children": [ | 11 | "children": [ |
12 | { | 12 | { |
13 | "text": "Border-Radius", | 13 | "text": "Border-Radius", |
14 | "id": "njBorderRadius", | ||
14 | "selectorBase" : "border-radius-preset", | 15 | "selectorBase" : "border-radius-preset", |
15 | "rules" : [{ | 16 | "rules" : [{ |
16 | "selectorSuffix" : "", | ||
17 | "styles" : { | 17 | "styles" : { |
18 | "border-radius": "100px", | 18 | "border-radius": "100px", |
19 | "border" : "1px solid #333" | 19 | "border" : "1px solid #333" |
@@ -22,9 +22,9 @@ exports.stylePresets = { | |||
22 | }, | 22 | }, |
23 | { | 23 | { |
24 | "text": "Drop Shadow", | 24 | "text": "Drop Shadow", |
25 | "id": "njDropShadow", | ||
25 | "selectorBase" : "drop-shadow", | 26 | "selectorBase" : "drop-shadow", |
26 | "rules" : [{ | 27 | "rules" : [{ |
27 | "selectorSuffix" : "", | ||
28 | "styles" : { | 28 | "styles" : { |
29 | "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", | 29 | "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)", |
30 | "border" : "1px solid #CCC" | 30 | "border" : "1px solid #CCC" |
@@ -33,9 +33,10 @@ exports.stylePresets = { | |||
33 | }, | 33 | }, |
34 | { | 34 | { |
35 | "text": "Fancy Box", | 35 | "text": "Fancy Box", |
36 | "id": "njFancyBox", | ||
36 | "selectorBase" : "fancy-box", | 37 | "selectorBase" : "fancy-box", |
37 | "rules" : [{ | 38 | "rules" : [{ |
38 | "selectorSuffix" : "", | 39 | "selectorSuffix": "", |
39 | "styles" : { | 40 | "styles" : { |
40 | "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", | 41 | "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333", |
41 | "border" : "1px solid #FFF", | 42 | "border" : "1px solid #FFF", |
@@ -50,9 +51,9 @@ exports.stylePresets = { | |||
50 | "children": [ | 51 | "children": [ |
51 | { | 52 | { |
52 | "text": "Italic", | 53 | "text": "Italic", |
54 | "id": "njItalic", | ||
53 | "selectorBase" : "italicize", | 55 | "selectorBase" : "italicize", |
54 | "rules" : [{ | 56 | "rules" : [{ |
55 | "selectorSuffix" : "", | ||
56 | "styles" : { | 57 | "styles" : { |
57 | "font-style": "italic" | 58 | "font-style": "italic" |
58 | } | 59 | } |
@@ -60,9 +61,9 @@ exports.stylePresets = { | |||
60 | }, | 61 | }, |
61 | { | 62 | { |
62 | "text": "Text Shadow", | 63 | "text": "Text Shadow", |
64 | "id": "njTextShadow", | ||
63 | "selectorBase" : "italicize", | 65 | "selectorBase" : "italicize", |
64 | "rules" : [{ | 66 | "rules" : [{ |
65 | "selectorSuffix" : "", | ||
66 | "styles" : { | 67 | "styles" : { |
67 | "text-shadow": "1px 1px 3px #333" | 68 | "text-shadow": "1px 1px 3px #333" |
68 | } | 69 | } |