diff --git a/app/assets/stylesheets/views/signin.scss b/app/assets/stylesheets/views/signin.scss index 31611854e..4c6ea49c1 100644 --- a/app/assets/stylesheets/views/signin.scss +++ b/app/assets/stylesheets/views/signin.scss @@ -3,78 +3,17 @@ // Authentication Card in Feed .authentication-feed { - &__card { - display: grid; - grid-gap: var(--su-6); - padding: var(--su-6); - margin: var(--su-3); - background: rgba(var(--brand), 0.1); - color: var(--card-color); + &__image { border-radius: var(--radius); - border: 1px solid rgba(var(--brand), 0.1); - - @media (min-width: $breakpoint-s) { - padding: var(--su-7); - margin: 0 0 var(--su-3) 0; - } - } - - &__container { - @media (min-width: $breakpoint-s) { - display: flex; - flex-direction: row; - align-items: center; - } - } - - &__image-container { width: var(--su-8); height: var(--su-8); margin-bottom: var(--su-2); - @media (min-width: $breakpoint-s) { height: 80px; width: 80px; margin-right: var(--su-7); } } - - &__image { - border-radius: var(--radius); - transform: rotate(-10deg); - height: auto; - width: 100%; - } - - &__title { - color: var(--card-color); - font-size: var(--fs-2xl); - line-height: var(--lh-tight); - - // overflow-wrap: anywhere isn't supported in Safari, in which case this fallback applies - overflow-wrap: break-word; - overflow-wrap: anywhere; - - @media (min-width: $breakpoint-s) { - font-size: var(--fs-3xl); - } - } - - &__description { - color: var(--card-color-secondary); - } - - &__actions { - display: grid; - grid-gap: var(--su-1); - - @media (min-width: $breakpoint-s) { - display: flex; - flex-direction: column; - width: max-content; - justify-self: center; - } - } } .authentication-widget { diff --git a/app/views/shared/_authentication_actions.html.erb b/app/views/shared/_authentication_actions.html.erb index 06e80860c..8d15062fc 100644 --- a/app/views/shared/_authentication_actions.html.erb +++ b/app/views/shared/_authentication_actions.html.erb @@ -1,6 +1,20 @@ -" data-tracking-id="ca_feed_home_page" data-tracking-source="feed_card" class="crayons-btn" aria-label="<%= t("views.auth.create.aria_label") %>" data-no-instant> - <%= t("views.auth.create.text") %> - -"> - <%= t("views.auth.login.text") %> - +
+
+ " class="crayons-btn w-75" aria-label="<%= t("views.auth.create.aria_label") %>" data-tracking-id="ca_feed_home_page" data-tracking-source="feed_card" data-no-instant> + <%= t("views.auth.create.text") %> + +
+
+ + <%= t("views.auth.already_have_an_account") %> + " + data-tracking-id="si_feed_home_page" + data-tracking-source="feed_card" + data-no-instant> + <%= t("views.auth.sign_in") %> + + +
+
diff --git a/app/views/stories/_sign_in_invitation.html.erb b/app/views/stories/_sign_in_invitation.html.erb index 1589342f1..78dce762e 100644 --- a/app/views/stories/_sign_in_invitation.html.erb +++ b/app/views/stories/_sign_in_invitation.html.erb @@ -1,20 +1,16 @@ -
-
-
- Secondary <%= community_name %> logo -
-
-

- <%= render "shared/authentication_title" %> -

-

- <%= render "shared/authentication_description" %> -

-
+
+
+ Secondary <%= community_name %> logo
+

+ <%= render "shared/authentication_title" %> +

+

+ <%= render "shared/authentication_description" %> +

-
+
<%= render "shared/authentication_actions" %>
diff --git a/config/locales/views/auth/en.yml b/config/locales/views/auth/en.yml index 445b2cfe4..497274189 100644 --- a/config/locales/views/auth/en.yml +++ b/config/locales/views/auth/en.yml @@ -15,6 +15,8 @@ en: icon: Edit username text_html: "%{start}Your username will be\_%{end}%{button}" submit: Create my account + already_have_an_account: Already have an account? + sign_in: Sign in login: aria_label: Log in text: Log in @@ -73,7 +75,7 @@ en: step_3: There is lots you can do as an admin, but there is a learning curve. step_4: Please reach out to the Forem team if you are unsure about anything! step_5: "For Empowering Community 🌱" - tagline: Log in to customize your experience and get involved. + tagline: We are a place where coders share, stay up-to-date and grow their careers. title: - text_html: %{name} is a community of %{maybe_size}amazing %{label} + text_html: "%{name} is a community of %{maybe_size}amazing %{label}" size: "%{num} " diff --git a/config/locales/views/auth/fr.yml b/config/locales/views/auth/fr.yml index 6e176d9ec..adf40af4b 100644 --- a/config/locales/views/auth/fr.yml +++ b/config/locales/views/auth/fr.yml @@ -15,6 +15,8 @@ fr: icon: Edit username text_html: "%{start}Your username will be\_%{end}%{button}" submit: Create my account + already_have_an_account: Already have an account? + sign_in: Sign in login: aria_label: Log in text: Se connecter @@ -73,7 +75,7 @@ fr: step_3: There is lots you can do as an admin, but there is a learning curve. step_4: Please reach out to the Forem team if you are unsure about anything! step_5: "For Empowering Community 🌱" - tagline: Log in to customize your experience and get involved. + tagline: We are a place where coders share, stay up-to-date and grow their careers. title: - text_html: %{name} is a community of %{maybe_size}amazing %{label} + text_html: "%{name} is a community of %{maybe_size}amazing %{label}" size: "%{num} " diff --git a/spec/system/articles/user_visits_articles_by_timeframe_spec.rb b/spec/system/articles/user_visits_articles_by_timeframe_spec.rb index 9b1932b5f..5991d7e54 100644 --- a/spec/system/articles/user_visits_articles_by_timeframe_spec.rb +++ b/spec/system/articles/user_visits_articles_by_timeframe_spec.rb @@ -74,7 +74,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do it "shows correct articles and cta count", :aggregate_failures do shows_correct_articles_count(5) shows_main_article - expect(page).to have_selector(".authentication-feed__card", count: 1) + expect(page).to have_selector("#in-feed-cta", count: 1) within("#main-content") do expect(page).to have_text(article.title) @@ -92,7 +92,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do it "shows correct articles and cta-count", :aggregate_failures do shows_correct_articles_count(5) shows_main_article - expect(page).to have_selector(".authentication-feed__card", count: 1) + expect(page).to have_selector("#in-feed-cta", count: 1) within("#main-content") do expect(page).to have_text(article.title)