126 Commits

Author SHA1 Message Date
67f0d3c7dd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ionic/components/segment/segment.ts
2015-12-16 15:47:07 -05:00
caaa5f9bab test(segment): adding navigation page for segment for testing toolbar in a toolbar
references #614
2015-12-16 15:45:05 -05:00
0f57b1f64f feat(segment): added change event to segment which emits the value
Updated the API docs for segment to include change & click, and updated
some of the function descriptions, removed an unused function. Added
the change & click events to the test case.
2015-12-16 15:43:38 -05:00
068f3ceb29 Merge remote-tracking branch 'origin/master' into WIP-api-demos 2015-12-16 11:13:03 -06:00
92d4bda763 docs(segment): add api demo link 2015-12-15 11:29:59 -06:00
ec89350428 docs(segment): add api demo link 2015-12-15 10:44:13 -06:00
5d6d9b9610 chore(upgrad): ng alpha52 and case-sensitive templates 2015-12-10 22:52:55 -06:00
d464d5cb1c remove angular2/angular2 imports 2015-12-10 16:41:57 -06:00
37ca863531 fix(segment): fixed segment UI not updating when changing value from view button
Added a test for this. Closes #657
2015-12-10 12:58:59 -05:00
854d90f4c1 refactor(sass): moved all mode files to the top level component directory and renamed to include the directory name
references #689
2015-12-09 17:20:11 -05:00
677277de90 fix(segment): add ion-content back in for the sake of snapshot 2015-12-09 15:05:04 -05:00
243f03e545 Merge branch 'alpha50' into css-refactor 2015-12-09 07:47:30 -06:00
30b88d746b chore(): add ng prefix to lifecycle interfaces 2015-12-08 21:38:26 -06:00
0c6f87a541 fix(segment/toolbar): fixed segment padding iOS and toolbar text for MD
references #689
2015-12-08 18:17:31 -05:00
0fdbe7b89b fix(badge): changed back to ion-badge with a color attribute
also changed segment test to reflect actual color references #289
2015-12-08 13:10:53 -05:00
2bba23445e iOS toolbar segment button color 2015-12-08 08:47:57 -06:00
d8e82bb2c7 iOS segment buttons 2015-12-07 22:01:57 -06:00
66e13b890f update md segment 2015-12-07 20:36:17 -06:00
3143091d63 md segment wip 2015-12-07 16:45:24 -06:00
53356f6b08 Merge branch 'master' into css-refactor 2015-12-07 16:12:02 -06:00
dd3b3268a6 docs(segment): segment and segment-button 2015-12-07 15:49:14 -05:00
8b693ce836 toolbar button updates 2015-12-07 11:18:00 -06:00
d8f235d09d fix color inheritance, core components should not contain colors 2015-12-04 23:23:55 -06:00
78a3ce12b1 move button colors to ios button 2015-12-04 21:53:48 -06:00
831ec87308 import mode globals in all mode components 2015-12-04 21:34:27 -06:00
5d3e9a4f99 Merge branch 'master' into css-refactor 2015-12-04 17:04:00 -05:00
28bb668d43 docs(api): add links to component sections 2015-12-04 13:55:43 -06:00
45c7eae2e8 Merge remote-tracking branch 'origin/css-refactor' into css-refactor 2015-12-04 14:09:51 -05:00
d833e747cb refactor(): move core component imports to mode component files 2015-12-04 13:07:40 -06:00
bc289cce8a fix(segment): fixed opacity of activated default segment in toolbar 2015-12-04 14:04:04 -05:00
86a687a5df fix(segment): tap acivation working. Fixes #663 2015-12-04 11:38:58 -06:00
df5107b90e feat(segment): adding a test case for a segment under a nabber
references #614
2015-12-01 14:12:15 -05:00
bc8ff4070f refactor(sass): individual sass files import globals 2015-11-23 14:51:41 -06:00
fca5f9bbba refactor(segment): iOS fixed the segment colors in a colored toolbar
closes #597
2015-11-20 13:16:19 -05:00
116d4aa23c refactor(segment): MD fixing the segment colors in toolbars with colors
references #597
2015-11-20 13:16:19 -05:00
13fa14dff6 chore(): make members private 2015-11-15 20:37:24 -06:00
9ddcc44f67 refactor(toolbar): allow any content in the center 2015-11-11 11:27:11 -06:00
4cc9a14001 fix(segment): Got segment working with ng-model, removed unused code and combined segment component with directive.
Added usage for segment in a form. Removed SegmentControlValueAccessor.
Fixes #344
2015-11-04 14:58:56 -05:00
ead95ac738 refactor(segment): removed div wrapping segment buttons
references #356
2015-11-03 10:35:55 -05:00
a7a1fbeacd fix(segment): fixed display of segment on iOS and MD mode
references #356
2015-11-02 18:08:05 -05:00
d0301c814e refactor(segment): cleaned up UI of segments inside of a toolbar
references #356
2015-11-02 18:08:05 -05:00
ccd109dfee refactor(toolbar): added the ability to add a search bar or segment in toolbar
Removed ion-segments dependency on being in the ion-title as this
should be for text only. References #356
2015-11-02 18:08:04 -05:00
fe72e781be Missing commas are fun 2015-10-29 16:56:25 -04:00
50f14ec0cc refactor(segment): removed unused code and added a description for Segment with usage
references #344
2015-10-29 16:50:53 -04:00
1fbca8bba3 test(segment): adding a value to the toolbar segment
references #344
2015-10-29 15:45:25 -04:00
aa515da4af refactor(segment): removing unused code and bringing other code up to date
references #344
2015-10-29 15:45:25 -04:00
36f82b2473 refactor(NavController): restructuring and perf improvements 2015-10-29 14:37:49 -05:00
d390290a7c refactor(segment): added a toolbar with a button in it for testing purposes
references #356
2015-10-28 11:56:51 -04:00
c98867493a refactor(segment): fixed border width with more than 3 buttons
Added another toolbar with 3 segments for testing and in order to fix
the width on iOS, references #356
2015-10-27 17:47:55 -04:00
d8f643d340 test(segment): added e2e tests for segment
Cleaned up some of the UI for the tests
2015-10-27 15:22:32 -04:00