TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates on Brand Settings

This commit is contained in:
Pásztor Gábor 2015-03-11 20:30:41 +01:00
parent 0433720a11
commit b3dcce6d2a
5 changed files with 81 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
composer.lock composer.lock
composer.phar composer.phar
.DS_Store .DS_Store
.idea
php_errors.log php_errors.log
nginx-error.log nginx-error.log
nginx-access.log nginx-access.log

12
config/app.php
View File

@ -1,6 +1,6 @@
<?php <?php
return array( return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -111,12 +111,12 @@ return array(
| |
*/ */
'providers' => array_merge(include(base_path().'/modules/system/providers.php'), array( 'providers' => array_merge(include(base_path().'/modules/system/providers.php'), [
// 'Illuminate\Html\HtmlServiceProvider', // Example // 'Illuminate\Html\HtmlServiceProvider', // Example
'System\ServiceProvider', 'System\ServiceProvider',
)), ]),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -129,10 +129,10 @@ return array(
| |
*/ */
'aliases' => array_merge(include(base_path().'/modules/system/aliases.php'), array( 'aliases' => array_merge(include(base_path().'/modules/system/aliases.php'), [
// 'Str' => 'Illuminate\Support\Str', // Example // 'Str' => 'Illuminate\Support\Str', // Example
)), ]),
); ];

4
config/cms.php
View File

@ -1,6 +1,6 @@
<?php <?php
return array( return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -250,4 +250,4 @@ return array(
'defaultMask' => ['file' => null, 'folder' => null], 'defaultMask' => ['file' => null, 'folder' => null],
); ];

30
config/database.php
View File

@ -1,6 +1,6 @@
<?php <?php
return array( return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -44,15 +44,15 @@ return array(
| |
*/ */
'connections' => array( 'connections' => [
'sqlite' => array( 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => 'database/production.sqlite', 'database' => 'database/production.sqlite',
'prefix' => '', 'prefix' => '',
), ],
'mysql' => array( 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'host' => 'localhost', 'host' => 'localhost',
'port' => '', 'port' => '',
@ -62,9 +62,9 @@ return array(
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
), ],
'pgsql' => array( 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
'host' => 'localhost', 'host' => 'localhost',
'port' => '', 'port' => '',
@ -76,7 +76,7 @@ return array(
'schema' => 'public', 'schema' => 'public',
), ),
'sqlsrv' => array( 'sqlsrv' => [
'driver' => 'sqlsrv', 'driver' => 'sqlsrv',
'host' => 'localhost', 'host' => 'localhost',
'port' => '', 'port' => '',
@ -84,9 +84,9 @@ return array(
'username' => 'root', 'username' => 'root',
'password' => '', 'password' => '',
'prefix' => '', 'prefix' => '',
), ],
), ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -112,16 +112,16 @@ return array(
| |
*/ */
'redis' => array( 'redis' => [
'cluster' => false, 'cluster' => false,
'default' => array( 'default' => [
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'port' => 6379, 'port' => 6379,
'database' => 0, 'database' => 0,
), ],
), ],
); ];

57
modules/backend/models/brandsettings/custom.less
View File

@ -45,6 +45,57 @@ body.outer .layout > .layout-row.layout-head {
background-color: @color-sidebarnav-bg; background-color: @color-sidebarnav-bg;
} }
//
// Popover
//
@color-popover-head-bg: @primary-color-dark;
div.control-popover {
.popover-head {
background: @color-popover-head-bg;
}
&.placement-bottom .popover-head:before {
border-bottom-color: @color-popover-head-bg;
}
&.placement-left .popover-head:before {
border-left-color: @color-popover-head-bg;
}
&.placement-right .popover-head:before {
border-right-color: @color-popover-head-bg;
}
}
//
// Popup
//
@color-popup-header-bg: @primary-color-dark;
.modal-header {
background: @color-popup-header-bg;
}
//
// List
//
@color-list-stripe-active: @primary-color-light;
@color-list-active-sort: @primary-color-dark;
table.table.data {
tbody {
tr.active td {
&:first-child {
border-left: 3px solid @color-list-stripe-active;
}
}
}
}
// //
// Breadcrumb // Breadcrumb
// //
@ -146,6 +197,12 @@ div.control-componentlist {
} }
} }
.control-assetlist {
ul li.active a.link:after {
background: @color-list-active-border;
}
}
// //
// Sidenav Tree // Sidenav Tree
// //