diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index dc51df73c..072371418 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -207,7 +207,7 @@ } } } - button { + button.big-action { width: 130px; padding: 3px 0px; font-size: 1.2em; diff --git a/app/assets/stylesheets/sticky-nav.scss b/app/assets/stylesheets/sticky-nav.scss index 22d7f3d04..98d04b864 100644 --- a/app/assets/stylesheets/sticky-nav.scss +++ b/app/assets/stylesheets/sticky-nav.scss @@ -164,8 +164,8 @@ .primary-sticky-nav-org-cta-link-domain-small{ display: block; padding-top: 2px; - font-size:0.8em; - color: darken($light-medium-gray, 4%); + font-size:0.75em; + color: darken($light-medium-gray, 7%); font-family: $monospace; } &:hover { diff --git a/app/views/users/_account.html.erb b/app/views/users/_account.html.erb index b21443b6d..2b0b261c5 100644 --- a/app/views/users/_account.html.erb +++ b/app/views/users/_account.html.erb @@ -35,14 +35,14 @@
<%= form_tag "/users/remove_association", method: :delete, onsubmit: "return confirm('Are you absolutely sure you want to remove your Twitter account?');" do %> <%= hidden_field_tag :provider, "twitter" %> - <% end %> - OR +
<%= form_tag "/users/remove_association", method: :delete, onsubmit: "return confirm('Are you absolutely sure you want to remove your GitHub account?');" do %> <%= hidden_field_tag :provider, "github" %> - <% end %> @@ -70,7 +70,7 @@
- <% end %> diff --git a/app/views/users/_org_admin.html.erb b/app/views/users/_org_admin.html.erb index 73d10ccda..4413940fc 100644 --- a/app/views/users/_org_admin.html.erb +++ b/app/views/users/_org_admin.html.erb @@ -41,7 +41,13 @@ <% end %>

Grow the team

-
Invite teammates by sending them this secret. Keep the code secret and generate a new one regularly.
+
Invite teammates by sending them the secret and the following instructions:
+
    +
  1. Sign up at https://dev.to +
  2. Navigate to https://dev.to/settings/organization +
  3. Paste the secret code below and click Join Organization
  4. +
+
Your secret: (You should rotate this regularly)
<%= form_tag "/organizations/generate_new_secret", onsubmit: "return confirm('Are you sure you want to generate a new secret? All outstanding secrets will be invalid.');" do %> @@ -112,21 +118,20 @@ <%= f.label :tech_stack, "Our Stack" %> <%= f.text_area :tech_stack, maxlength: 640, placeholder: "Limit of 640 characters" %> - <% if @organization.approved %> -

Post Call-to-action box

-
- <%= f.label "CTA Link Text" %> - <%= f.text_field :cta_button_text, maxlength: 12, placeholder: "Limit of 12 characters" %> -
-
- <%= f.label "CTA Link URL" %> - <%= f.text_field :cta_button_url %> -
-
- <%= f.label "Body text (markdown inline only)" %> - <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "Limit of 256 characters" %> -
- <% end %> +

Call-to-action box

+

Customizable text that appears next to every post for your organization

+
+ <%= f.label "Body text (markdown inline only)" %> + <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "Limit of 256 characters" %> +
+
+ <%= f.label "CTA Link Text" %> + <%= f.text_field :cta_button_text, maxlength: 12, placeholder: "Limit of 12 characters" %> +
+
+ <%= f.label "CTA Link URL" %> + <%= f.text_field :cta_button_url %> +
<%= f.submit "SUBMIT", class: "cta" %> diff --git a/app/views/users/_org_non_member.html.erb b/app/views/users/_org_non_member.html.erb index 1ec3da524..8de7de7dd 100644 --- a/app/views/users/_org_non_member.html.erb +++ b/app/views/users/_org_non_member.html.erb @@ -1,5 +1,7 @@

Join An Organization

+
Do you have the secret code?
+ <%= form_tag "/users/join_org" do %>
<%= label_tag :org_secret, "Secret" %> diff --git a/lib/tasks/fetch.rake b/lib/tasks/fetch.rake index 282ca6dd6..291dca77e 100644 --- a/lib/tasks/fetch.rake +++ b/lib/tasks/fetch.rake @@ -96,7 +96,7 @@ task remove_old_html_variant_data: :environment do HtmlVariantTrial.where("created_at < ?", 1.week.ago).destroy_all HtmlVariantSuccess.where("created_at < ?", 1.week.ago).destroy_all HtmlVariant.find_each do |html_variant| - return if html_variant.html_variant_successes.size < 20 + return if html_variant.html_variant_successes.size < 12 html_variant.calculate_success_rate! end end