From 5330770f34833942f1d01c378cd97bf7866f98b8 Mon Sep 17 00:00:00 2001 From: Janne Koivistoinen Date: Tue, 19 Dec 2017 15:03:21 +0200 Subject: [PATCH 1/4] ready for Hannu to work on the li element --- src/components/LayoutSideNavigation/LayoutSideNavigation.css | 2 +- src/components/LayoutWrapperSideNav/LayoutWrapperSideNav.css | 2 +- src/containers/ProfilePage/ProfilePage.css | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/LayoutSideNavigation/LayoutSideNavigation.css b/src/components/LayoutSideNavigation/LayoutSideNavigation.css index bdae085f..9ac7a229 100644 --- a/src/components/LayoutSideNavigation/LayoutSideNavigation.css +++ b/src/components/LayoutSideNavigation/LayoutSideNavigation.css @@ -35,7 +35,7 @@ padding: 24px; @media (--viewportLarge) { - padding: 118px 15vw 82px 82px; + padding: 116px 15vw 82px 82px; background-color: var(--matterColorLight); border-left-width: 1px; border-left-style: solid; diff --git a/src/components/LayoutWrapperSideNav/LayoutWrapperSideNav.css b/src/components/LayoutWrapperSideNav/LayoutWrapperSideNav.css index e57de45c..3d60dc09 100644 --- a/src/components/LayoutWrapperSideNav/LayoutWrapperSideNav.css +++ b/src/components/LayoutWrapperSideNav/LayoutWrapperSideNav.css @@ -14,7 +14,7 @@ box-shadow: var(--boxShadow); @media (--viewportLarge) { - padding: 113px 0 82px 15vw; + padding: 112px 0 82px 15vw; flex-direction: column; justify-content: flex-start; border: none; diff --git a/src/containers/ProfilePage/ProfilePage.css b/src/containers/ProfilePage/ProfilePage.css index cd02869b..14185c80 100644 --- a/src/containers/ProfilePage/ProfilePage.css +++ b/src/containers/ProfilePage/ProfilePage.css @@ -118,7 +118,8 @@ margin-bottom: 0; } @media (--viewportLarge) { - margin-top: 19px; + margin-top: 58px; + margin-bottom: 8px; } } @@ -158,7 +159,7 @@ } /* Vertical space */ - margin-top: 41px; + margin-top: 0; &:nth-of-type(1), &:nth-of-type(2) { margin-top: 20px; From 76d5b91db93e11fd489c120c73e2ae9cc82c1f05 Mon Sep 17 00:00:00 2001 From: Hannu Lyytikainen Date: Tue, 19 Dec 2017 15:19:54 +0200 Subject: [PATCH 2/4] Limit li styles to apply only to Reviews component --- src/components/Reviews/Reviews.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Reviews/Reviews.css b/src/components/Reviews/Reviews.css index 66c2f648..0a689914 100644 --- a/src/components/Reviews/Reviews.css +++ b/src/components/Reviews/Reviews.css @@ -2,17 +2,17 @@ .root { margin: 0; -} -li { - margin-bottom: 32px; + & li { + margin-bottom: 32px; - &:last-of-type { - margin-bottom: 0; - } + &:last-of-type { + margin-bottom: 0; + } - @media (--viewportMedium) { - margin-bottom: 39px; + @media (--viewportMedium) { + margin-bottom: 39px; + } } } From b0cadc146265b55a3cbc8ed77fa85be4bb155a53 Mon Sep 17 00:00:00 2001 From: Janne Koivistoinen Date: Tue, 19 Dec 2017 15:37:01 +0200 Subject: [PATCH 3/4] design review done --- src/containers/ProfilePage/ProfilePage.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/containers/ProfilePage/ProfilePage.css b/src/containers/ProfilePage/ProfilePage.css index 14185c80..81f883ed 100644 --- a/src/containers/ProfilePage/ProfilePage.css +++ b/src/containers/ProfilePage/ProfilePage.css @@ -86,8 +86,6 @@ .bio { /* Preserve newlines, but collapse other whitespace */ white-space: pre-line; - - max-width: 563px; margin: 5px 0 24px 0; @media (--viewportMedium) { @@ -95,6 +93,7 @@ } @media (--viewportLarge) { margin: 0 0 56px 0; + max-width: 600px; } } @@ -163,6 +162,7 @@ &:nth-of-type(1), &:nth-of-type(2) { margin-top: 20px; + margin-bottom: 36px; } } } @@ -175,6 +175,10 @@ .desktopReviews { margin-top: 28px; + + @media (--viewportLarge) { + max-width: 600px; + } } .desktopReviewsTitle { From 80c87f4a64feea5bffdb0f2ee8d512bc1a11e76e Mon Sep 17 00:00:00 2001 From: Hannu Lyytikainen Date: Wed, 20 Dec 2017 09:41:32 +0200 Subject: [PATCH 4/4] Use a style class instead of li element style --- src/components/Reviews/Reviews.css | 16 ++++++++-------- src/components/Reviews/Reviews.js | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Reviews/Reviews.css b/src/components/Reviews/Reviews.css index 0a689914..9d4f16f4 100644 --- a/src/components/Reviews/Reviews.css +++ b/src/components/Reviews/Reviews.css @@ -2,17 +2,17 @@ .root { margin: 0; +} - & li { - margin-bottom: 32px; +.reviewItem { + margin-bottom: 32px; - &:last-of-type { - margin-bottom: 0; - } + &:last-of-type { + margin-bottom: 0; + } - @media (--viewportMedium) { - margin-bottom: 39px; - } + @media (--viewportMedium) { + margin-bottom: 39px; } } diff --git a/src/components/Reviews/Reviews.js b/src/components/Reviews/Reviews.js index 0248feee..0cca0063 100644 --- a/src/components/Reviews/Reviews.js +++ b/src/components/Reviews/Reviews.js @@ -54,7 +54,7 @@ const ReviewsComponent = props => {
    {reviews.map(r => { return ( -
  • +
  • );