From 25b1d5b1f56af69b3ba922c613b503581d8550f3 Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Wed, 20 May 2015 12:19:12 -0300 Subject: [PATCH] Update and fix Titanium Style Sheets tests --- .../expected/random_indent.tss | 70 ++++++++----------- .../expected/test2.tss | 8 +-- .../original/random_indent.tss | 0 .../original/test2.tss | 0 4 files changed, 33 insertions(+), 45 deletions(-) rename examples/simple-jsbeautifyrc/{tss => titanium-style-sheets}/expected/random_indent.tss (58%) rename examples/simple-jsbeautifyrc/{tss => titanium-style-sheets}/expected/test2.tss (76%) rename examples/simple-jsbeautifyrc/{tss => titanium-style-sheets}/original/random_indent.tss (100%) rename examples/simple-jsbeautifyrc/{tss => titanium-style-sheets}/original/test2.tss (100%) diff --git a/examples/simple-jsbeautifyrc/tss/expected/random_indent.tss b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss similarity index 58% rename from examples/simple-jsbeautifyrc/tss/expected/random_indent.tss rename to examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss index fc802dc..164ddc0 100644 --- a/examples/simple-jsbeautifyrc/tss/expected/random_indent.tss +++ b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss @@ -1,28 +1,24 @@ -"Window": { - exitOnClose: true, +"Window" : + { exitOnClose: true, backgroundColor: "#fff", title: "Kochgut" } - -"Label": { - width: Ti.UI.SIZE, +"Label" : + { width: Ti.UI.SIZE, height: Ti.UI.SIZE, color: "#555", touchEnabled: false } - -"Button": { - backgroundColor: "#03a9f4", +"Button" : + { backgroundColor: "#03a9f4", color: "#fff", borderRadius: 2 } - -"#menu": { - backgroundImage: "/images/bg.png" +"#menu" : + { backgroundImage: "/images/bg.png" } - -".button": { - backgroundColor: "#03a9f4", +".button" : + { backgroundColor: "#03a9f4", color: "#fff", borderRadius: 2, width: Ti.UI.SIZE, @@ -30,68 +26,60 @@ top: 16, bottom: 16 } - -".lbl_button": { - left: 20, +".lbl_button" : + { left: 20, right: 20, color: "#fff" } - -".headline": { - color: "#aaa", +".headline" : + { color: "#aaa", left: 16, height: 48, font: { fontWeight: "bold" } } - -".grid": { - left: 2, +".grid" : + { left: 2, right: 2, layout: "horizontal", height: Ti.UI.SIZE } - -".card [platform=tablet]": { - width: "33%", +".card [platform=tablet]" : + { width: "33%", height: 150, bottom: 2 } - -".card": { - width: "50%", +".card" : + { width: "50%", height: 150, bottom: 2 } - -".padding": { - right: 2, +".padding" : + { right: 2, left: 0, top: 0, bottom: 0, backgroundImage: "/images/essen.jpg" } -".card_overlay": { - bottom: 0, +".card_overlay" : + { bottom: 0, left: 0, right: 0, height: 48 } - -".card_overlay_bg": { - left: 0, +".card_overlay_bg" : + { left: 0, right: 0, bottom: 0, top: 0, backgroundColor: "#000", opacity: 0.3 } - -".card_lbl": { - color: "#fff", +".card_lbl" : + { color: "#fff", left: 16, font: { fontSize: 16 } -} +} \ No newline at end of file diff --git a/examples/simple-jsbeautifyrc/tss/expected/test2.tss b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss similarity index 76% rename from examples/simple-jsbeautifyrc/tss/expected/test2.tss rename to examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss index 93ab172..22014b0 100644 --- a/examples/simple-jsbeautifyrc/tss/expected/test2.tss +++ b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss @@ -1,12 +1,12 @@ -".container": { - backgroundImage: 'images/bgbg-builder.png', +".container" : + { backgroundImage: 'images/bgbg-builder.png', width: 1024, height: 752, top: 0, left: 0 }, -"#blackArrow": { - touchEnabled: false, +"#blackArrow" : + { touchEnabled: false, backgroundImage: 'images/arrow-builder.png', width: 15, height: 10, diff --git a/examples/simple-jsbeautifyrc/tss/original/random_indent.tss b/examples/simple-jsbeautifyrc/titanium-style-sheets/original/random_indent.tss similarity index 100% rename from examples/simple-jsbeautifyrc/tss/original/random_indent.tss rename to examples/simple-jsbeautifyrc/titanium-style-sheets/original/random_indent.tss diff --git a/examples/simple-jsbeautifyrc/tss/original/test2.tss b/examples/simple-jsbeautifyrc/titanium-style-sheets/original/test2.tss similarity index 100% rename from examples/simple-jsbeautifyrc/tss/original/test2.tss rename to examples/simple-jsbeautifyrc/titanium-style-sheets/original/test2.tss