From c51ca09e15a0dabe958836207e6bc52ef8ece6c7 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Mon, 26 Jan 2015 09:20:25 -0800
Subject: [PATCH] Move sky-box,-button,-checkbox,-radio out of their
 directories

Instead of having a separate directory for every Sky element, we should just
put them in the general framework directory. Once the framework is more
complicated, we'll probably want to organize it a bit better, but for now there
aren't enough files to justify having so many directories.

R=esprehn@chromium.org

Review URL: https://codereview.chromium.org/874303003
---
 examples/widgets/index.sky                    | 8 ++++----
 framework/{sky-box => }/sky-box.sky           | 0
 framework/{sky-button => }/sky-button.sky     | 0
 framework/{sky-checkbox => }/sky-checkbox.sky | 2 +-
 framework/{sky-radio => }/sky-radio.sky       | 2 +-
 tests/resources/test-element.sky              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename framework/{sky-box => }/sky-box.sky (100%)
 rename framework/{sky-button => }/sky-button.sky (100%)
 rename framework/{sky-checkbox => }/sky-checkbox.sky (95%)
 rename framework/{sky-radio => }/sky-radio.sky (97%)

diff --git a/examples/widgets/index.sky b/examples/widgets/index.sky
index cb60858658e..2e18124e205 100644
--- a/examples/widgets/index.sky
+++ b/examples/widgets/index.sky
@@ -4,12 +4,12 @@
 // found in the LICENSE file.
 -->
 <sky>
-<import src="/sky/framework/sky-box/sky-box.sky"/>
-<import src="/sky/framework/sky-button/sky-button.sky"/>
-<import src="/sky/framework/sky-checkbox/sky-checkbox.sky"/>
+<import src="/sky/framework/sky-box.sky"/>
+<import src="/sky/framework/sky-button.sky"/>
+<import src="/sky/framework/sky-checkbox.sky"/>
 <import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement"/>
 <import src="/sky/framework/sky-input.sky"/>
-<import src="/sky/framework/sky-radio/sky-radio.sky"/>
+<import src="/sky/framework/sky-radio.sky"/>
 <sky-element name="widget-root">
 <template>
   <style>
diff --git a/framework/sky-box/sky-box.sky b/framework/sky-box.sky
similarity index 100%
rename from framework/sky-box/sky-box.sky
rename to framework/sky-box.sky
diff --git a/framework/sky-button/sky-button.sky b/framework/sky-button.sky
similarity index 100%
rename from framework/sky-button/sky-button.sky
rename to framework/sky-button.sky
diff --git a/framework/sky-checkbox/sky-checkbox.sky b/framework/sky-checkbox.sky
similarity index 95%
rename from framework/sky-checkbox/sky-checkbox.sky
rename to framework/sky-checkbox.sky
index 766f2354f59..a2bd8fbe4a2 100644
--- a/framework/sky-checkbox/sky-checkbox.sky
+++ b/framework/sky-checkbox.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-button/sky-button.sky" as="SkyButton" />
+<import src="/sky/framework/sky-button.sky" as="SkyButton" />
 
 <sky-element
     name="sky-checkbox"
diff --git a/framework/sky-radio/sky-radio.sky b/framework/sky-radio.sky
similarity index 97%
rename from framework/sky-radio/sky-radio.sky
rename to framework/sky-radio.sky
index 687dd5dc8fa..a400261394d 100644
--- a/framework/sky-radio/sky-radio.sky
+++ b/framework/sky-radio.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-button/sky-button.sky" as="SkyButton" />
+<import src="/sky/framework/sky-button.sky" as="SkyButton" />
 
 <sky-element
     name="sky-radio"
diff --git a/tests/resources/test-element.sky b/tests/resources/test-element.sky
index be6403c9ce0..79280de6385 100644
--- a/tests/resources/test-element.sky
+++ b/tests/resources/test-element.sky
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
+<import src="/sky/framework/sky-checkbox.sky" />
 <import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
-<import src="/sky/framework/sky-checkbox/sky-checkbox.sky" />
 
 <sky-element
     name="test-element"