Skip to content
This repository has been archived by the owner on Jul 31, 2019. It is now read-only.

Commit

Permalink
uplifted versions + fixes for things that broke
Browse files Browse the repository at this point in the history
  • Loading branch information
Pomax committed May 6, 2015
1 parent 3d50ddb commit 99f0a4e
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 16 deletions.
5 changes: 3 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ var appName = "thimble",
messina,
nunjucksEnv = new nunjucks.Environment([
new nunjucks.FileSystemLoader('views'),
new nunjucks.FileSystemLoader('learning_projects')
new nunjucks.FileSystemLoader('learning_projects'),
new nunjucks.FileSystemLoader('bower_components')
], {
autoescape: true
}),
Expand Down Expand Up @@ -136,7 +137,7 @@ app.use(app.router);
var optimize = (node_env !== "development"),
tmpDir = path.join( require("os").tmpDir(), "mozilla.webmaker.org");

app.use(lessMiddleWare({
app.use(lessMiddleWare('public', {
once: optimize,
debug: !optimize,
dest: tmpDir,
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@
"private": true,
"dependencies": {
"async": "0.2.7",
"express": "3.4.5",
"habitat": "0.4.1",
"express": "3.20.2",
"habitat": "^3.1.2",
"helmet": "0.1.2",
"hood": "0.2.1",
"htmlsanitizer": "0.0.2",
"knox": "0.8.9",
"less-middleware": "0.1.12",
"makeapi-client": "0.5.25",
"less-middleware": "^2.0.1",
"makeapi-client": "^0.5.30",
"messina": "0.1.1",
"moment": "2.2.1",
"mox-server": "https://github.com/Pomax/mox-server/archive/master.tar.gz",
"mox-server": "git://github.com/Pomax/mox-server",
"newrelic": "1.5.5",
"node-statsd": "0.0.7",
"noxmox": "0.2.4",
"nunjucks": "0.1.10",
"nunjucks": "^1.3.4",
"request": "2.21.0",
"sequelize": "1.6.0",
"sequelize": "^2.1.0",
"slowparse": "1.1.3",
"uslug": "1.0.3",
"webmaker-auth": "1.0.2",
"webmaker-auth": "^1.0.3",
"webmaker-download-locales": "0.1.2",
"webmaker-i18n": "0.3.20",
"webmaker-i18n": "^0.3.25",
"webmaker-locale-mapping": "0.0.5",
"webmaker-translation-stats": "0.0.1"
},
"optionalDependencies": {
"mysql": "2.0.0-alpha7",
"sqlite3": "2.1.17"
"sqlite3": "3.0.7"
},
"devDependencies": {
"bower": "1.3.8",
Expand Down
4 changes: 4 additions & 0 deletions public/friendlycode/css/editor.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@headerHeight: 65px;

.hidden {
display: none!important;
}

.friendlycode-base {
font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
overflow: hidden;
Expand Down
4 changes: 2 additions & 2 deletions routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ module.exports = function(utils, env, nunjucksEnv, appName) {
});

app.get( '/slowparse/spec/errors.base.html', function( req, res ) {
res.render('/slowparse/spec/errors.base.html');
res.render('slowparse/spec/errors.base.html');
});

app.get( '/slowparse/spec/errors.forbidjs.html', function( req, res ) {
res.render('/slowparse/spec/errors.forbidjs.html');
res.render('slowparse/spec/errors.forbidjs.html');
});
}
};
Expand Down
2 changes: 1 addition & 1 deletion views/friendlycode/templates/details-form.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</fieldset>
<fieldset>
<label>{{ gettext("Language") }}</label>
{% include "bower_components/webmaker-language-picker/template/alllanguages.html" %}
{% include "webmaker-language-picker/template/alllanguages.html" %}
</fieldset>
<fieldset>
<label>{{ gettext("Description") }}</label>
Expand Down
2 changes: 1 addition & 1 deletion views/userbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</ul>

<div class="navbar-text navbar-right">
{% include "bower_components/webmaker-language-picker/template/partial.html" %}
{% include "webmaker-language-picker/template/partial.html" %}
</div>

</div>
Expand Down

0 comments on commit 99f0a4e

Please sign in to comment.