From dd6e2246ab9bc092d8cf95684842f4f9055e68a1 Mon Sep 17 00:00:00 2001 From: ludwiczakpawel Date: Sat, 10 Oct 2020 00:07:49 +0200 Subject: [PATCH] [deploy] crayons prep (#10737) --- app/assets/stylesheets/base/layout.scss | 28 +++++++++++++++++++-- app/assets/stylesheets/base/main.scss | 5 ++++ app/assets/stylesheets/scaffolds.scss | 5 ---- app/views/articles/search.html.erb | 4 +-- app/views/devise/confirmations/new.html.erb | 4 +-- app/views/devise/invitations/edit.html.erb | 2 +- app/views/listings/edit.html.erb | 4 +-- app/views/listings/new.html.erb | 4 +-- app/views/pages/_placeholder.html.erb | 2 +- app/views/pages/code_of_conduct.html.erb | 2 +- app/views/pages/contact.html.erb | 2 +- app/views/pages/information.html.erb | 2 +- app/views/pages/markdown_basics.html.erb | 2 +- app/views/pages/privacy.html.erb | 2 +- app/views/pages/report_abuse.html.erb | 2 +- app/views/pages/show.html.erb | 2 +- app/views/pages/sponsors.html.erb | 2 +- app/views/pages/terms.html.erb | 2 +- app/views/users/edit.html.erb | 4 +-- 19 files changed, 52 insertions(+), 28 deletions(-) diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss index 76f7b72f5..3efa07161 100644 --- a/app/assets/stylesheets/base/layout.scss +++ b/app/assets/stylesheets/base/layout.scss @@ -52,15 +52,39 @@ width: 100%; } - &--limited { + &--limited-l { --site-width: #{$breakpoint-l}; } - &--limited-inner { + &--limited-m { + --site-width: #{$breakpoint-m}; + } + + &--limited-s { + --site-width: #{$breakpoint-s}; + } + + &--limited-xs { + --site-width: 480px; + } + + &--limited-inner-l { .crayons-layout__content__inner { max-width: $breakpoint-l; } } + + &--limited-inner-m { + .crayons-layout__content__inner { + max-width: $breakpoint-m; + } + } + + &--limited-inner-s { + .crayons-layout__content__inner { + max-width: $breakpoint-s; + } + } } .crayons-layout--2-cols { diff --git a/app/assets/stylesheets/base/main.scss b/app/assets/stylesheets/base/main.scss index edb949331..673591bfe 100644 --- a/app/assets/stylesheets/base/main.scss +++ b/app/assets/stylesheets/base/main.scss @@ -31,3 +31,8 @@ body { visibility: visible; font-size: 18px; } + +a { + color: var(--link-brand-color); + text-decoration: none; +} diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss index 34bd11fc1..216399ddb 100644 --- a/app/assets/stylesheets/scaffolds.scss +++ b/app/assets/stylesheets/scaffolds.scss @@ -24,11 +24,6 @@ height: 90vh; } -a { - color: var(--link-brand-color); - text-decoration: none; -} - div { &.field, &.actions { diff --git a/app/views/articles/search.html.erb b/app/views/articles/search.html.erb index db6ad575a..73b69323f 100644 --- a/app/views/articles/search.html.erb +++ b/app/views/articles/search.html.erb @@ -2,7 +2,7 @@ <%= render "articles/search/meta" %> <% end %>
-
+

Search results

-
" diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 3b97e3377..c5ba10fec 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,6 +1,6 @@ <% title "Confirm your email" %> <% proper_email = params[:email] || (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> -
+

Welcome to <%= community_name %>! 🎉

A confirmation email has been sent to <%= proper_email %>

@@ -10,7 +10,7 @@ <%= devise_error_messages! %>
- <%= f.email_field :email, class: "crayons-textfield", autofocus: false, value: proper_email %> + <%= f.email_field :email, class: "crayons-textfield", autofocus: false, value: proper_email %>
diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index 155a6ea7c..8a1a1449f 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -1,5 +1,5 @@ <% title "Set your Password to Join" %> -
+

Welcome to <%= community_name %>

<% if SiteConfig.tagline.present? %> diff --git a/app/views/listings/edit.html.erb b/app/views/listings/edit.html.erb index 9d3139aa4..c21d2cf0a 100644 --- a/app/views/listings/edit.html.erb +++ b/app/views/listings/edit.html.erb @@ -1,10 +1,10 @@ <% title "Edit Listing" %> -
+

Edit Listing

-
+
<%= form_for(@listing, html: { class: "grid gap-6 mb-6" }) do |f| %> diff --git a/app/views/listings/new.html.erb b/app/views/listings/new.html.erb index e278cab26..fc781128e 100644 --- a/app/views/listings/new.html.erb +++ b/app/views/listings/new.html.erb @@ -1,10 +1,10 @@ <% title "New Listing" %> -
+

Create a Community Listing

-
+
<%= render "form", listing: @listing %>
diff --git a/app/views/pages/_placeholder.html.erb b/app/views/pages/_placeholder.html.erb index 9fa130ea6..26f7cfbc9 100644 --- a/app/views/pages/_placeholder.html.erb +++ b/app/views/pages/_placeholder.html.erb @@ -1,6 +1,6 @@ <% title "#{title} #{community_qualified_name}" %> -
+

<%= title %>

diff --git a/app/views/pages/code_of_conduct.html.erb b/app/views/pages/code_of_conduct.html.erb index 52fbaf6d1..a7ff5d938 100644 --- a/app/views/pages/code_of_conduct.html.erb +++ b/app/views/pages/code_of_conduct.html.erb @@ -14,7 +14,7 @@ <% end %> -
+

Code of Conduct

<%= render "coc_text" %> diff --git a/app/views/pages/contact.html.erb b/app/views/pages/contact.html.erb index 18dececb5..22e2c0b3f 100644 --- a/app/views/pages/contact.html.erb +++ b/app/views/pages/contact.html.erb @@ -19,7 +19,7 @@ <% end %> -
+

Contacts

diff --git a/app/views/pages/information.html.erb b/app/views/pages/information.html.erb index 4d572453a..a8d528127 100644 --- a/app/views/pages/information.html.erb +++ b/app/views/pages/information.html.erb @@ -32,7 +32,7 @@ } -
+

More information about <%= community_name %> 👋

diff --git a/app/views/pages/markdown_basics.html.erb b/app/views/pages/markdown_basics.html.erb index 6b04212b9..5f0cb3553 100644 --- a/app/views/pages/markdown_basics.html.erb +++ b/app/views/pages/markdown_basics.html.erb @@ -6,7 +6,7 @@ <%= meta_keywords_default %> <% end %> -
+

Markdown Basics 🤓

diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb index 287d6d325..fa29cba79 100644 --- a/app/views/pages/privacy.html.erb +++ b/app/views/pages/privacy.html.erb @@ -19,7 +19,7 @@ <% end %> -
+

Privacy Policy

diff --git a/app/views/pages/report_abuse.html.erb b/app/views/pages/report_abuse.html.erb index 2c1963deb..b63e5afe1 100644 --- a/app/views/pages/report_abuse.html.erb +++ b/app/views/pages/report_abuse.html.erb @@ -13,7 +13,7 @@ <% end %> -
+

Report Abuse

diff --git a/app/views/pages/show.html.erb b/app/views/pages/show.html.erb index 88313e3dc..e8d818cf1 100644 --- a/app/views/pages/show.html.erb +++ b/app/views/pages/show.html.erb @@ -20,7 +20,7 @@ <% if @page.template == "contained" %> -
+

<%= @page.title %>

diff --git a/app/views/pages/sponsors.html.erb b/app/views/pages/sponsors.html.erb index e5d30d87f..cdf297bd7 100644 --- a/app/views/pages/sponsors.html.erb +++ b/app/views/pages/sponsors.html.erb @@ -6,7 +6,7 @@ <%= meta_keywords_default %> <% end %> -
+

Thank you! ♥️

for supporting our community

diff --git a/app/views/pages/terms.html.erb b/app/views/pages/terms.html.erb index de54a78cb..0fe59482a 100644 --- a/app/views/pages/terms.html.erb +++ b/app/views/pages/terms.html.erb @@ -19,7 +19,7 @@ <% end %> -
+

Web Site Terms and Conditions of Use

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index baa19aecd..4e0bb7286 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -19,7 +19,7 @@
<% end %> -
+
<% if @tab == "organization" && @organizations.present? %>

Settings for @@ -42,7 +42,7 @@ <% end %>

-
+