diff --git a/app/assets/stylesheets/sticky-nav.scss b/app/assets/stylesheets/sticky-nav.scss index 98d04b864..0a880d561 100644 --- a/app/assets/stylesheets/sticky-nav.scss +++ b/app/assets/stylesheets/sticky-nav.scss @@ -148,28 +148,38 @@ p{ margin:12px 0px; } + code { + background: $light-gray; + border-radius: 3px; + padding: 3px 4px; + color:#333842; + font-family: $monospace; + } a.primary-sticky-nav-org-cta-link{ width:100%; display: block; font-size:1.25em; border:0px; border-radius:3px; - padding: 8px 0px 3px; + padding: 11px 0px 5px; margin-top: 20px; background: white; color: $black; font-family: $helvetica-condensed; - border: 1px solid darken($light-medium-gray, 7%); + font-weight: bold; + border: 1px solid darken($light-medium-gray, 10%); text-align: center; + font-stretch: condensed; .primary-sticky-nav-org-cta-link-domain-small{ display: block; + font-weight: 400; padding-top: 2px; font-size:0.75em; - color: darken($light-medium-gray, 7%); + color: darken($light-medium-gray, 9%); font-family: $monospace; } &:hover { - border: 1px solid darken($light-medium-gray, 12%); + border: 1px solid darken($light-medium-gray, 14%); box-shadow: $shadow; transition: all 0.1s; } diff --git a/app/labor/markdown_parser.rb b/app/labor/markdown_parser.rb index fa8266aed..49aa6394c 100644 --- a/app/labor/markdown_parser.rb +++ b/app/labor/markdown_parser.rb @@ -26,7 +26,7 @@ class MarkdownParser return if @content.blank? renderer = Redcarpet::Render::HTMLRouge.new(hard_wrap: true, filter_html: false) markdown = Redcarpet::Markdown.new(renderer, REDCARPET_CONFIG) - tag_whitelist = %w(strong i u b em p br) + tag_whitelist = %w(strong i u b em p br code) attribute_whitelist = %w(href strong em ref rel src title alt class) ActionController::Base.helpers.sanitize markdown.render(@content).html_safe, tags: tag_whitelist, diff --git a/app/models/organization.rb b/app/models/organization.rb index 11bf5ed09..771fae51b 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -34,14 +34,14 @@ class Organization < ApplicationRecord allow_blank: true } validates :tech_stack, :story, length: { maximum: 640 } validates :cta_button_url, - url: { allow_blank: true, no_local: true, schemes: ["https", "http"] }, if: :approved - validates :cta_button_text, length: { maximum: 12 } + url: { allow_blank: true, no_local: true, schemes: ["https", "http"] } + validates :cta_button_text, length: { maximum: 20 } validates :cta_body_markdown, length: { maximum: 256 } before_save :remove_at_from_usernames after_save :bust_cache before_save :generate_secret before_validation :downcase_slug - before_validation :evaluate_markdown, if: :approved + before_validation :evaluate_markdown validate :unique_slug_including_users @@ -80,7 +80,7 @@ class Organization < ApplicationRecord end def approved_and_filled_out_cta? - approved && cta_body_markdown? && cta_button_text? && cta_button_url? + cta_processed_html? end def profile_image_90 diff --git a/app/views/articles/_sticky_nav.html.erb b/app/views/articles/_sticky_nav.html.erb index 8f6b40c1e..ddd8526a6 100644 --- a/app/views/articles/_sticky_nav.html.erb +++ b/app/views/articles/_sticky_nav.html.erb @@ -50,10 +50,14 @@ <% elsif @actor.class.name == "Organization" && @actor.approved_and_filled_out_cta? %>
<%= @actor.cta_processed_html.html_safe %> - " class="primary-sticky-nav-org-cta-link"> - <%= @actor.cta_button_text.upcase %> - <%= Addressable::URI.parse(@actor.cta_button_url).domain %> - + <% if @actor.cta_button_text.present? && @actor.cta_button_url.present? %> + " class="primary-sticky-nav-org-cta-link"> + <%= @actor.cta_button_text %> + + <%= Addressable::URI.parse(@actor.cta_button_url).domain %> + + + <% end %>
<% end %> diff --git a/app/views/users/_org_admin.html.erb b/app/views/users/_org_admin.html.erb index 4413940fc..2c0efd40f 100644 --- a/app/views/users/_org_admin.html.erb +++ b/app/views/users/_org_admin.html.erb @@ -119,18 +119,23 @@ <%= f.text_area :tech_stack, maxlength: 640, placeholder: "Limit of 640 characters" %>

Call-to-action box

-

Customizable text that appears next to every post for your organization

+

Customizable text that appears to the right of every post for your organization

+

See an example from the DEV Team.

- <%= f.label "Body text (markdown inline only)" %> - <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "Limit of 256 characters" %> + <%= f.label "Body text (Limited markdown — bold/italic/etc)" %> + <%= f.text_area :cta_body_markdown, maxlength: 256, placeholder: "**This is an example** + +_italic_ and **bold** is okay. Links, and headers etc. will not show up. + +256 character limit." %>
- <%= f.label "CTA Link Text" %> - <%= f.text_field :cta_button_text, maxlength: 12, placeholder: "Limit of 12 characters" %> + <%= f.label "Link Text" %> + <%= f.text_field :cta_button_text, maxlength: 20, placeholder: "Limit of 20 characters" %>
- <%= f.label "CTA Link URL" %> - <%= f.text_field :cta_button_url %> + <%= f.label "Link Text" %> + <%= f.text_field :cta_button_url, placeholder: "https://example.com" %>