diff --git a/frontend/src/app/main/ui/dashboard/subscription.scss b/frontend/src/app/main/ui/dashboard/subscription.scss index f864bbf419..e855b2340f 100644 --- a/frontend/src/app/main/ui/dashboard/subscription.scss +++ b/frontend/src/app/main/ui/dashboard/subscription.scss @@ -71,7 +71,7 @@ } .cta-bottom-section .content a { - @include t.use-typography("body-small"); + @include t.use-typography("body-medium"); color: var(--color-accent-tertiary); margin-inline-start: var(--sp-xs); } @@ -158,6 +158,7 @@ .cta-message { @include t.use-typography("body-small"); color: var(--color-foreground-secondary); + line-height: 1; a { color: var(--color-accent-primary); diff --git a/frontend/src/app/main/ui/ds/product/cta.scss b/frontend/src/app/main/ui/ds/product/cta.scss index 630b8875e4..a08238958c 100644 --- a/frontend/src/app/main/ui/ds/product/cta.scss +++ b/frontend/src/app/main/ui/ds/product/cta.scss @@ -21,3 +21,7 @@ line-height: 1.2; margin-block-end: var(--sp-m); } + +.cta-message { + line-height: 100%; +} diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs index f03477e374..21ac9383d6 100644 --- a/frontend/src/app/main/ui/settings/subscription.cljs +++ b/frontend/src/app/main/ui/settings/subscription.cljs @@ -252,9 +252,11 @@ (tr "subscription.settings.unlimited-trial") (tr "subscription.settings.enterprise-trial"))}) (du/update-profile-props {:subscription - (assoc subscription :type (if (= params-subscription "subscribed-to-penpot-unlimited") - "unlimited" - "enterprise"))}) + (-> subscription + (assoc :type (if (= params-subscription "subscribed-to-penpot-unlimited") + "unlimited" + "enterprise")) + (assoc :status "trialing"))}) (rt/nav :settings-subscription {} {::rt/replace true})))) [:section {:class (stl/css :dashboard-section)} diff --git a/frontend/src/app/main/ui/settings/subscription.scss b/frontend/src/app/main/ui/settings/subscription.scss index b077874fd5..ffc7547682 100644 --- a/frontend/src/app/main/ui/settings/subscription.scss +++ b/frontend/src/app/main/ui/settings/subscription.scss @@ -95,9 +95,15 @@ stroke: var(--color-foreground-primary); height: var(--sp-xl); width: var(--sp-xl); - border-radius: var(--sp-xs); - border: $b-1 solid var(--color-foreground-primary); + border-radius: 6px; + border: 1.75px solid var(--color-foreground-primary); + stroke-width: 2.25px; padding: $s-1; + + svg { + block-size: var(--sp-m); + inline-size: var(--sp-m); + } } .plan-card-title, @@ -138,6 +144,7 @@ color: var(--color-accent-tertiary); display: flex; margin-block-start: var(--sp-m); + text-align: left; } .cta-button svg { diff --git a/frontend/src/app/main/ui/workspace/sidebar/versions.cljs b/frontend/src/app/main/ui/workspace/sidebar/versions.cljs index 65b0f13eae..73902900e2 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/versions.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/versions.cljs @@ -44,13 +44,16 @@ (defn get-versions-warning-subtext [team] - (let [is-owner? (-> team :permissions :is-owner) + (let [subscription-name (-> team :subscription :type) + is-owner? (-> team :permissions :is-owner) email-owner (:email (some #(when (:is-owner %) %) (:members team))) go-to-subscription (dm/str (u/join cfg/public-uri "#/settings/subscriptions"))] (if (contains? cfg/flags :subscriptions) (if is-owner? - (tr "subscription.workspace.versions.warning.subtext-owner" go-to-subscription) + (if (= "enterprise" subscription-name) + (tr "subscription.workspace.versions.warning.enterprise.subtext-owner" "support@penpot.app") + (tr "subscription.workspace.versions.warning.subtext-owner" go-to-subscription)) (tr "subscription.workspace.versions.warning.subtext-member" email-owner email-owner)) (tr "workspace.versions.warning.subtext" "support@penpot.app")))) diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 26a4deffd0..38168aeb8a 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -7859,6 +7859,11 @@ msgstr "" "If you'd like to increase this limit, " "[upgrade your plan|target:self](%s)" +msgid "subscription.workspace.versions.warning.enterprise.subtext-owner" +msgstr "" +"If you'd like to increase this limit, write to us at " +"[%s](mailto)" + #, markdown msgid "subscription.workspace.versions.warning.subtext-member" msgstr "" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 8a3fa3486e..5de7429687 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -7818,6 +7818,11 @@ msgstr "" "Si quieres aumentar este límite, " "[mejora tu plan|target:self](%s)" +msgid "subscription.workspace.versions.warning.enterprise.subtext-owner" +msgstr "" +"Si quieres aumentar este límite, escríbenos a " +"[%s](mailto)" + #, markdown msgid "subscription.workspace.versions.warning.subtext-member" msgstr ""