From bcbd367ef51fa40aac09e5b601e708ec50769214 Mon Sep 17 00:00:00 2001 From: erikhallaraaker Date: Wed, 4 Jul 2018 11:10:22 +0200 Subject: [PATCH 01/64] Removed mypayex logo option from topbar. Logo is now defaulted to standard payex logo, class .logo-default is no longer needed. --- CHANGELOG.md | 6 ++++++ src/img/my-px-logo.svg | 33 --------------------------------- src/less/components/topbar.less | 15 +++------------ 3 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 src/img/my-px-logo.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index aa5fabd84..01dfa7953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [0.8.0] - 2018-07- + +### Changed + +- Removed mypayex logo option from topbar. Logo is now defaulted to standard payex logo, class `.logo-default` is no longer needed. + ## [0.7.1] - 2018-07-03 ### Fixed diff --git a/src/img/my-px-logo.svg b/src/img/my-px-logo.svg deleted file mode 100644 index c8413b701..000000000 --- a/src/img/my-px-logo.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - Slice 1 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/less/components/topbar.less b/src/less/components/topbar.less index 4d2c496c0..08f97e868 100644 --- a/src/less/components/topbar.less +++ b/src/less/components/topbar.less @@ -22,18 +22,9 @@ height: 50px; margin-left: 1rem; margin-right: auto; - - &.logo-default { - background: url("../../img/px-logo.svg") no-repeat; - background-size: cover; - width: 156px; - } - - &.logo-mypayex { - background: url("../../img/my-px-logo.svg") no-repeat; - background-size: contain; - width: 180px; - } + background: url("../../img/px-logo.svg") no-repeat; + background-size: cover; + width: 156px; } .topbar-btn-left, From fc9658d143dfa3b40330bc766ecc04485c9b4a21 Mon Sep 17 00:00:00 2001 From: erikhallaraaker Date: Wed, 4 Jul 2018 11:31:54 +0200 Subject: [PATCH 02/64] Added rule to remove margin-top from headings that are first-child. --- src/less/core/typography.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/less/core/typography.less b/src/less/core/typography.less index 7c9c1775a..753213bc4 100644 --- a/src/less/core/typography.less +++ b/src/less/core/typography.less @@ -11,6 +11,10 @@ h1, h2, h3, h4, h5, h6, font-weight: @headings-font-weight; line-height: @headings-line-height; color: @headings-color; + + &:first-child { + margin-top: 0; + } } /* stylelint-enable selector-list-comma-newline-after */ From d9019b5f88caf55a139be86f2aef21f34addf0fe Mon Sep 17 00:00:00 2001 From: erikhallaraaker Date: Wed, 4 Jul 2018 12:47:49 +0200 Subject: [PATCH 03/64] Cleaned up some of the old topbar logo markup --- src/App/AppHeader/index.js | 2 +- src/App/components/Topbar/index.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/App/AppHeader/index.js b/src/App/AppHeader/index.js index be6768587..670b5595f 100644 --- a/src/App/AppHeader/index.js +++ b/src/App/AppHeader/index.js @@ -11,7 +11,7 @@ const AppHeader = ({ location }) => { return (
- +