Merge pull request #5 from lyoshenka/master

Small updates
This commit is contained in:
Alex Grin 2016-03-10 21:11:01 -05:00
commit 72ba65552f
3 changed files with 4 additions and 4 deletions

2
.gitignore vendored
View file

@ -1,7 +1,7 @@
.sass-cache .sass-cache
/data/config.php
/web/css/* /web/css/*
/log /log
/data/secret
/web/zohoverify /web/zohoverify
nbproject nbproject

View file

@ -5,8 +5,7 @@ include __DIR__.'/bootstrap.php';
chdir(ROOT_DIR); chdir(ROOT_DIR);
Shell::exec('rm ./web/css/*'); Shell::exec('git fetch && git reset --hard origin/master');
Shell::exec('git checkout master && git pull');
$scss = new \Leafo\ScssPhp\Compiler(); $scss = new \Leafo\ScssPhp\Compiler();

View file

@ -1,3 +1,4 @@
<?php $error = isset($error) ? $error : null ?>
<form action="/list-subscribe" method="post" novalidate> <form action="/list-subscribe" method="post" novalidate>
<?php if ($error): ?> <?php if ($error): ?>
<div class="notice notice-error spacer1"><?php echo $error ?></div> <div class="notice notice-error spacer1"><?php echo $error ?></div>
@ -30,4 +31,4 @@
<?php endif ?> <?php endif ?>
</div> </div>
<?php endif ?> <?php endif ?>
</form> </form>