diff --git a/ionic/components/icon/modes/ios.scss b/ionic/components/icon/modes/ios.scss deleted file mode 100644 index 1603ea117e..0000000000 --- a/ionic/components/icon/modes/ios.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import "../../../ionic.globals"; -@import "../icon"; - -// iOS Icon -// -------------------------------------------------- - - -$icon-detail-push-background-svg: "" !default; - - -@mixin ios-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, 'fg-color', $fg-color); - @include svg-background-image($svg); -} diff --git a/ionic/components/icon/modes/md.scss b/ionic/components/icon/modes/md.scss deleted file mode 100644 index 969c07bdcb..0000000000 --- a/ionic/components/icon/modes/md.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../../ionic.globals"; -@import "../icon"; - -// Material Design Icon -// -------------------------------------------------- diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index 8ff1df159c..c873d5924b 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -4,21 +4,6 @@ // iOS Item // -------------------------------------------------- -$item-ios-border-color: $list-border-color !default; -$item-ios-activated-background-color: #d9d9d9 !default; -$item-ios-font-size: 1.6rem !default; - -$item-ios-padding-top: 12px !default; -$item-ios-padding-right: 16px !default; -$item-ios-padding-bottom: 13px !default; -$item-ios-padding-left: 16px !default; - -$item-ios-padding-media-top: 10px !default; -$item-ios-padding-media-bottom: 10px !default; - -$item-ios-padding-icon-top: 10px !default; -$item-ios-padding-icon-bottom: 9px !default; - $item-ios-avatar-size: 3.6rem !default; $item-ios-thumbnail-size: 5.6rem !default; $item-ios-note-color: darken($item-ios-border-color, 10%) !default; diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss index 10f03024f4..57b01359dc 100644 --- a/ionic/ionic.core.scss +++ b/ionic/ionic.core.scss @@ -10,6 +10,7 @@ // Core Components @import "components/grid/grid", + "components/icon/icon", "components/menu/menu", "components/modal/modal", "components/scroll/scroll", diff --git a/ionic/ionic.globals.scss b/ionic/ionic.globals.scss index 1e6814bcc0..2d34a0a70d 100644 --- a/ionic/ionic.globals.scss +++ b/ionic/ionic.globals.scss @@ -1,8 +1,4 @@ -// Global Theme -@import "themes/default"; - - // Global Functions @import "util/functions"; diff --git a/ionic/ionic.ios.scss b/ionic/ionic.ios.scss index d02caa6cee..95afd69ad2 100644 --- a/ionic/ionic.ios.scss +++ b/ionic/ionic.ios.scss @@ -2,29 +2,28 @@ @charset "UTF-8"; +// iOS Theme +@import "themes/default.ios"; + + // Core Components @import "ionic.core"; -// iOS Required Components -@import - "components/icon/modes/ios", - "components/item/modes/ios", - "components/list/modes/ios", - "components/toolbar/modes/ios"; - - -// iOS Optional Components +// iOS Components @import "components/action-sheet/modes/ios", "components/button/modes/ios", "components/card/modes/ios", "components/checkbox/modes/ios", "components/content/modes/ios", + "components/item/modes/ios", + "components/list/modes/ios", "components/popup/modes/ios", "components/radio/modes/ios", "components/searchbar/modes/ios", "components/segment/modes/ios", "components/switch/modes/ios", "components/tabs/modes/ios", - "components/text-input/modes/ios"; + "components/text-input/modes/ios", + "components/toolbar/modes/ios"; diff --git a/ionic/ionic.md.scss b/ionic/ionic.md.scss index 2662a89559..84f3f504e6 100644 --- a/ionic/ionic.md.scss +++ b/ionic/ionic.md.scss @@ -2,13 +2,16 @@ @charset "UTF-8"; +// Material Design Theme +@import "themes/default.md"; + + // Core Components @import "ionic.core"; // Material Design Components @import - "components/icon/modes/md", "components/item/modes/md", "components/list/modes/md", "components/toolbar/modes/md"; diff --git a/ionic/themes/default.ios.scss b/ionic/themes/default.ios.scss new file mode 100644 index 0000000000..ecab9adfaf --- /dev/null +++ b/ionic/themes/default.ios.scss @@ -0,0 +1,65 @@ +@import "themes/default"; + +// iOS Default Theme +// ---------------------------------- + +$colors: ( + + primary: #387ef5, + secondary: #32db64, + danger: #f53d3d, + light: #f4f4f4, + dark: #222, + +) !default; + + +$text-ios-color: $text-color !default; +$background-ios-color: $background-color !default; +$subdued-text-ios-color: $subdued-text-color !default; + +$list-ios-text-color: $text-ios-color !default; +$list-ios-background-color: $background-color !default; +$list-ios-border-color: $list-border-color !default; + +$link-ios-color: map-get($colors, primary) !default; + + +// iOS Toolbar +// -------------------------------------------------- + +$toolbar-ios-background-color: $toolbar-background-color !default; +$toolbar-ios-border-color: $toolbar-border-color !default; +$toolbar-ios-text-color: $text-ios-color !default; +$toolbar-ios-active-color: $link-ios-color !default; +$toolbar-ios-inactive-color: $toolbar-inactive-color !default; + + +// iOS Item +// -------------------------------------------------- + +$item-ios-border-color: $list-border-color !default; +$item-ios-activated-background-color: #d9d9d9 !default; +$item-ios-font-size: 1.6rem !default; + +$item-ios-padding-top: 12px !default; +$item-ios-padding-right: 16px !default; +$item-ios-padding-bottom: 13px !default; +$item-ios-padding-left: 16px !default; + +$item-ios-padding-media-top: 10px !default; +$item-ios-padding-media-bottom: 10px !default; + +$item-ios-padding-icon-top: 10px !default; +$item-ios-padding-icon-bottom: 9px !default; + + +// iOS Icon +// -------------------------------------------------- + +$icon-detail-push-background-svg: "" !default; + +@mixin ios-detail-push-icon($fg-color) { + $svg: str-replace($icon-detail-push-background-svg, 'fg-color', $fg-color); + @include svg-background-image($svg); +} diff --git a/ionic/themes/default.md.scss b/ionic/themes/default.md.scss new file mode 100644 index 0000000000..f183d8416d --- /dev/null +++ b/ionic/themes/default.md.scss @@ -0,0 +1,54 @@ +@import "themes/default"; + +// Material Design Default Theme +// ---------------------------------- + +$colors: ( + + primary: #387ef5, + secondary: #32db64, + danger: #f53d3d, + light: #f4f4f4, + dark: #222, + +) !default; + + +$text-md-color: $text-color !default; +$background-md-color: $background-color !default; +$subdued-text-md-color: $subdued-text-color !default; + +$list-md-text-color: $text-md-color !default; +$list-md-background-color: $background-color !default; +$list-md-border-color: $list-border-color !default; + +$link-md-color: map-get($colors, primary) !default; + + +// iOS Toolbar +// -------------------------------------------------- + +$toolbar-md-background-color: $toolbar-background-color !default; +$toolbar-md-border-color: $toolbar-border-color !default; +$toolbar-md-text-color: $text-md-color !default; +$toolbar-md-active-color: $link-md-color !default; +$toolbar-md-inactive-color: $toolbar-inactive-color !default; + + +// Material Design Item +// -------------------------------------------------- + +$item-md-border-color: $list-border-color !default; +$item-md-activated-background-color: #d9d9d9 !default; +$item-md-font-size: 1.6rem !default; + +$item-md-padding-top: 12px !default; +$item-md-padding-right: 16px !default; +$item-md-padding-bottom: 13px !default; +$item-md-padding-left: 16px !default; + +$item-md-padding-media-top: 10px !default; +$item-md-padding-media-bottom: 10px !default; + +$item-md-padding-icon-top: 10px !default; +$item-md-padding-icon-bottom: 9px !default;