1
0
mirror of https://github.com/chinchang/web-maker.git synced 2025-05-18 16:22:25 +02:00

add sass support. fixes #45

This commit is contained in:
Kushagra Gour 2017-01-20 01:03:17 +05:30
parent de05737b41
commit ea6acdcd8e
3 changed files with 8 additions and 5 deletions

View File

@ -60,6 +60,7 @@
<ul class="js-modes-menu dropdown__menu"> <ul class="js-modes-menu dropdown__menu">
<li><a data-type="css" data-mode="css">CSS</a></li> <li><a data-type="css" data-mode="css">CSS</a></li>
<li><a data-type="css" data-mode="scss">SCSS</a></li> <li><a data-type="css" data-mode="scss">SCSS</a></li>
<li><a data-type="css" data-mode="sass">SASS</a></li>
<li><a data-type="css" data-mode="less">LESS</a></li> <li><a data-type="css" data-mode="less">LESS</a></li>
<li><a data-type="css" data-mode="stylus">Stylus</a></li> <li><a data-type="css" data-mode="stylus">Stylus</a></li>
</ul> </ul>

View File

@ -23,6 +23,7 @@ settingsBtn, onboardModal, notificationsBtn, onboardShowInTabOptionBtn, onboardD
var CssModes = { var CssModes = {
CSS: 'css', CSS: 'css',
SCSS: 'scss', SCSS: 'scss',
SASS: 'sass',
LESS: 'less', LESS: 'less',
STYLUS: 'stylus' STYLUS: 'stylus'
}; };
@ -42,6 +43,7 @@ settingsBtn, onboardModal, notificationsBtn, onboardShowInTabOptionBtn, onboardD
modes[JsModes.TS] = { label: 'TypeScript', cmMode: 'javascript', codepenVal: 'typescript' }; modes[JsModes.TS] = { label: 'TypeScript', cmMode: 'javascript', codepenVal: 'typescript' };
modes[CssModes.CSS] = { label: 'CSS', cmMode: 'css', codepenVal: 'none' }; modes[CssModes.CSS] = { label: 'CSS', cmMode: 'css', codepenVal: 'none' };
modes[CssModes.SCSS] = { label: 'SCSS', cmMode: 'sass', codepenVal: 'scss' }; modes[CssModes.SCSS] = { label: 'SCSS', cmMode: 'sass', codepenVal: 'scss' };
modes[CssModes.SASS] = { label: 'SASS', cmMode: 'sass', codepenVal: 'sass' };
modes[CssModes.LESS] = { label: 'LESS', cmMode: 'text/x-less', codepenVal: 'less' }; modes[CssModes.LESS] = { label: 'LESS', cmMode: 'text/x-less', codepenVal: 'less' };
modes[CssModes.STYLUS] = { label: 'Stylus', cmMode: 'stylus', codepenVal: 'stylus' }; modes[CssModes.STYLUS] = { label: 'Stylus', cmMode: 'stylus', codepenVal: 'stylus' };
@ -388,7 +390,7 @@ settingsBtn, onboardModal, notificationsBtn, onboardShowInTabOptionBtn, onboardD
loadJS('lib/marked.js').then(setLoadedFlag); loadJS('lib/marked.js').then(setLoadedFlag);
} else if (mode === CssModes.LESS) { } else if (mode === CssModes.LESS) {
loadJS('lib/less.min.js').then(setLoadedFlag); loadJS('lib/less.min.js').then(setLoadedFlag);
} else if (mode === CssModes.SCSS) { } else if (mode === CssModes.SCSS || mode === CssModes.SASS) {
loadJS('lib/sass.js').then(function () { loadJS('lib/sass.js').then(function () {
sass = new Sass('lib/sass.worker.js'); sass = new Sass('lib/sass.worker.js');
setLoadedFlag(); setLoadedFlag();
@ -457,9 +459,9 @@ settingsBtn, onboardModal, notificationsBtn, onboardShowInTabOptionBtn, onboardD
if (cssMode === CssModes.CSS) { if (cssMode === CssModes.CSS) {
d.resolve(code); d.resolve(code);
} else if (cssMode === CssModes.SCSS) { } else if (cssMode === CssModes.SCSS || cssMode === CssModes.SASS) {
sass.compile(code, function(result) { sass.compile(code, { indentedSyntax: cssMode === CssModes.SASS }, function(result) {
// Something as wrong // Something was wrong
if (result.line && result.message) { if (result.line && result.message) {
showErrors('css', [ { lineNumber: result.line - 1, message: result.message } ]); showErrors('css', [ { lineNumber: result.line - 1, message: result.message } ]);
} }

View File

@ -552,7 +552,7 @@ select, input[type="text"], textarea {
} }
.dropdown__menu > li > a { .dropdown__menu > li > a {
display: block; display: block;
padding: 15px; padding: 10px 15px;
color: #333; color: #333;
cursor: pointer; cursor: pointer;
} }