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.

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

Kieran gould/12hourtimestamp #3961

Merged
merged 4 commits into from
May 26, 2017

Conversation

Kieran-Gould
Copy link
Contributor

@Kieran-Gould Kieran-Gould changed the base branch from master to develop May 18, 2017 21:24
@@ -94,7 +94,7 @@ limitations under the License.
*/
.mx_EventTile_selected .mx_EventTile_line {
border-left: $accent-color 5px solid;
padding-left: 60px;
padding-left: 100px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please let's not change the whole layout of the app just to provide the option of 12h timestamps ;)

See comments of https://github.com/matrix-org/matrix-react-sdk/pull/903/files#r117365391

{ DateUtils.formatTime(date) }
</span>
);
if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically the state of render() should depend only on props & state rather than js-sdk state, but i'm happy to ignore this for now :)

</span>
);
}
else {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

else should be on previous line for readability :)

</span>
);
if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
return (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation should be 4 spaces pleaseeeee

@@ -112,4 +112,3 @@ limitations under the License.
.mx_FilePanel .mx_EventTile_selected .mx_EventTile_line {
padding-left: 0px;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably not worth messing up latest commit on this file for this

@@ -263,6 +263,10 @@ limitations under the License.
cursor: pointer;
}

.mx_EventTile_e2eIcon_12hr {
padding-left: 5px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation pl0x

@ara4n
Copy link
Member

ara4n commented May 18, 2017

this lgtm other than concerns on the react-sdk one (including how to structure the CSS)

@ara4n
Copy link
Member

ara4n commented May 26, 2017

lgtm having fixed typo, i think

@ara4n ara4n merged commit 9156a87 into element-hq:develop May 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants