diff --git a/ionic/components/icon/modes/md.scss b/ionic/components/icon/modes/md.scss new file mode 100644 index 0000000000..969c07bdcb --- /dev/null +++ b/ionic/components/icon/modes/md.scss @@ -0,0 +1,5 @@ +@import "../../../ionic.globals"; +@import "../icon"; + +// Material Design Icon +// -------------------------------------------------- diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index 01deb4125b..2481c6df74 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -186,7 +186,7 @@ ion-thumbnail { .item, a.item, button.item { - transition: background-color $button-md-transition-duration $button-md-animation-curve, transform 300ms; + transition: background-color 300ms cubic-bezier(0.4, 0, 0.2, 1), transform 300ms; } .item.activated, diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss index 57b01359dc..10f03024f4 100644 --- a/ionic/ionic.core.scss +++ b/ionic/ionic.core.scss @@ -10,7 +10,6 @@ // Core Components @import "components/grid/grid", - "components/icon/icon", "components/menu/menu", "components/modal/modal", "components/scroll/scroll", diff --git a/ionic/ionic.ios.scss b/ionic/ionic.ios.scss index fc34e616ac..d02caa6cee 100644 --- a/ionic/ionic.ios.scss +++ b/ionic/ionic.ios.scss @@ -6,6 +6,25 @@ @import "ionic.core"; -// iOS Components +// iOS Required Components @import - "components/action-sheet/modes/ios"; + "components/icon/modes/ios", + "components/item/modes/ios", + "components/list/modes/ios", + "components/toolbar/modes/ios"; + + +// iOS Optional Components +@import + "components/action-sheet/modes/ios", + "components/button/modes/ios", + "components/card/modes/ios", + "components/checkbox/modes/ios", + "components/content/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"; diff --git a/ionic/ionic.md.scss b/ionic/ionic.md.scss index 753235b7fc..2662a89559 100644 --- a/ionic/ionic.md.scss +++ b/ionic/ionic.md.scss @@ -7,6 +7,25 @@ // Material Design Components +@import + "components/icon/modes/md", + "components/item/modes/md", + "components/list/modes/md", + "components/toolbar/modes/md"; + + +// Material Design Optional Components @import "components/action-sheet/modes/md", - "components/tap-click/ripple"; + "components/button/modes/md", + "components/card/modes/md", + "components/checkbox/modes/md", + "components/content/modes/md", + "components/popup/modes/md", + "components/radio/modes/md", + "components/tap-click/ripple", + "components/searchbar/modes/md", + "components/segment/modes/md", + "components/switch/modes/md", + "components/tabs/modes/md", + "components/text-input/modes/md";