From 1dfa8361c5f45e15621604cfea5f917c11f0af70 Mon Sep 17 00:00:00 2001 From: Nostradamos Date: Wed, 23 Aug 2017 22:12:02 +0200 Subject: [PATCH 1/8] Fixed https://github.com/vector-im/riot-web/issues/4804 --- src/components/structures/LoginBox.js | 2 +- .../css/matrix-react-sdk/structures/_LoginBox.scss | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js index c9f8e87a1..7cacc14e8 100644 --- a/src/components/structures/LoginBox.js +++ b/src/components/structures/LoginBox.js @@ -84,7 +84,7 @@ module.exports = React.createClass({ var self = this; return ( -
+
{ loginButton } { toggleCollapse }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss index 92d8833bc..624dd15f9 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss @@ -14,6 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ +.mx_LoginBox { + min-height: 24px; + height: unset !important; + padding-top: 13px !important; + padding-bottom: 14px !important; +} + .mx_LoginBox_loginButton_wrapper { text-align: center; width: 100%; @@ -21,13 +28,13 @@ limitations under the License. .mx_LoginBox_loginButton, .mx_LoginBox_registerButton { - margin-top: -8px; + margin-top: 3px; height: 40px; border: 0px; border-radius: 40px; margin-left: 4px; margin-right: 4px; - width: 80px; + min-width: 80px; background-color: $accent-color; color: $primary-bg-color; From 372692677646f5e72a29c6aaec691c561d8421cb Mon Sep 17 00:00:00 2001 From: Nostradamos Date: Fri, 25 Aug 2017 18:23:56 +0200 Subject: [PATCH 2/8] added padding-left/padding-right: 12px to login/register buttons --- src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss index 624dd15f9..ffb1df22c 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss @@ -42,4 +42,6 @@ limitations under the License. cursor: pointer; font-size: 15px; + padding-left: 12px; + padding-right: 12px; } From 1c387c1fd12c58a41e26b57c3414d5ca0399405e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 27 Aug 2017 23:37:13 +0100 Subject: [PATCH 3/8] fix two room list regressions: + missing roomsublist badge for invites + missing room badge for invites if i18n!=English Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomSubList.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 7c6b16229..fc9b30b84 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -78,6 +78,9 @@ var RoomSubList = React.createClass({ // undefined if no room is selected (eg we are showing settings) selectedRoom: React.PropTypes.string, + // pass explicitly, do not rely on label==='Invites' because i18n. + isInvite: React.PropTypes.bool, + startAsHidden: React.PropTypes.bool, showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed? @@ -246,7 +249,7 @@ var RoomSubList = React.createClass({ return this.props.list.reduce(function(result, room, index) { if (truncateAt === undefined || index >= truncateAt) { var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId); - var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites'; + var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite; var notificationCount = room.getUnreadNotificationCount(); const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState); @@ -376,8 +379,8 @@ var RoomSubList = React.createClass({ collapsed={ self.props.collapsed || false} selected={ selected } unread={ Unread.doesRoomHaveUnreadMessages(room) } - highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' } - isInvite={ self.props.label === 'Invites' } + highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite } + isInvite={ self.props.isInvite } refreshSubList={ self._updateSubListCount } incomingCall={ null } onClick={ self.onRoomTileClick } @@ -409,6 +412,9 @@ var RoomSubList = React.createClass({ var badge; if (subListNotifCount > 0) { badge =
{ FormattingUtils.formatCount(subListNotifCount) }
; + } else if (this.props.isInvite) { + // no notifications but highlight anyway because this is an invite badge + badge =
!
; } // When collapsed, allow a long hover on the header to show user From a2b57f502ce591926eb27312317866c63c39aa44 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 28 Aug 2017 00:07:48 +0100 Subject: [PATCH 4/8] lets let people know that the bug report actually sent properly :) RFC on the wording of it. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/BugReportDialog.js | 8 +++++++- src/i18n/strings/en_EN.json | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js index 0db425e33..849d32f85 100644 --- a/src/components/views/dialogs/BugReportDialog.js +++ b/src/components/views/dialogs/BugReportDialog.js @@ -17,6 +17,7 @@ limitations under the License. import React from 'react'; import sdk from 'matrix-react-sdk'; import SdkConfig from 'matrix-react-sdk/lib/SdkConfig'; +import Modal from 'matrix-react-sdk/lib/Modal'; import { _t } from 'matrix-react-sdk/lib/languageHandler'; export default class BugReportDialog extends React.Component { @@ -64,8 +65,13 @@ export default class BugReportDialog extends React.Component { progressCallback: this._sendProgressCallback, }).then(() => { if (!this._unmounted) { - this.setState({ busy: false, progress: null }); this.props.onFinished(false); + const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); + Modal.createTrackedDialog('Bug report sent', '', QuestionDialog, { + title: _t('Bug report sent'), + description: _t('Thank you!'), + hasCancelButton: false, + }); } }, (err) => { if (!this._unmounted) { diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index cecb248ce..0dc935948 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -9,6 +9,7 @@ "All Rooms": "All Rooms", "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.", "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.", + "Bug report sent": "Bug report sent", "Call invitation": "Call invitation", "Cancel": "Cancel", "Cancel Sending": "Cancel Sending", @@ -149,6 +150,7 @@ "You are not receiving desktop notifications": "You are not receiving desktop notifications", "You are Rioting as a guest. Register or sign in to access more rooms and features!": "You are Rioting as a guest. Register or sign in to access more rooms and features!", "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply", + "Thank you!": "Thank you!", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", From f560dc4c11ec67adef10c52a51aa8db834d3c6c8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 29 Aug 2017 14:57:29 +0100 Subject: [PATCH 5/8] add useful comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/RoomSubList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index fc9b30b84..da5b120f7 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -78,7 +78,7 @@ var RoomSubList = React.createClass({ // undefined if no room is selected (eg we are showing settings) selectedRoom: React.PropTypes.string, - // pass explicitly, do not rely on label==='Invites' because i18n. + // passed through to RoomTile and used to highlight room with `!` regardless of notifications count isInvite: React.PropTypes.bool, startAsHidden: React.PropTypes.bool, From dd73aeec70c7ccc2bcaed0ac1192d8ab382f4471 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 29 Aug 2017 23:06:50 -0400 Subject: [PATCH 6/8] another s/vector/riot/ Signed-off-by: Hubert Chathi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 271382030..72b2df184 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ released version of Riot: 1. Download the latest version from https://github.com/vector-im/riot-web/releases 1. Untar the tarball on your web server -1. Move (or symlink) the vector-x.x.x directory to an appropriate name +1. Move (or symlink) the riot-x.x.x directory to an appropriate name 1. If desired, copy `config.sample.json` to `config.json` and edit it as desired. See below for details. 1. Enter the URL into your browser and log into Riot! From 8e5427d6263cb6257c46da03d8e395822047dc75 Mon Sep 17 00:00:00 2001 From: "Andrew (anoa)" Date: Wed, 30 Aug 2017 12:06:19 -0700 Subject: [PATCH 7/8] Update vector-im to riot-im on Login Signed-off-by: Andrew (anoa) --- src/components/views/login/VectorLoginFooter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/login/VectorLoginFooter.js b/src/components/views/login/VectorLoginFooter.js index e905afc1d..b04dcdb59 100644 --- a/src/components/views/login/VectorLoginFooter.js +++ b/src/components/views/login/VectorLoginFooter.js @@ -30,7 +30,7 @@ module.exports = React.createClass({
blog  ·   twitter  ·   - github  ·   + github  ·   { _t('powered by Matrix') }
); From 861b6a2c6c773e87db84e3296873d75855191c07 Mon Sep 17 00:00:00 2001 From: Nostradamos Date: Wed, 30 Aug 2017 22:25:09 +0200 Subject: [PATCH 8/8] Changed padding to 0px 11px and added word-break: break-word --- .../vector/css/matrix-react-sdk/structures/_LoginBox.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss index ffb1df22c..7f6199c45 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss @@ -42,6 +42,6 @@ limitations under the License. cursor: pointer; font-size: 15px; - padding-left: 12px; - padding-right: 12px; + padding: 0 11px; + word-break: break-word; }