Resolve conflicts

This commit is contained in:
Hector Ramos 2017-12-12 12:49:02 -08:00
commit a7d81c629d
12 changed files with 79 additions and 58 deletions

View file

@ -17,6 +17,7 @@ function execute(port) {
const fs = require('fs-extra');
const os = require('os');
const path = require('path');
const color = require('color');
const toSlug = require('../core/toSlug.js');
const mkdirp = require('mkdirp');
const glob = require('glob');
@ -479,6 +480,10 @@ function execute(port) {
const color = siteConfig.colors[key];
cssContent = cssContent.replace(new RegExp('\\$' + key, 'g'), color);
});
const codeColor = color(siteConfig.colors.primaryColor)
.alpha(0.07)
.string();
cssContent = cssContent.replace(new RegExp('\\$codeColor', 'g'), codeColor);
res.send(cssContent);
});