Commit 3cd7f365 authored by Nicolas Widart's avatar Nicolas Widart

Merge commit '35af568e'

* commit '35af568e':
  Squashed 'Modules/Core/' changes from 86e93cf..37d3173
parents 833cddb4 35af568e
...@@ -2255,7 +2255,7 @@ Component: timeline ...@@ -2255,7 +2255,7 @@ Component: timeline
margin-top: 30px; margin-top: 30px;
text-align: center; text-align: center;
} }
/* /*
Page: register and login Page: register and login
*/ */
.form-box { .form-box {
...@@ -2275,7 +2275,7 @@ Component: timeline ...@@ -2275,7 +2275,7 @@ Component: timeline
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
background: #3d9970; background: #00c0ef;
box-shadow: inset 0px -3px 0px rgba(0, 0, 0, 0.2); box-shadow: inset 0px -3px 0px rgba(0, 0, 0, 0.2);
padding: 20px 10px; padding: 20px 10px;
text-align: center; text-align: center;
......
/* /*
Page: register and login Page: register and login
*/ */
.form-box { .form-box {
width: 360px; width: 360px;
margin: 90px auto 0 auto; margin: 90px auto 0 auto;
.header { .header {
.border-radius(4px, 4px, 0, 0); .border-radius(4px, 4px, 0, 0);
background: @olive; background: @aqua;
box-shadow: inset 0px -3px 0px rgba(0,0,0,0.2); box-shadow: inset 0px -3px 0px rgba(0,0,0,0.2);
padding: 20px 10px; padding: 20px 10px;
text-align: center; text-align: center;
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
font-weight: 300; font-weight: 300;
color: #fff; color: #fff;
} }
.body, .footer { .body, .footer {
padding: 10px 20px; padding: 10px 20px;
background: #fff; background: #fff;
...@@ -26,17 +26,17 @@ ...@@ -26,17 +26,17 @@
border: #fff; border: #fff;
} }
} }
> .btn { > .btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.footer { .footer {
.border-radius(0, 0, 4px, 4px); .border-radius(0, 0, 4px, 4px);
} }
@media (max-width: @screen-sm) { @media (max-width: @screen-sm) {
width: 90%; width: 90%;
} }
} }
\ No newline at end of file
<?php namespace Modules\Core\Console;
use Illuminate\Console\Command;
use Symfony\Component\Console\Input\InputArgument;
class PublishThemeAssetsCommand extends Command
{
protected $name = 'asgard:publish:theme';
protected $description = 'Publish theme assets';
public function fire()
{
$this->info('Publishing assets for ' . $this->argument('theme'));
}
protected function getArguments()
{
return array(
array('theme', InputArgument::REQUIRED, 'The theme name')
);
}
}
...@@ -4,6 +4,7 @@ use Illuminate\Contracts\Foundation\Application; ...@@ -4,6 +4,7 @@ use Illuminate\Contracts\Foundation\Application;
use Illuminate\Routing\Router; use Illuminate\Routing\Router;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Modules\Core\Console\InstallCommand; use Modules\Core\Console\InstallCommand;
use Modules\Core\Console\PublishThemeAssetsCommand;
use Modules\Core\Services\Composer; use Modules\Core\Services\Composer;
use Modules\Menu\Entities\Menuitem; use Modules\Menu\Entities\Menuitem;
use Modules\Menu\Repositories\Eloquent\EloquentMenuItemRepository; use Modules\Menu\Repositories\Eloquent\EloquentMenuItemRepository;
...@@ -79,6 +80,12 @@ class CoreServiceProvider extends ServiceProvider ...@@ -79,6 +80,12 @@ class CoreServiceProvider extends ServiceProvider
private function registerCommands() private function registerCommands()
{ {
$this->registerInstallCommand(); $this->registerInstallCommand();
$this->registerThemeCommand();
$this->commands([
'command.asgard.install',
'command.asgard.publish.theme',
]);
} }
/** /**
...@@ -93,10 +100,13 @@ class CoreServiceProvider extends ServiceProvider ...@@ -93,10 +100,13 @@ class CoreServiceProvider extends ServiceProvider
new Composer($app['files']) new Composer($app['files'])
); );
}); });
}
$this->commands( private function registerThemeCommand()
'command.asgard.install' {
); $this->app->bindShared('command.asgard.publish.theme', function() {
return new PublishThemeAssetsCommand;
});
} }
private function registerMenuRoutes() private function registerMenuRoutes()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment