diff --git a/src/components/app/ionic.scss b/src/components/app/ionic.scss index e55fc5cf96..fcff2f779d 100644 --- a/src/components/app/ionic.scss +++ b/src/components/app/ionic.scss @@ -22,6 +22,8 @@ @import "../aside/aside", "../button/button", + "../item/item", + "../list/list", "../modal/modal", "../switch/switch", "../tabs/tabs", diff --git a/src/components/item/examples/item-default/index.html b/src/components/item/examples/item-default/index.html new file mode 100644 index 0000000000..d730aa6763 --- /dev/null +++ b/src/components/item/examples/item-default/index.html @@ -0,0 +1,57 @@ +
+ +
+ +
+ List/Item Default CSS Tests +
+ +
+ +
+ List Header +
+ +
    + +
  • +
    +
    + Item 1 +
    +
    + Label +
    +
    +
    • + +
  • +
    +
    + Item 2 +
    +
    + Label +
    +
    +
    • + +
  • +
    +
    + Item 3 +
    +
    + Label +
    +
    +
    • + +
+ + +
+ +
+ +
diff --git a/src/components/item/item.scss b/src/components/item/examples/item-default/main.js similarity index 100% rename from src/components/item/item.scss rename to src/components/item/examples/item-default/main.js diff --git a/src/components/list/list.scss b/src/components/list/list.scss index e69de29bb2..2df06d7b14 100644 --- a/src/components/list/list.scss +++ b/src/components/list/list.scss @@ -0,0 +1,26 @@ + +// List +// -------------------------------------------------- + +$list-margin: 35px 0 !default; + + + +.list { + margin: $list-margin; + padding: 0; + list-style-type: none; +} + +.list-header { + position: relative; + margin: 35px 15px 10px; + + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.list-header + .list { + margin-top: 10px; +} diff --git a/src/components/toolbar/toolbar.scss b/src/components/toolbar/toolbar.scss index 23465a97be..c9adc079c6 100644 --- a/src/components/toolbar/toolbar.scss +++ b/src/components/toolbar/toolbar.scss @@ -1,4 +1,7 @@ +// Toolbar +// -------------------------------------------------- + .bar { position: relative; @include flex-display(); diff --git a/src/components/view/examples/view-default/index.html b/src/components/view/examples/view-default/index.html new file mode 100644 index 0000000000..102c5f9a3b --- /dev/null +++ b/src/components/view/examples/view-default/index.html @@ -0,0 +1,28 @@ + +
+ +
+
+
+ +
+ +
+ +
+ +
+ View CSS Test +
+ +
+
+

Content!!!

+
+
+ +
+ +
+ +
diff --git a/src/components/view/examples/view-default/main.js b/src/components/view/examples/view-default/main.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/views/view-history.js b/src/core/history/history.js similarity index 95% rename from src/views/view-history.js rename to src/core/history/history.js index a5ddfeaf34..50487afed5 100644 --- a/src/views/view-history.js +++ b/src/core/history/history.js @@ -1,5 +1,5 @@ -export class ViewHistory { +export class History { constructor() { this._array = []; } diff --git a/src/views/view.js b/src/views/view.js deleted file mode 100644 index 2dc8dc5bd0..0000000000 --- a/src/views/view.js +++ /dev/null @@ -1,25 +0,0 @@ -import * as util from '../util'; -import {ViewHistory} from './view-history'; -// import {Children} from 'angular2/angular2'; - -export class View { - constructor( - // @Children() views: View - ) { - super(el); - this.children = []; - this.history = new ViewHistory(); - } - - setSelected(isSelected) { - this.isSelected = isSelected; - } - - selectChild(child) { - if (this.selectedChild) { - this.selectedChild.setSelected(false); - } - child.setSelected(true); - this.selectedChild = child; - } -}