diff --git a/Envfile b/Envfile index ec5bd9c80..eead8e4f2 100644 --- a/Envfile +++ b/Envfile @@ -10,6 +10,7 @@ enable_defaults! { ENV['RACK_ENV'] != 'production' } # App domain + Protocol setting for development variable :APP_DOMAIN, :String, default: "localhost:3000" variable :APP_PROTOCOL, :String, default: "http://" +variable :COMMUNITY_NAME, :String, default: "DEV(local)" # Logo variable :LOGO_SVG, :String, default: "" diff --git a/app/assets/javascripts/manifest.json.erb b/app/assets/javascripts/manifest.json.erb index acb5b1338..1fbd4ce8b 100644 --- a/app/assets/javascripts/manifest.json.erb +++ b/app/assets/javascripts/manifest.json.erb @@ -1,5 +1,5 @@ { - "name": "DEV Community", + "name": "<%= ApplicationConfig["COMMUNITY_NAME"] %> Community", "short_name": "dev.to", "description": "Where programmers share ideas, experiences, and help each other grow.", "start_url": "/", diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index b77f54c0e..a6417f44c 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -1065,9 +1065,17 @@ margin: 0; } &.signin-cta-widget { - background: lighten($purple, 3%); border: 1px solid darken($bold-blue, 5%); box-shadow: 5px 6px 0px darken($bold-blue, 15%); + padding: 0px 0px; + width: calc(100% - 6px); + header { + background: darken($bold-blue, 5%); + color: white; + padding: 15px 0px; + text-align: center; + font-weight: bold; + } } &.sponsorship-widget { display: none; @@ -1372,22 +1380,26 @@ } } .cta-button { - margin-top: 8px; - padding: 8px 0px; + margin: 8px auto 0px; + padding: 10px 0px; font-size: 0.93em; color: darken($sky-blue, 17%); color: var(--theme-color, darken($sky-blue, 17%)); background: white; background: var(--theme-container-background, #fff); + border: 2px solid darken($sky-blue, 17%); + border: 2px solid var(--theme-color, darken($sky-blue, 17%)); display: block; - width: 92%; - text-align: left; + width: 85%; + text-align: center; + border-radius: 100px; &.login-cta-button { - border-top: 0px; color: $black; - font-size: 1.2em; - width: 100%; + font-size: 1.1em; + width: 85%; background: lighten($purple, 3%); + margin: 20px 0px; + padding: 18px 0px; } &:hover { text-decoration: underline; diff --git a/app/assets/stylesheets/preact/article-form.scss b/app/assets/stylesheets/preact/article-form.scss index 31ef701a8..581952021 100644 --- a/app/assets/stylesheets/preact/article-form.scss +++ b/app/assets/stylesheets/preact/article-form.scss @@ -30,6 +30,7 @@ padding-top: 20px; h1 { background: $yellow; + background: var(--theme-container-accent-background, $yellow); } } } diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss index a4f4226ea..8c0f6aa06 100644 --- a/app/assets/stylesheets/scaffolds.scss +++ b/app/assets/stylesheets/scaffolds.scss @@ -93,7 +93,8 @@ pre{ background: $green; font-family: $helvetica-condensed; -webkit-appearance: none; - font-stretch:condensed; + font-stretch: condensed; + font-weight: bold; } button{ diff --git a/app/assets/stylesheets/sidebar-data.scss b/app/assets/stylesheets/sidebar-data.scss index ac39573a1..a287ecc84 100644 --- a/app/assets/stylesheets/sidebar-data.scss +++ b/app/assets/stylesheets/sidebar-data.scss @@ -7,5 +7,6 @@ padding:1px 12px 1px; margin:3px 1px; color: $dark-medium-gray; + color: var(--theme-secondary-color, $dark-medium-gray); font-family: $monospace; } \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 24f5818e8..2eff27368 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -40,10 +40,10 @@ module ApplicationHelper end def title(page_title) - derived_title = if page_title.include?("DEV") + derived_title = if page_title.include?(ApplicationConfig["COMMUNITY_NAME"]) page_title else - page_title + " - DEV Community πŸ‘©β€πŸ’»πŸ‘¨β€πŸ’»" + page_title + " - #{ApplicationConfig['COMMUNITY_NAME']} Community πŸ‘©β€πŸ’»πŸ‘¨β€πŸ’»" end content_for(:title) { derived_title } derived_title diff --git a/app/views/articles/_sidebar.html.erb b/app/views/articles/_sidebar.html.erb index 62f41a82b..a68880a5b 100644 --- a/app/views/articles/_sidebar.html.erb +++ b/app/views/articles/_sidebar.html.erb @@ -27,7 +27,7 @@ <% end %>
- We are grateful for wonderful sponsors who help sustain the DEV community. + We are grateful for wonderful sponsors who help sustain the <%= ApplicationConfig["COMMUNITY_NAME"] %> community.
About - Events Sponsors - DEV Shop + <%= ApplicationConfig["COMMUNITY_NAME"] %> Shop Privacy Policy Terms of Use Contact diff --git a/app/views/articles/_sidebar_additional.html.erb b/app/views/articles/_sidebar_additional.html.erb index 506b8df05..d10dc875e 100644 --- a/app/views/articles/_sidebar_additional.html.erb +++ b/app/views/articles/_sidebar_additional.html.erb @@ -3,16 +3,16 @@