From 9147d8156660c1830c58bbb7087b02e7601f873d Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 10 Apr 2015 11:51:11 -0500 Subject: [PATCH] rearrange scss files, move ionic.scss to src root --- .../app/{_colors.scss => colors.scss} | 0 .../app/{_globals.scss => globals.scss} | 0 src/components/app/ionic.scss | 74 ----------------- .../{_animation.scss => animation.scss} | 0 .../app/mixins/{_colors.scss => colors.scss} | 0 .../app/mixins/{_flex.scss => flex.scss} | 0 .../{_transform.scss => transform.scss} | 0 .../{_transition.scss => transition.scss} | 0 .../app/mixins/{_util.scss => util.scss} | 0 .../app/{_normalize.scss => normalize.scss} | 0 .../app/{_overlay.scss => overlay.scss} | 0 .../{_scaffolding.scss => scaffolding.scss} | 0 .../app/{_typography.scss => typography.scss} | 0 src/components/app/{_util.scss => util.scss} | 0 .../app/{_z-index.scss => z-index.scss} | 0 src/ionic.scss | 79 +++++++++++++++++++ 16 files changed, 79 insertions(+), 74 deletions(-) rename src/components/app/{_colors.scss => colors.scss} (100%) rename src/components/app/{_globals.scss => globals.scss} (100%) delete mode 100644 src/components/app/ionic.scss rename src/components/app/mixins/{_animation.scss => animation.scss} (100%) rename src/components/app/mixins/{_colors.scss => colors.scss} (100%) rename src/components/app/mixins/{_flex.scss => flex.scss} (100%) rename src/components/app/mixins/{_transform.scss => transform.scss} (100%) rename src/components/app/mixins/{_transition.scss => transition.scss} (100%) rename src/components/app/mixins/{_util.scss => util.scss} (100%) rename src/components/app/{_normalize.scss => normalize.scss} (100%) rename src/components/app/{_overlay.scss => overlay.scss} (100%) rename src/components/app/{_scaffolding.scss => scaffolding.scss} (100%) rename src/components/app/{_typography.scss => typography.scss} (100%) rename src/components/app/{_util.scss => util.scss} (100%) rename src/components/app/{_z-index.scss => z-index.scss} (100%) create mode 100644 src/ionic.scss diff --git a/src/components/app/_colors.scss b/src/components/app/colors.scss similarity index 100% rename from src/components/app/_colors.scss rename to src/components/app/colors.scss diff --git a/src/components/app/_globals.scss b/src/components/app/globals.scss similarity index 100% rename from src/components/app/_globals.scss rename to src/components/app/globals.scss diff --git a/src/components/app/ionic.scss b/src/components/app/ionic.scss deleted file mode 100644 index 4c1c0e149f..0000000000 --- a/src/components/app/ionic.scss +++ /dev/null @@ -1,74 +0,0 @@ -@charset "UTF-8"; - - -// Mixins -@import - "mixins/flex", - "mixins/transform", - "mixins/transition", - "mixins/util"; - - -// Globals -@import - "z-index", - "normalize", - "globals", - "colors", - "mixins/colors", - "util", - "scaffolding", - "typography", - "overlay"; - - -// Core Components -@import - "../action-menu/action-menu", - "../alert/alert", - "../aside/aside", - "../badge/badge", - "../button/button", - "../card/card", - "../checkbox/checkbox", - "../content/content", - "../item/item", - "../list/list", - "../modal/modal", - "../nav-pane/nav-pane", - "../radio/radio", - "../search-bar/search-bar", - "../switch/switch", - "../tabs/tabs", - "../toolbar/toolbar"; - - -// iOS Components -@import - "../toolbar/extensions/ios", - "../action-menu/extensions/ios", - "../alert/extensions/ios", - "../button/extensions/ios", - "../card/extensions/ios", - "../checkbox/extensions/ios", - "../list/extensions/ios", - "../item/extensions/ios", - "../radio/extensions/ios", - "../search-bar/extensions/ios", - "../switch/extensions/ios", - "../tabs/extensions/ios"; - - -// Material Design Components -@import - "../alert/extensions/android", - "../button/extensions/android", - "../list/extensions/android", - "../item/extensions/android", - "../tabs/extensions/android", - "../toolbar/extensions/android"; - - -// Icons -@import - "../icon/icon"; diff --git a/src/components/app/mixins/_animation.scss b/src/components/app/mixins/animation.scss similarity index 100% rename from src/components/app/mixins/_animation.scss rename to src/components/app/mixins/animation.scss diff --git a/src/components/app/mixins/_colors.scss b/src/components/app/mixins/colors.scss similarity index 100% rename from src/components/app/mixins/_colors.scss rename to src/components/app/mixins/colors.scss diff --git a/src/components/app/mixins/_flex.scss b/src/components/app/mixins/flex.scss similarity index 100% rename from src/components/app/mixins/_flex.scss rename to src/components/app/mixins/flex.scss diff --git a/src/components/app/mixins/_transform.scss b/src/components/app/mixins/transform.scss similarity index 100% rename from src/components/app/mixins/_transform.scss rename to src/components/app/mixins/transform.scss diff --git a/src/components/app/mixins/_transition.scss b/src/components/app/mixins/transition.scss similarity index 100% rename from src/components/app/mixins/_transition.scss rename to src/components/app/mixins/transition.scss diff --git a/src/components/app/mixins/_util.scss b/src/components/app/mixins/util.scss similarity index 100% rename from src/components/app/mixins/_util.scss rename to src/components/app/mixins/util.scss diff --git a/src/components/app/_normalize.scss b/src/components/app/normalize.scss similarity index 100% rename from src/components/app/_normalize.scss rename to src/components/app/normalize.scss diff --git a/src/components/app/_overlay.scss b/src/components/app/overlay.scss similarity index 100% rename from src/components/app/_overlay.scss rename to src/components/app/overlay.scss diff --git a/src/components/app/_scaffolding.scss b/src/components/app/scaffolding.scss similarity index 100% rename from src/components/app/_scaffolding.scss rename to src/components/app/scaffolding.scss diff --git a/src/components/app/_typography.scss b/src/components/app/typography.scss similarity index 100% rename from src/components/app/_typography.scss rename to src/components/app/typography.scss diff --git a/src/components/app/_util.scss b/src/components/app/util.scss similarity index 100% rename from src/components/app/_util.scss rename to src/components/app/util.scss diff --git a/src/components/app/_z-index.scss b/src/components/app/z-index.scss similarity index 100% rename from src/components/app/_z-index.scss rename to src/components/app/z-index.scss diff --git a/src/ionic.scss b/src/ionic.scss new file mode 100644 index 0000000000..59f9723c71 --- /dev/null +++ b/src/ionic.scss @@ -0,0 +1,79 @@ +@charset "UTF-8"; + + +// Mixins +@import + "components/app/mixins/flex", + "components/app/mixins/transform", + "components/app/mixins/transition", + "components/app/mixins/util"; + + +// Globals +@import + "components/app/z-index", + "components/app/normalize", + "components/app/globals", + "components/app/colors", + "components/app/mixins/colors", + "components/app/util", + "components/app/scaffolding", + "components/app/typography", + "components/app/overlay"; + + +// Core Components +@import + "components/app/action-menu/action-menu", + "components/app/alert/alert", + "components/app/aside/aside", + "components/app/badge/badge", + "components/app/button/button", + "components/app/card/card", + "components/app/checkbox/checkbox", + "components/app/content/content", + "components/app/item/item", + "components/app/list/list", + "components/app/modal/modal", + "components/app/nav-pane/nav-pane", + "components/app/radio/radio", + "components/app/search-bar/search-bar", + "components/app/switch/switch", + "components/app/tabs/tabs", + "components/app/toolbar/toolbar"; + + +// iOS Components +@import + "components/app/toolbar/extensions/ios", + "components/app/action-menu/extensions/ios", + "components/app/alert/extensions/ios", + "components/app/button/extensions/ios", + "components/app/card/extensions/ios", + "components/app/checkbox/extensions/ios", + "components/app/list/extensions/ios", + "components/app/item/extensions/ios", + "components/app/radio/extensions/ios", + "components/app/search-bar/extensions/ios", + "components/app/switch/extensions/ios", + "components/app/tabs/extensions/ios"; + + +// Material Design Components +@import + "components/app/alert/extensions/android", + "components/app/button/extensions/android", + "components/app/list/extensions/android", + "components/app/item/extensions/android", + "components/app/tabs/extensions/android", + "components/app/toolbar/extensions/android"; + + +// Web View Adaptors +@import + "webview/cordova/cordova"; + + +// Icons +@import + "components/app/icon/icon";