Fixes for damper bugs; link off marketplace css for cheats

This commit is contained in:
Matt Basta 2013-08-02 12:11:31 -07:00
Родитель 96fcd46ed3
Коммит 1e6c6240b3
5 изменённых файлов: 7 добавлений и 22 удалений

Просмотреть файл

@ -165,6 +165,6 @@ if (opts.compile && opts.compile !== true) {
watch(src_dir + '/templates', 'html', 'nunjucks');
// When the builder is updated, recompile the templates.
watch(src_dir + '/js/builder.js', null, 'nunjucks');
watch(src_dir + '/media/js/builder.js', null, 'nunjucks');
}

Просмотреть файл

@ -9,7 +9,7 @@ function _check_version(src_dir, same, different, neither) {
if (fs.existsSync(existing_manifest)) {
var version = JSON.parse(fs.readFileSync(existing_manifest)).version;
var current_version = info.version();
if (varsion !== current_version) {
if (version !== current_version) {
different(version, current_version);
} else {
same(version, current_version);
@ -55,9 +55,9 @@ function install() {
console.log('Initializing distributable files...');
utils.glob(local_src, '.dist', function(err, files) {
files.forEach(function(file) {
var non_dist = file.substr(file.length - 5);
var non_dist = file.substr(0, file.length - 5);
if (fs.existsSync(non_dist)) {
console.warn('Distributable file exists: ' + file);
console.warn('Distributable file exists: ' + non_dist);
return;
}
fs.readFile(file, function(err, data) {

Просмотреть файл

@ -4,23 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
<title>Commonplace Sample App</title>
<link rel="stylesheet" href="/media/css/splash.styl.css">
<!-- These styles need to come first. -->
<link rel="stylesheet" href="/media/css/reset.styl.css">
<link rel="stylesheet" href="/media/css/typography.styl.css">
<link rel="stylesheet" href="/media/css/site.styl.css">
<link rel="stylesheet" href="/media/css/header.styl.css">
<link rel="stylesheet" href="/media/css/listing.styl.css">
<link rel="stylesheet" href="/media/css/infobox.styl.css">
<!-- These styles don't need to be in an order. -->
<link rel="stylesheet" href="/media/css/forms.styl.css">
<link rel="stylesheet" href="/media/css/form-modal.styl.css">
<link rel="stylesheet" href="/media/css/lightbox.styl.css">
<link rel="stylesheet" href="/media/css/menu.styl.css">
<link rel="stylesheet" href="/media/css/modal.styl.css">
<link rel="stylesheet" href="/media/css/notification.styl.css">
<link rel="stylesheet" href="https://marketplace-dev-cdn.allizom.org/media/fireplace/css/include.css">
</head>
<body class="home" data-media="">

Просмотреть файл

@ -29,6 +29,7 @@ require.config({
'templates',
//'tracking',
'user',
'views',
'z'
],
function(_) {

Просмотреть файл

@ -1,7 +1,7 @@
(function() {
// Please leave quotes around keys! They're needed for Space Heater.
var routes = [
var routes = window.routes = [
{'pattern': '^/$', 'view_name': 'hello_world'},
{'pattern': '^/tests$', 'view_name': 'tests'},