diff --git a/package-lock.json b/package-lock.json index 94d6b1942..b96809f94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1342,9 +1342,9 @@ } }, "@coralproject/rte": { - "version": "0.10.9", - "resolved": "https://registry.npmjs.org/@coralproject/rte/-/rte-0.10.9.tgz", - "integrity": "sha512-0K+bc3JaOhjgJJ91uupev4EmSoldd/IizfjRgAQ8LbZjRc3pWprzIBhoTMChApBzz7eI9DUfw2ULg5muziV8BA==", + "version": "0.10.11", + "resolved": "https://registry.npmjs.org/@coralproject/rte/-/rte-0.10.11.tgz", + "integrity": "sha512-Tq8NznCOYx84QpHhZbUldxcYrztEQnnNjDC2aW5HhzltO9nBG2Hu78MzTwliML3MmaTFbLehdIb/BKGKj4eMSw==", "dev": true, "requires": { "bowser": "^1.0.0", @@ -20822,9 +20822,9 @@ "dev": true }, "react-contenteditable": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-2.1.5.tgz", - "integrity": "sha512-mjaxwybOX7Om8Cx/0mVCUpgvAyheP48JXoABMTvzWENluFTpwAhlsLfKN4xNZk3Y7DsiidA7mUZibh0sTMly2w==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-2.1.6.tgz", + "integrity": "sha512-HqqAdAP69SEhZhlrzJSujVSVMmThpUzVnbNDB7dFk+LWhvuhNj5iT0DgedoURpPJqbTDX8msSkFuU7FsAMxf3Q==", "dev": true, "requires": { "@types/prop-types": "^15.5.4", diff --git a/package.json b/package.json index 5a29bc959..355e5db4d 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "@babel/polyfill": "7.0.0-beta.49", "@babel/preset-env": "7.0.0-beta.49", "@babel/preset-react": "7.0.0-beta.49", - "@coralproject/rte": "^0.10.9", + "@coralproject/rte": "^0.10.11", "@types/bcryptjs": "^2.4.1", "@types/bull": "^3.3.16", "@types/bunyan": "^1.8.4", diff --git a/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap b/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap index 47693769e..248adc0d2 100644 --- a/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap +++ b/src/core/client/auth/test/__snapshots__/navigation.spec.tsx.snap @@ -140,7 +140,7 @@ exports[`navigates to sign in form 1`] = ` onTouchEnd={[Function]} type="submit" > - Sign in and join the conversation + Sign in to Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign in and join the conversation + Sign in to Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign up and join the conversation + Sign up and Join the Conversation
- Sign in and join the conversation + Sign in and Join the Conversation
@@ -480,7 +480,7 @@ exports[`renders comment stream 1`] = ` onTouchEnd={[Function]} type="submit" > - Sign in and join the conversation + Sign in and Join the Conversation
@@ -634,7 +634,7 @@ exports[`renders comment stream 1`] = ` onTouchEnd={[Function]} type="button" > - Load more + Load More
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap index 2c4a7ed98..2857bd17a 100644 --- a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap @@ -21,7 +21,7 @@ exports[`renders permalink view 1`] = ` target="_parent" type="button" > - Show all comments + Show All Comments
- Sign in and join the conversation + Sign in and Join the Conversation
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap index e9e7cff3c..e3d7ca646 100644 --- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap @@ -21,7 +21,7 @@ exports[`renders permalink view with unknown comment 1`] = ` target="_parent" type="button" > - Show all comments + Show All Comments

- Sign in and join the conversation + Sign in and Join the Conversation

diff --git a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap index 1b2669c4e..1ffdb59c7 100644 --- a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap @@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = ` onTouchEnd={[Function]} type="submit" > - Sign in and join the conversation + Sign in and Join the Conversation
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap index e4baedf5f..a6ed47452 100644 --- a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap @@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = ` onTouchEnd={[Function]} type="submit" > - Sign in and join the conversation + Sign in and Join the Conversation
diff --git a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap index 4353d3187..fe7fa13f6 100644 --- a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap @@ -135,7 +135,7 @@ exports[`renders comment stream 1`] = ` onTouchEnd={[Function]} type="submit" > - Sign in and join the conversation + Sign in and Join the Conversation
@@ -292,7 +292,7 @@ exports[`renders comment stream 1`] = ` onTouchEnd={[Function]} type="button" > - Show all + Show All
@@ -437,7 +437,7 @@ exports[`show all replies 1`] = ` onTouchEnd={[Function]} type="submit" > - Sign in and join the conversation + Sign in and Join the Conversation
diff --git a/src/core/client/ui/components/BaseButton/BaseButton.css b/src/core/client/ui/components/BaseButton/BaseButton.css index a20ff333a..14b111258 100644 --- a/src/core/client/ui/components/BaseButton/BaseButton.css +++ b/src/core/client/ui/components/BaseButton/BaseButton.css @@ -1,6 +1,5 @@ .root { composes: buttonReset from "talk-ui/shared/buttonReset.css"; - text-transform: capitalize; } .keyboardFocus { diff --git a/src/locales/en-US/auth.ftl b/src/locales/en-US/auth.ftl index 236530dd6..81b40429d 100644 --- a/src/locales/en-US/auth.ftl +++ b/src/locales/en-US/auth.ftl @@ -4,7 +4,7 @@ signIn-signInToJoinHeader = Sign in to join the conversation -signIn-signInAndJoinButton = Sign in and join the conversation +signIn-signInAndJoinButton = Sign in to Join the Conversation signIn-emailAddressLabel = Email Address signIn-emailAddressTextField = @@ -22,7 +22,7 @@ signIn-noAccountSignUp = Don't have an account? signUp-signUpToJoinHeader = Sign up to join the conversation -signUp-signUpAndJoinButton = Sign up and join the conversation +signUp-signUpAndJoinButton = Sign up and Join the Conversation signUp-emailAddressLabel = Email Address signUp-emailAddressTextField = diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl index 1a2b81f5f..a62d6723a 100644 --- a/src/locales/en-US/stream.ftl +++ b/src/locales/en-US/stream.ftl @@ -17,13 +17,13 @@ general-userBoxAuthenticated-notYou = comments-streamQuery-assetNotFound = Asset not found comments-postCommentForm-submit = Submit -comments-stream-loadMore = Load more -comments-replyList-showAll = Show all +comments-stream-loadMore = Load More +comments-replyList-showAll = Show All comments-permalinkButton-share = Share comments-permalinkPopover-copy = Copy comments-permalinkPopover-copied = Copied -comments-permalinkView-showAllComments = Show all comments +comments-permalinkView-showAllComments = Show All Comments comments-permalinkView-commentNotFound = Comment not found comments-rte-bold = @@ -37,7 +37,7 @@ comments-rte-blockquote = comments-poweredBy = Powered by { -brand-name } -comments-postCommentFormFake-signInAndJoin = Sign in and join the conversation +comments-postCommentFormFake-signInAndJoin = Sign in and Join the Conversation comments-postCommentForm-rteLabel = Post a comment