diff --git a/.babelrc b/.babelrc index add9366..061e975 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,6 @@ { "presets": [ - "env", - "react" + "react", + "latest" ] } diff --git a/changelog.md b/changelog.md index 42aee69..cc60014 100644 --- a/changelog.md +++ b/changelog.md @@ -26,7 +26,8 @@ All brews made previous to the release of v3.0.0 will still render normally. - Fixed realtime renderer not functioning if loaded with malformed html on load (thanks u/RattiganIV re:247) - Removed a lot of unused files in shared - vitreum v4 now lets me use codemirror as a pure node dependacy - +- Moved the brew editor and renderer into shared, and made a new hybrid component for them +- Added a line highlighter to lines with new pages ### Saturday, 03/12/2016 - v2.6.0 diff --git a/package.json b/package.json index 35c6767..0b20d6c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "author": "stolksdorf", "license": "MIT", "dependencies": { - "babel-preset-env": "^1.1.8", "basic-auth": "^1.0.3", "body-parser": "^1.14.2", "classnames": "^2.2.0", diff --git a/shared/homebrewery/brewEditor/brewEditor.less b/shared/homebrewery/brewEditor/brewEditor.less index 4d3cf4a..d82c96d 100644 --- a/shared/homebrewery/brewEditor/brewEditor.less +++ b/shared/homebrewery/brewEditor/brewEditor.less @@ -4,12 +4,9 @@ width : 100%; .codeEditor{ height : 100%; - .pageLine{ - background-color: fade(@blue, 30%); - border-bottom : #333 solid 1px; - - + background-color : fade(#333, 30%); + border-bottom : #333 solid 1px; } } } \ No newline at end of file