Skip to content
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.

Sign up for GitHub

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

Jump to bottom

UI bug fixes #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UI bug fixes #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions Source/Microsoft.Teams.Apps.DLLookup/ClientApp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Source/Microsoft.Teams.Apps.DLLookup/ClientApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@stardust-ui/react": "0.40.7",
"axios": "0.19.2",
"browserslist": "4.12.0",
"caniuse-lite": "1.0.30001079",
"caniuse-lite": "^1.0.30001247",
"font-awesome": "4.7.0",
"i18next": "19.4.5",
"i18next-xhr-backend": "3.2.2",
Expand Down
2 changes: 1 addition & 1 deletion Source/Microsoft.Teams.Apps.DLLookup/ClientApp/public/locales/en-US/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"noSearchResults": "No results found. Try searching again.",
"unauthorizedErrorMessage": "Something went wrong. Try again in a few minutes.",
"forbiddenErrorMessage": "Permissions needed. Contact your IT admin to request access.",
"generalErrorMessage": "Something went wrong. Try again in a few minutes. If the problem persists, contact your IT admin.",
"generalErrorMessage": "Something went wrong. Try again in a few minutes. If the problem persists, please contact your IT admin.",
"groupChatMessage": "Can we start a smaller group chat?",
"groupChatCountMessage": "You selected more than 100 members to chat with. Currently, group chats in Teams are limited to 100 people.",
"groupChatRecentMembers": "Would you like us to start a chat now with the 100 members who are currently online?",
Expand Down
19 changes: 16 additions & 3 deletions Source/Microsoft.Teams.Apps.DLLookup/ClientApp/src/App.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Source/Microsoft.Teams.Apps.DLLookup/ClientApp/src/App.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions Source/Microsoft.Teams.Apps.DLLookup/ClientApp/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,31 @@ class App extends React.Component<{}, IAppState> {
});
}

/*
Bug: 3 - uses can choose dark mode (for night view), but that hides many icons.. need to disable night view option..
Resolution: Prevent darkContainer CSS from being used.
Future: Change CSS to show icons and text. */

public setThemeComponent = () => {
// if (this.state.theme === "dark") {
// return (
// <Provider theme={themes.teamsDark}>
// <div className="darkContainer">
// {this.getAppDom()}
// </div>
// </Provider>
// );
// }
if (this.state.theme === "dark") {
return (
<Provider theme={themes.teamsDark}>
<div className="darkContainer">
<Provider theme={themes.teams}>
<div className="default-container">
{this.getAppDom()}
</div>
</Provider>
);
}
else if (this.state.theme === "contrast") {
if (this.state.theme === "contrast") {
return (
<Provider theme={themes.teamsHighContrast}>
<div className="highContrastContainer">
Expand Down
Loading