Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-08 02:52:39 -05:00
Code Issues Activity

Removed hardcoded accent color fallbacks (#12813)

Browse source 
refs https://github.com/TryGhost/Team/issues/536

From 4.0, we ensure and require that accent colour is always set. This change removes hardcoded accent color fallbacks to avoid confusion as well as cause accidental fallback that is undesired causing themes to look different
This commit is contained in:
Rishabh Garg 2021-03-24 18:25:26 +05:30 • committed by GitHub
parent bab16a4491
commit 82bb466316
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/frontend/helpers/content.js
View file

@ -19,7 +19,7 @@ function restrictedCta(options) {
options = options || {};
options.data = options.data || {};
_.merge(this, {
accentColor: (options.data.site && options.data.site.accent_color) || '#15171A'
accentColor: (options.data.site && options.data.site.accent_color)
});
const data = createFrame(options.data);
return templates.execute('content-cta', this, {data});

2
core/server/services/members/api.js
View file

@ -133,7 +133,7 @@ function createApiInstance(config) {
const siteUrl = urlUtils.urlFor('home', true);
const domain = urlUtils.urlFor('home', true).match(new RegExp('^https?://([^/:?#]+)(?:[/:?#]|$)', 'i'));
const siteDomain = (domain && domain[1]);
const accentColor = settingsCache.get('accent_color') || '#15212A';
const accentColor = settingsCache.get('accent_color');
switch (type) {
case 'subscribe':
return subscribeEmail({url, email, siteTitle, accentColor, siteDomain, siteUrl});