From f4470f12d8ddceeb1ff3a16306e96d97b96d080c Mon Sep 17 00:00:00 2001 From: Nikita Kashtanov Date: Mon, 2 Dec 2019 17:05:08 +0300 Subject: [PATCH 1/4] change previous week to iso --- src/components/DateTimeFilter/Ranges/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/DateTimeFilter/Ranges/index.jsx b/src/components/DateTimeFilter/Ranges/index.jsx index 4631f2a3..f6395d20 100644 --- a/src/components/DateTimeFilter/Ranges/index.jsx +++ b/src/components/DateTimeFilter/Ranges/index.jsx @@ -35,10 +35,10 @@ const RANGE = [ { from: moment() .subtract(1, "weeks") - .startOf("week"), + .startOf("isoWeek"), to: moment() .subtract(1, "weeks") - .endOf("week"), + .endOf("isoWeek"), title: "Previous week", }, { From 7e1aa206e3019536aeee24dc7c550e7f373e901e Mon Sep 17 00:00:00 2001 From: Nikita Kashtanov Date: Wed, 25 Dec 2019 15:20:56 +0300 Subject: [PATCH 2/4] fix firefox layout bug in EntryCard --- .../EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx index 768767dd..017b4b2e 100644 --- a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx +++ b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx @@ -3,6 +3,7 @@ import styled, { css } from "styled-components"; const StyledEntryCardPhoto = styled.div` display: flex; align-items: center; + min-width: 103px; ${({ hidden }) => hidden && From de61b0b73aad262adc72656c71ff94a8778d4451 Mon Sep 17 00:00:00 2001 From: Nikita Kashtanov Date: Fri, 27 Dec 2019 11:20:12 +0300 Subject: [PATCH 3/4] fix firefox photos layout problem --- .../EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx | 1 + .../EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx index dcf8faaf..fcf81989 100644 --- a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx +++ b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx @@ -6,6 +6,7 @@ const EntryCardPhotoTitle = styled.p` text-transform: uppercase; writing-mode: vertical-lr; margin: 0; + width: 19px; `; export { EntryCardPhotoTitle }; diff --git a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx index 017b4b2e..768767dd 100644 --- a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx +++ b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/StyledEntryCardPhoto.jsx @@ -3,7 +3,6 @@ import styled, { css } from "styled-components"; const StyledEntryCardPhoto = styled.div` display: flex; align-items: center; - min-width: 103px; ${({ hidden }) => hidden && From fa8f7bf12a18a84813d6ba2cc2201fc8da4eccb0 Mon Sep 17 00:00:00 2001 From: Nikita Kashtanov Date: Fri, 27 Dec 2019 12:02:50 +0300 Subject: [PATCH 4/4] add comment for firefox fix --- .../EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx index fcf81989..935112f7 100644 --- a/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx +++ b/src/components/Entries/components/EntryCardPhotos/EntryCardPhoto/EntryCardPhotoTitle.jsx @@ -1,5 +1,5 @@ import styled from "styled-components"; - +// a fixed width is needed for correct work in firefox (width equals line-height) const EntryCardPhotoTitle = styled.p` font-size: 13px; transform: rotate(-180deg);