0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00

Fixed merge error

This commit is contained in:
Peter Zimon 2020-09-15 11:31:40 +02:00 committed by Rishabh Garg
parent fab3e3ff3b
commit 8f9cef5a68

View file

@ -8,13 +8,10 @@ import {getDateString} from '../../utils/date-time';
const React = require('react');
export const AccountHomePageStyles = `
<<<<<<< HEAD
.gh-portal-content.account-home {
max-height: calc(100vh - 12vw - 104px);
}
=======
>>>>>>> Added back button and rearranged logout
.gh-portal-account-main {
background: var(--grey13);
margin: -32px;