diff --git a/ionic/components/layout/layout.scss b/ionic/components/layout/layout.scss deleted file mode 100644 index b013739021..0000000000 --- a/ionic/components/layout/layout.scss +++ /dev/null @@ -1,58 +0,0 @@ - -layout, -[layout] { - position: relative; - display: flex; -} - -[flex] { - flex: 1; -} - -.ele-qry { - position: absolute; - bottom: 0; - left: 0; - width: 100%; - height: 0; - padding: 0; - margin: 0; - border: none; - visibility: hidden; - pointer-events: none; - z-index: -99; -} - - -@mixin element-query($mq) { - $mq: "'" + $mq + "'"; - - $attr: str-replace($mq, ':', '-'); - $attr: str-replace($attr, ' ', '-'); - $attr: str-replace($attr, '--', '-'); - $attr: str-replace($attr, '(', ''); - $attr: str-replace($attr, ')', ''); - - &.#{$attr} { - @content; - } - - .ele-qry { - font-family: $mq; - } - -} - -/* -div { - - @include element-query( (min-width: 300px) ) { - background: blue; - }; - - @include element-query( (min-width: 400px) And (max-width: 800px) ) { - background: green; - }; - -} -*/ diff --git a/ionic/components/layout/layout.ts b/ionic/components/layout/layout.ts deleted file mode 100644 index 58883adc5f..0000000000 --- a/ionic/components/layout/layout.ts +++ /dev/null @@ -1,53 +0,0 @@ -import {Component, View, ElementRef} from 'angular2/angular2' - - -@Component({ - selector: 'layout,[layout]' -}) -@View({ - template: ` - - - ` -}) -export class Layout { - constructor( - @ElementRef() elementRef:ElementRef - ) { - this.ele = ngElement.nativeElement - this.eqEle = this.ele.lastElementChild - - window.requestAnimationFrame(() => { - this.initLayout() - }) - } - - initLayout() { - this.mqs = {} - - - for (let x = 0; x < this.ele.attributes.length; x++) { - let attr = this.ele.attributes[x] - let val = attr.nodeValue - let mqClassname = attr.nodeName - - if (val.indexOf('(') > -1 && val.indexOf(')') > -1) { - let mql = this.eqEle.contentDocument.defaultView.matchMedia(val) - - if (mql.media !== 'not all') { - this.mqs[mql.media] = (mql) => { - console.log(mql.media, mql.matches, mqClassname) - window.requestAnimationFrame(() => { - this.ele.classList[mql.matches ? 'add' : 'remove'](mqClassname) - }) - } - - this.mqs[mql.media](mql) - mql.addListener(this.mqs[mql.media]) - } - } - } - - } - -} diff --git a/ionic/components/layout/test/basic/index.ts b/ionic/components/layout/test/basic/index.ts deleted file mode 100644 index 2dac2b7a35..0000000000 --- a/ionic/components/layout/test/basic/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import {App} from 'ionic/ionic'; - - -@App({ - templateUrl: 'main.html' -}) -class IonicApp {} diff --git a/ionic/components/layout/test/basic/main.html b/ionic/components/layout/test/basic/main.html deleted file mode 100644 index cf88977dbd..0000000000 --- a/ionic/components/layout/test/basic/main.html +++ /dev/null @@ -1,15 +0,0 @@ - - - -
A
- -
B
- -
C
- -
D
- -
diff --git a/ionic/ionic.scss b/ionic/ionic.scss index 837e328ba0..84c24c73c2 100755 --- a/ionic/ionic.scss +++ b/ionic/ionic.scss @@ -30,7 +30,6 @@ "components/form/form", "components/form/label", "components/form/input", - "components/layout/layout", "components/list/list", "components/modal/modal", "components/nav-bar/nav-bar",