From e210448e63b319c6d09648aefbd063d912d0386b Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 7 Dec 2016 11:59:26 -0500 Subject: [PATCH] docs(toolbar): update API docs and any tests to remove old toolbar attributes --- src/components/app/test/cordova/page1.html | 2 +- src/components/app/test/cordova/page2.html | 4 +- src/components/content/test/basic/page3.html | 4 +- .../content/test/fullscreen/page3.html | 4 +- src/components/modal/test/basic/app-module.ts | 2 +- src/components/nav/test/basic/app-module.ts | 12 +- src/components/searchbar/test/nav/search.html | 4 +- src/components/segment/test/basic/main.html | 8 +- src/components/segment/test/nav/main.html | 4 +- src/components/segment/test/swipe/main.html | 4 +- .../tap-click/test/click-block/main.html | 4 +- src/components/toolbar/test/colors/main.html | 26 ++-- .../toolbar/test/scenarios/main.html | 28 ++-- src/components/toolbar/toolbar.ts | 121 +++++------------- 14 files changed, 87 insertions(+), 140 deletions(-) diff --git a/src/components/app/test/cordova/page1.html b/src/components/app/test/cordova/page1.html index ff42609d7c..ffce43cbd2 100644 --- a/src/components/app/test/cordova/page1.html +++ b/src/components/app/test/cordova/page1.html @@ -18,7 +18,7 @@ - + I'm a toolbar diff --git a/src/components/app/test/cordova/page2.html b/src/components/app/test/cordova/page2.html index 6316d55e97..6715f41eeb 100644 --- a/src/components/app/test/cordova/page2.html +++ b/src/components/app/test/cordova/page2.html @@ -1,6 +1,6 @@ - + Page 2 - + Hello, I am a sub header, with no border on top diff --git a/src/components/content/test/basic/page3.html b/src/components/content/test/basic/page3.html index 892e2f248f..8ceffd882d 100644 --- a/src/components/content/test/basic/page3.html +++ b/src/components/content/test/basic/page3.html @@ -1,5 +1,5 @@ - + Page 3 - + Subheader diff --git a/src/components/content/test/fullscreen/page3.html b/src/components/content/test/fullscreen/page3.html index 7342e8cae9..d9d870fea3 100644 --- a/src/components/content/test/fullscreen/page3.html +++ b/src/components/content/test/fullscreen/page3.html @@ -1,5 +1,5 @@ - + Page 3 - + Subheader diff --git a/src/components/modal/test/basic/app-module.ts b/src/components/modal/test/basic/app-module.ts index a8eb70ab9b..c91e36469c 100644 --- a/src/components/modal/test/basic/app-module.ts +++ b/src/components/modal/test/basic/app-module.ts @@ -280,7 +280,7 @@ export class ModalPassData { Toolbar 1 - + Toolbar 2 diff --git a/src/components/nav/test/basic/app-module.ts b/src/components/nav/test/basic/app-module.ts index 9807f23595..e5573f3bb5 100644 --- a/src/components/nav/test/basic/app-module.ts +++ b/src/components/nav/test/basic/app-module.ts @@ -373,7 +373,7 @@ export class FullPage { - + {{subheader}} @@ -391,10 +391,10 @@ export class FullPage {
- + I'm a sub footer! - + Footer @@ -472,7 +472,7 @@ export class PrimaryHeaderPage { - + I'm a sub header in the content! @@ -490,10 +490,10 @@ export class PrimaryHeaderPage {
- + I'm a sub footer in the content! - + And I'm a sub footer in the content too!
diff --git a/src/components/searchbar/test/nav/search.html b/src/components/searchbar/test/nav/search.html index a3b301b4f0..588e777483 100644 --- a/src/components/searchbar/test/nav/search.html +++ b/src/components/searchbar/test/nav/search.html @@ -1,11 +1,11 @@ - + - + Searchbar diff --git a/src/components/segment/test/basic/main.html b/src/components/segment/test/basic/main.html index 1373fad6f8..bb02a12797 100644 --- a/src/components/segment/test/basic/main.html +++ b/src/components/segment/test/basic/main.html @@ -1,6 +1,6 @@ - + Friends @@ -11,7 +11,7 @@ - + diff --git a/src/components/toolbar/test/colors/main.html b/src/components/toolbar/test/colors/main.html index 0f4ce1a18f..bd836533da 100644 --- a/src/components/toolbar/test/colors/main.html +++ b/src/components/toolbar/test/colors/main.html @@ -1,10 +1,10 @@ - + This is the title that never ends. It just goes on and on my friend. - + @@ -24,7 +24,7 @@ Default - + @@ -160,7 +160,7 @@ Danger - + @@ -188,7 +188,7 @@ Light - + @@ -175,7 +175,7 @@ Left side menu toggle - + - + - * - * + * ```html + * + * + * + * * My Toolbar Title * * - * + * * I'm a subheader * * @@ -213,27 +177,10 @@ export class ToolbarBase extends Ion { * * * - * + * * - * - * I'm a subfooter - * - * - * - * - * - * + * * I'm a footer - * - * - * - * * * *