Commit Graph

1724 Commits

Author SHA1 Message Date
Tim Lancina
9916c187a9 menu api docs 2015-10-05 15:24:48 -05:00
Adam Bradley
b7d1d2debf Merge branch 'master' into alpha38
Conflicts:
	ionic/components/nav/view-controller.ts
	ionic/components/tabs/tab.ts
2015-10-05 11:47:45 -05:00
Adam Bradley
6955a8cdba fix(nav): update loader 2015-10-05 11:43:53 -05:00
Brandy Carney
649e76167f fix(popup): Removed button type, it's throwing console errors
References #183
2015-10-05 12:41:47 -04:00
Brandy Carney
d4c2342414 feat(button): Added ability to give the button a "type" which will be converted to an attribute.
Note this is working for basic buttons but breaks in the popup
currently, that is a TODO. Changed the default to types for the popup
to an empty string. Closes #183
2015-10-05 12:37:50 -04:00
Adam Bradley
cd319e1cf2 working modals 2015-10-05 11:05:55 -05:00
jbavari
9b4b15d468 Merge branch 'master' into search-bar 2015-10-05 10:00:29 -06:00
jbavari
6cc8a43427 Refactor(searchbar): Remove unused variables, remove console.log, and comments in index.tj and main.html 2015-10-05 10:00:17 -06:00
Tim Lancina
7a4f2ea3b1 feat(nav-push): NavPush api docs 2015-10-05 10:50:01 -05:00
Adam Bradley
dc8c2e76b0 overlay wip 2015-10-04 22:48:18 -05:00
Adam Bradley
657e7175ef Merge branch 'master' into alpha38 2015-10-04 22:36:50 -05:00
Adam Bradley
3324f3cc90 refactor(overlay): actionsheet/popup 2015-10-04 22:35:54 -05:00
Tim Lancina
13e146b3e5 fix tab tabs 2015-10-04 16:05:58 -05:00
Tim Lancina
45329851f5 chore(tabs): more tabs api docs 2015-10-04 16:03:36 -05:00
Tim Lancina
43a4a71629 chore(tab): tab api docs 2015-10-04 16:03:03 -05:00
Tim Lancina
2483b1ee08 chore(nav): add [root] description to api doc 2015-10-04 16:02:40 -05:00
Tim Lancina
7a954c3f1e container that contains lol 2015-10-04 14:12:26 -05:00
Tim Lancina
39c17ca5c5 chore(tabs): tabs API docs 2015-10-04 14:11:29 -05:00
Tim Lancina
3d6dbe3c9a tweak nav docs 2015-10-04 14:11:09 -05:00
Adam Bradley
dfe19a962d use title service 2015-10-04 11:45:32 -05:00
Adam Bradley
2b86705f54 bootstrap refactor wip 2015-10-04 00:20:41 -05:00
Adam Bradley
5345d10f21 alpha38, first pass 2015-10-03 16:02:24 -05:00
Tim Lancina
0358d1b162 chore(navController): improve doc wording 2015-10-03 08:51:18 -05:00
Tim Lancina
8f75a27980 chore(nav): improve doc wording 2015-10-03 08:40:29 -05:00
jbavari
23a6b39add Fix(demo): Update search list items to have more selections. Add inset to list to avoid the weird bordering look 2015-10-02 23:18:56 -06:00
jbavari
3215c05f4f Fix(search-bar): Have search bar go through items, provide filter, and filter those from list. Make search bar have valueAccessor it self update update control value to watcher 2015-10-02 23:10:52 -06:00
Tim Lancina
539edf8ebd chore(nav): more nav docs 2015-10-02 19:46:07 -05:00
Adam Bradley
5b0eda5be1 refactor(config): get/set/settings and unit tests 2015-10-02 15:23:08 -05:00
jbavari
46fc56fb95 Fix(demo): Remove ion-view from demos for scoll (basic, pull-to-refresh) and tabs (tab-bar-bottom) 2015-10-02 14:10:05 -06:00
jbavari
33dc40aad1 Fix(demo): Fix infinite list demo, remove ion-view 2015-10-02 13:12:04 -06:00
jbavari
d63fbc1787 Merge branch 'master' into sticky-header-chrome 2015-10-02 13:04:49 -06:00
jbavari
59713e6bb2 Fix(demo): update the sticky list demo, remove ion-view, only have ion-content. 2015-10-02 13:04:35 -06:00
Brandy Carney
e013c26879 fix(popup): Fix iOS button hover, convert some values to sass variables
Fix indentations of sass values, references #183
2015-10-02 14:55:17 -04:00
jbavari
82ef03b346 fix(list): Fix for sticky titles in Chrome/Android. Currently broken 2015-10-02 12:40:22 -06:00
Brandy Carney
3b2eb8452e chore(popup): Adding API comments for docs for popups
References #183
2015-10-02 14:40:19 -04:00
Brandy Carney
78224f35ea fix(popup): Fixed iOS styling
References #183
2015-10-02 14:40:18 -04:00
Brandy Carney
dcc76f7e8d chore(popup): Renaming context to opts
References #183
2015-10-02 14:40:18 -04:00
Brandy Carney
f158bf95a8 chore(popup): Removing opts variable as it isn't used
Fixing iOS styling. References #183
2015-10-02 14:40:18 -04:00
Tim Lancina
e9615191a8 chore(docs): nav and navcontroller docs 2015-10-02 13:18:41 -05:00
Max Lynch
963f3dca1b feat(segment): default styles and header fit 2015-10-02 11:25:40 -05:00
Max Lynch
b43cb32111 fix(segment): works w/o NgControl 2015-10-02 10:57:14 -05:00
Max Lynch
a98b38b55c fix(segment): working 2015-10-02 10:49:07 -05:00
mhartington
ae6e140fbf feat(ionTabs): hide tabs by default with MD
Closes #229. Closes #236
Squashed commit of the following:

commit f566321e54937b8d31a8d1f85948ab5d984b9e37
Author: mhartington <mikehartington@gmail.com>
Date:   Fri Oct 2 11:03:50 2015 -0400

    feat(ionTabs): organize code and clean font sizes

commit 9ee1e28f0b01e9e195bc24a65066a57d66e5ec50
Author: mhartington <mikehartington@gmail.com>
Date:   Fri Oct 2 10:51:36 2015 -0400

    feat(ionTabs): move scss to tabs.scss

commit 3eba74c27c8eefe6e61f8f3ac12742edb7181772
Author: mhartington <mikehartington@gmail.com>
Date:   Thu Oct 1 16:23:37 2015 -0400

    feat(ionTabs): add test

commit 34f61431d41283fc8e5ed2f64e0874659072660b
Author: mhartington <mikehartington@gmail.com>
Date:   Thu Oct 1 16:13:05 2015 -0400

    feat(ionTabs): reuse tabBarIcons

commit 8c6f0edb17bcc6ff0c5f8b7be66f2be8a6775d48
Author: mhartington <mikehartington@gmail.com>
Date:   Thu Oct 1 15:56:29 2015 -0400

    feat(ionTabs): hide tab icon for md
2015-10-02 11:45:35 -04:00
Max Lynch
f291944335 fix(button): include primary as a CSS definition 2015-10-02 10:10:01 -05:00
Tim Lancina
0afdc67998 feat(nav): re-add popTo and popToRoot
re-adds c5be799810 after merge clobber
2015-10-02 09:00:07 -05:00
Adam Bradley
fcacce1d9d test(platform): init platform/config tests 2015-10-01 22:45:46 -05:00
Adam Bradley
faa9596489 fix(transition): always use animation, just no duration
Closes #227
2015-10-01 20:45:44 -05:00
Brandy Carney
86a8175d3a chore(popup): Adding ability to pass cssClass
References #183
2015-10-01 18:11:38 -04:00
Brandy Carney
6a1c9aa159 chore(popup): Adding iOS styling per Ben
References #183
2015-10-01 18:11:37 -04:00
Adam Bradley
3a1fc883ff fix(pane): reuse view panes w/ same structure 2015-10-01 16:29:59 -05:00