maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Make comic sans default (#2257)"

Browse source 
This reverts commit 8865422bcf.
This commit is contained in:
Mac Siri 2019-04-01 12:49:46 -04:00
parent 8865422bcf
commit beca74c587
4 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/variables.scss
View file

@ -53,10 +53,10 @@ body.sans-serif-article-body {
}
body.comic-sans-article-body {
.body {
font-family: "Comic Sans MS", "Comic Sans", "Marker Felt", cursive, sans-serif;
font-family: "Comic Sans MS", cursive, sans-serif;
}
.body p {
font-family: "Comic Sans MS", "Comic Sans", "Marker Felt", cursive, sans-serif;
font-family: "Comic Sans MS", cursive, sans-serif;
font-size: 0.98em;
}

4
app/views/articles/_actions.html.erb
View file

@ -53,8 +53,8 @@
</div>
</div>
</div>
<% if !Rails.env.production? && @variant_number.to_i == 0 && !user_signed_in? && @article.body_markdown.size > 900 %>
<% cache("below-article-html-variant-#{rand(30)}", expires_in: 8.hours) do %>
<% if @variant_number.to_i == 0 && !user_signed_in? && @article.body_markdown.size > 900 %>
<% cache("below-article-html-variant-#{rand(20)}", expires_in: 8.hours) do %>
<% @html_variant = HtmlVariant.find_for_test(@article.cached_tag_list_array, "article_show_below_article_cta") %>
<% if @html_variant %>
<div class="html-variant-wrapper" id="html-variant-article-show-below-article" data-variant-id="<%= @html_variant.id %>">

4
app/views/articles/_sticky_nav.html.erb
View file

@ -72,8 +72,8 @@
</div>
<% end %>
</div>
<% if !Rails.env.production? && @variant_number.to_i == 1 %>
<% cache("html-variant-sidebar#{rand(60)}", expires_in: 6.hours) do %>
<% if @variant_number.to_i == 1 %>
<% cache("html-variant-sidebar#{rand(20)}", expires_in: 8.hours) do %>
<% @html_variant = HtmlVariant.find_for_test(@article.cached_tag_list_array) %>
<% if @html_variant %>
<div class="html-variant-wrapper" id="html-variant-article-show-sidebar" data-variant-id="<%= @html_variant.id %>">

12
app/views/layouts/application.html.erb
View file

@ -76,7 +76,7 @@
<link rel="search" href="https://dev.to/search.xml" type="application/opensearchdescription+xml" title="The DEV Community" />
<% end %>
</head>
<body data-user-status="<%= user_logged_in_status %>" data-pusher-key="<%= ApplicationConfig["PUSHER_KEY"] %>" class="<%= user_signed_in? ? "" : "comic-sans-article-body" %>">
<body data-user-status="<%= user_logged_in_status %>" data-pusher-key="<%= ApplicationConfig["PUSHER_KEY"] %>">
<div id="body-styles"></div>
<% if user_signed_in? && !internal_navigation? %>
<script>
@ -119,16 +119,6 @@
<%= render "layouts/top_bar" unless internal_navigation? %>
<% end %>
<div id="message-notice"></div>
<% if Rails.env.production? %>
<% unless user_signed_in? || request.original_url.include?(User.find(1).articles.where(published: true).last.path) %>
<div class="comic-sans-alert" style="background: #ffbff4; color: #1b0338; padding: 20px 8px;margin-top:66px;margin-bottom: -90px; z-index:2;position: relative;font-family: 'Comic Sans MS', 'Comic Sans', 'Marker Felt', cursive, sans-serif;">
<div style="max-width: 1180px; margin: auto">
We have changed the default font settings —
<a href="<%= User.find(1).articles.where(published: true).last.path %>" style="text-decoration: underline;">Read Full Details</a>
</div>
</div>
<% end %>
<% end %>
<div id="page-content" class="universal-page-content-wrapper <%= view_class %>" data-current-page="<%= current_page %>">
<div id="page-content-inner">
<%= yield %>