diff --git a/ghost/portal/src/components/Frame.styles.js b/ghost/portal/src/components/Frame.styles.js index e03fa31d9f..157092ef91 100644 --- a/ghost/portal/src/components/Frame.styles.js +++ b/ghost/portal/src/components/Frame.styles.js @@ -35,14 +35,13 @@ export const GlobalStyles = ` --grey13: #f8f8f8; --white: #fff; } - /* Globals /* ----------------------------------------------------- */ h1, h2, h3, h4, h5, h6, p { + line-height: 1.15em; padding: 0; margin: 0; - line-height: 1.15em; } h1 { @@ -84,8 +83,8 @@ export const GlobalStyles = ` .gh-portal-text-disabled { color: var(--grey3); - opacity: 0.35; font-weight: normal; + opacity: 0.35; } .gh-portal-text-center { @@ -93,16 +92,16 @@ export const GlobalStyles = ` } .gh-portal-input-label { - font-size: 1.3rem; - margin-bottom: 2px; - font-weight: 500; color: var(--grey1); + font-size: 1.3rem; + font-weight: 500; + margin-bottom: 2px; letter-spacing: 0.35px; } .gh-portal-setting-data { - font-size: 1.3rem; color: var(--grey6); + font-size: 1.3rem; line-height: 1.15em; } @@ -113,24 +112,24 @@ export const GlobalStyles = ` display: flex; align-items: center; justify-content: center; - padding: 0 1.8rem; - height: 42px; - border: none; font-size: 1.4rem; - line-height: 1em; font-weight: 500; + line-height: 1em; letter-spacing: 0.2px; text-align: center; - text-decoration: none; white-space: nowrap; + text-decoration: none; + color: var(--grey0); + background: var(--white); + border: none; + height: 42px; + padding: 0 1.8rem; border-radius: 4px; cursor: pointer; transition: .4s ease; box-shadow: none; - user-select: none; - background: var(--white); box-shadow: 0 0 0 1px rgba(0,0,0,0.08), 0 2px 6px -3px rgba(0,0,0,0.19); - color: var(--grey0); + user-select: none; } .gh-portal-btn:hover { @@ -149,9 +148,9 @@ export const GlobalStyles = ` } .gh-portal-btn-link { + line-height: 1; background: none; padding: 0; - line-height: 1; height: unset; box-shadow: none; border: none; @@ -188,21 +187,21 @@ export const GlobalStyles = ` .gh-portal-popup-container { position: relative; - letter-spacing: 0; - text-rendering: optimizeLegibility; - font-size: 1.5rem; display: flex; + box-sizing: border-box; + top: 100px; flex-direction: column; justify-content: flex-start; - top: 100px; overflow: hidden; - padding: 32px; + font-size: 1.5rem; text-align: left; - box-sizing: border-box; + letter-spacing: 0; + text-rendering: optimizeLegibility; background: var(--white); width: 440px; - border-radius: 5px; + padding: 32px; margin: 0 auto; + border-radius: 5px; box-shadow: 0 3.8px 2.2px rgba(0, 0, 0, 0.028), 0 9.2px 5.3px rgba(0, 0, 0, 0.04), 0 17.3px 10px rgba(0, 0, 0, 0.05), 0 30.8px 17.9px rgba(0, 0, 0, 0.06), 0 57.7px 33.4px rgba(0, 0, 0, 0.072), 0 138px 80px rgba(0, 0, 0, 0.1); animation: popup 0.25s; } @@ -227,10 +226,10 @@ export const GlobalStyles = ` } .gh-portal-closeicon { - width: 16px; - height: 16px; color: var(--grey9); cursor: pointer; + width: 16px; + height: 16px; padding: 12px; } @@ -263,9 +262,9 @@ export const GlobalStyles = ` top: -10px; left: 0; background: none; - box-shadow: none; padding: 0; margin: 0; + box-shadow: none; } .gh-portal-detail-footer .gh-portal-btn { @@ -283,9 +282,9 @@ export const GlobalStyles = ` /* ----------------------------------------------------- */ .gh-portal-list { background: var(--white); - box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.07), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.05); - border-radius: 3px; padding: 20px; + border-radius: 3px; + box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.07), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.05); } .gh-portal-list section { @@ -321,13 +320,13 @@ export const GlobalStyles = ` } .gh-portal-btn-list { - height: 38px; font-size: 1.4rem; + color: var(--brandcolor); + height: 38px; width: unset; padding: 0 4px; margin: 0 -4px; box-shadow: none; - color: var(--brandcolor); } .gh-portal-btn-list:hover { diff --git a/ghost/portal/src/components/common/ActionButton.js b/ghost/portal/src/components/common/ActionButton.js index 241e444958..e3c7b76ae1 100644 --- a/ghost/portal/src/components/common/ActionButton.js +++ b/ghost/portal/src/components/common/ActionButton.js @@ -13,11 +13,11 @@ export const ActionButtonStyles = ` .gh-portal-btn-primary:hover::before { position: absolute; - content: ""; top: 0; left: 0; right: 0; bottom: 0; + content: ""; background: rgba(255, 255, 255, 0.08); border-radius: 5px; } diff --git a/ghost/portal/src/components/common/InputField.js b/ghost/portal/src/components/common/InputField.js index 816f183564..241b54abb2 100644 --- a/ghost/portal/src/components/common/InputField.js +++ b/ghost/portal/src/components/common/InputField.js @@ -3,17 +3,17 @@ import React from 'react'; export const InputFieldStyles = ` .gh-portal-input { display: block; - padding: 0 12px; - width: 100%; - height: 40px; - outline: none; + box-sizing: border-box; + font-size: 1.5rem; color: inherit; background: var(--white); + outline: none; border: none; border-radius: 3px; - font-size: 1.5rem; + width: 100%; + height: 40px; + padding: 0 12px; margin-bottom: 18px; - box-sizing: border-box; letter-spacing: 0.2px; box-shadow: 0px 0px 0px 1px #e1e1e1 , 0px 2px 4px 0px rgba(0, 0, 0, 0.07), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.05); transition: all 0.25s ease-in-out; diff --git a/ghost/portal/src/components/common/MemberGravatar.js b/ghost/portal/src/components/common/MemberGravatar.js index 44b4e4f397..6d2778debd 100644 --- a/ghost/portal/src/components/common/MemberGravatar.js +++ b/ghost/portal/src/components/common/MemberGravatar.js @@ -13,8 +13,8 @@ export const AvatarStyles = ` } .gh-portal-avatar img { - display: block; position: absolute; + display: block; top: -1px; right: -1px; bottom: -1px; diff --git a/ghost/portal/src/components/common/PlansSection.js b/ghost/portal/src/components/common/PlansSection.js index 151dc89748..3bfcc10841 100644 --- a/ghost/portal/src/components/common/PlansSection.js +++ b/ghost/portal/src/components/common/PlansSection.js @@ -9,29 +9,29 @@ export const PlanSectionStyles = ` } .gh-portal-plan-section { + position: relative; display: flex; flex-direction: column; align-items: center; - position: relative; - padding: 16px; flex: 1; - border-right: 1px solid var(--grey10); font-size: 1.4rem; line-height: 1.35em; + border-right: 1px solid var(--grey10); + padding: 16px; cursor: pointer; } .gh-portal-plan-section.checked::before { position: absolute; display: block; - pointer-events: none; - content: ""; top: -1px; right: -1px; bottom: -1px; left: -1px; - border: 2px solid var(--brandcolor); + content: ""; z-index: 999; + border: 2px solid var(--brandcolor); + pointer-events: none; } .gh-portal-plan-section:first-of-type.checked::before { @@ -53,10 +53,10 @@ export const PlanSectionStyles = ` } .gh-portal-plan-name { - text-transform: uppercase; + font-size: 1.2rem; font-weight: 500; letter-spacing: 0.5px; - font-size: 1.2rem; + text-transform: uppercase; margin-top: 8px; } @@ -64,8 +64,8 @@ export const PlanSectionStyles = ` position: relative; bottom: 5px; font-size: 1.4rem; - letter-spacing: 0.4px; font-weight: 500; + letter-spacing: 0.4px; } .gh-portal-plan-price { @@ -79,23 +79,23 @@ export const PlanSectionStyles = ` } .gh-portal-plan-feature { - margin-top: 12px; - padding-top: 12px; - text-align: center; font-size: 1.25rem; + font-weight: 500; line-height: 1.25em; + text-align: center; + letter-spacing: 0.2px; border-top: 1px solid var(--grey12); width: 100%; - letter-spacing: 0.2px; - font-weight: 500; + margin-top: 12px; + padding-top: 12px; } .gh-portal-plan-checkbox { - display: block; position: relative; + display: block; + font-size: 22px; height: 18px; cursor: pointer; - font-size: 22px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -104,20 +104,20 @@ export const PlanSectionStyles = ` .gh-portal-plan-checkbox input { position: absolute; - opacity: 0; - cursor: pointer; height: 0; width: 0; + opacity: 0; + cursor: pointer; } .gh-portal-plan-checkbox .checkmark { position: absolute; top: 0; left: -9px; - height: 18px; - width: 18px; background-color: var(--grey12); border-radius: 999px; + height: 18px; + width: 18px; } .gh-portal-plan-checkbox input:checked ~ .checkmark { @@ -125,9 +125,9 @@ export const PlanSectionStyles = ` } .gh-portal-plan-checkbox .checkmark::after { - content: ""; position: absolute; display: none; + content: ""; } .gh-portal-plan-checkbox input:checked ~ .checkmark:after { diff --git a/ghost/portal/src/components/common/Switch.js b/ghost/portal/src/components/common/Switch.js index ba5c5a4996..0639f668ef 100644 --- a/ghost/portal/src/components/common/Switch.js +++ b/ghost/portal/src/components/common/Switch.js @@ -3,11 +3,11 @@ import React from 'react'; export const SwitchStyles = ` .gh-portal-for-switch label, .gh-portal-for-switch .container { - cursor: pointer; position: relative; display: inline-block; width: 36px !important; height: 22px !important; + cursor: pointer; } .gh-portal-for-switch label p, @@ -25,7 +25,6 @@ export const SwitchStyles = ` .gh-portal-for-switch .input-toggle-component { position: absolute; - cursor: pointer; top: 0; left: 0; right: 0; @@ -37,6 +36,7 @@ export const SwitchStyles = ` height: 22px !important; border-radius: 999px; transition: background 0.15s ease-in-out, border-color 0.15s ease-in-out; + cursor: pointer; } .gh-portal-for-switch label:hover input:not(:checked) + .input-toggle-component, @@ -47,10 +47,10 @@ export const SwitchStyles = ` .gh-portal-for-switch .input-toggle-component:before { position: absolute; content: ""; + top: 2px !important; + left: 2px !important; height: 18px !important; width: 18px !important; - left: 2px !important; - top: 2px !important; background-color: white; transition: .3s; box-shadow: 0 0 1px rgba(0,0,0,.3), 0 4px 6px rgba(0,0,0,.1); diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js index 2ff89eb00d..785902ec1b 100644 --- a/ghost/portal/src/components/pages/AccountHomePage.js +++ b/ghost/portal/src/components/pages/AccountHomePage.js @@ -8,9 +8,9 @@ const React = require('react'); export const AccountHomePageStyles = ` .gh-portal-account-main { background: var(--grey13); + border-bottom: 1px solid #eaeaea; margin: -32px -32px 0; padding: 32px; - border-bottom: 1px solid #eaeaea; } .gh-portal-account-header { diff --git a/ghost/portal/src/components/pages/SignupPage.js b/ghost/portal/src/components/pages/SignupPage.js index 3bbc180f41..6e132d7bc8 100644 --- a/ghost/portal/src/components/pages/SignupPage.js +++ b/ghost/portal/src/components/pages/SignupPage.js @@ -9,30 +9,30 @@ export const SignupPageStyles = ` .gh-portal-signup-logo { position: relative; display: block; - width: 56px; - height: 56px; - margin: 10px 0 12px; background-position: 50%; background-size: cover; border-radius: 2px; + width: 56px; + height: 56px; + margin: 10px 0 12px; } .gh-portal-signup-header { display: flex; flex-direction: column; align-items: center; + border-bottom: 1px solid var(--grey12); padding: 0 32px 32px; margin: 0 -32px 18px; - border-bottom: 1px solid var(--grey12); } .gh-portal-signin-header { display: flex; flex-direction: column; align-items: center; + border-bottom: 1px solid var(--grey12); padding: 0 32px 32px; margin: 0 -32px 32px; - border-bottom: 1px solid var(--grey12); } .gh-portal-signup-header.nodivider { @@ -43,10 +43,10 @@ export const SignupPageStyles = ` .gh-portal-signup-footer { display: flex; justify-content: center; - font-size: 1.3rem; - margin-top: 8px; color: var(--grey4); + font-size: 1.3rem; letter-spacing: 0.2px; + margin-top: 8px; } .gh-portal-signup-footer button {