-
Notifications
You must be signed in to change notification settings - Fork 158
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[fluent2-tokens] Merging main -> fluent2-tokens branch #1416
Merged
sophialee0416
merged 22 commits into
microsoft:fluent2-tokens
from
sophialee0416:sople/mergeMain
Dec 1, 2022
Merged
[fluent2-tokens] Merging main -> fluent2-tokens branch #1416
sophialee0416
merged 22 commits into
microsoft:fluent2-tokens
from
sophialee0416:sople/mergeMain
Dec 1, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update FluentUI project * Update FluentUI xcconfig * Update FluentUI.Demo project * Update MicrosoftFluentUI.podspec * Clean up Button * Clean up CommandBarButton * Clean up CommandBarButtonGroupView * Clean up LargeContentViewerModifier * Clean up Drawer * Clean up NavigationBar * Clean up BadgeLabelButton * Clean up PillButton * Clean up PillButtonBar * Clean up SegmentedPillButton * Clean up SideTabBar * Clean up TabBarView * Clean up PillButton v2 * Clean up PillButton v3 * Revert "Update FluentUI project" This reverts commit 1c97631. * Update README.md * Update Package.swift
* Make ShimmerLinesView inherit ShimmerView init * move shimmer to fluent2 and add new api to demo
* Bring in fluent2-token control * Add token set to project * Update dependent controls * Add colored background for demo * Update demos * Update demo order * Fix whitespace error
…crosoft#1372) * Change from DemoController to UIViewController * Revert "Change from DemoController to UIViewController" This reverts commit 3b3aeb0. * Fix bug
* Implementing the unread dot on TabBarView * Better naming for variables and events * Updating SideTabBar demo to show the unread dot * Pr feedback - reorganizing, renaming, better documentation * Updating variable names and locations to follow guidance * Added accessibility string for unread dot * Switching to using a badge label for the unread dot * Cleaning up commented out code * Simplifying logic, using a single view for both the badge and the unreadDot * PR cleanup
…soft#1357)" (microsoft#1383) * Revert "Drop support for iOS 14 and remove availability checks (microsoft#1357)" This reverts commit 4fad398. * Fix whitespace error
Co-authored-by: edjamesmsft <edjamesmsft@users.noreply.github.com> Co-authored-by: Harrie Shin <hyshin@microsoft.com>
Co-authored-by: markavitale <markavitale@users.noreply.github.com> Co-authored-by: Harrie Shin <hyshin@microsoft.com>
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
…crosoft#1398) * Change TVC updateAppearance to internal * Fix PopupMenu token sink
* Fix unread dot anchor logic * Update demo to have an unread icon
edjamesmsft
approved these changes
Nov 30, 2022
Nit: please list the commits that this merge covers. |
harrieshin
approved these changes
Dec 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Platforms Impacted
Description of changes
Merging changes from main -> fluent2-tokens branch. Making up for last week's merge in this PR.
List of commits coming from main branch:
Verification
TestApp is running great!
Pull request checklist
This PR has considered:
Microsoft Reviewers: Open in CodeFlow