From b3dcce6d2ac7346c291c3e8bcc05f45ff528f396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1sztor=20G=C3=A1bor?= Date: Wed, 11 Mar 2015 20:30:41 +0100 Subject: [PATCH] Updates on Brand Settings --- .gitignore | 1 + config/app.php | 12 ++-- config/cms.php | 4 +- config/database.php | 30 +++++----- .../backend/models/brandsettings/custom.less | 57 +++++++++++++++++++ 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index f1f19299a..cfe983704 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ composer.lock composer.phar .DS_Store +.idea php_errors.log nginx-error.log nginx-access.log diff --git a/config/app.php b/config/app.php index 6f14c82fb..aedb8b814 100644 --- a/config/app.php +++ b/config/app.php @@ -1,6 +1,6 @@ array_merge(include(base_path().'/modules/system/providers.php'), array( + 'providers' => array_merge(include(base_path().'/modules/system/providers.php'), [ // 'Illuminate\Html\HtmlServiceProvider', // Example '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 - )), + ]), -); +]; diff --git a/config/cms.php b/config/cms.php index 23d747cff..49d0efe81 100644 --- a/config/cms.php +++ b/config/cms.php @@ -1,6 +1,6 @@ ['file' => null, 'folder' => null], -); +]; diff --git a/config/database.php b/config/database.php index 793639dd3..c4cc96066 100644 --- a/config/database.php +++ b/config/database.php @@ -1,6 +1,6 @@ array( + 'connections' => [ - 'sqlite' => array( + 'sqlite' => [ 'driver' => 'sqlite', 'database' => 'database/production.sqlite', 'prefix' => '', - ), + ], - 'mysql' => array( + 'mysql' => [ 'driver' => 'mysql', 'host' => 'localhost', 'port' => '', @@ -62,9 +62,9 @@ return array( 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', 'prefix' => '', - ), + ], - 'pgsql' => array( + 'pgsql' => [ 'driver' => 'pgsql', 'host' => 'localhost', 'port' => '', @@ -76,7 +76,7 @@ return array( 'schema' => 'public', ), - 'sqlsrv' => array( + 'sqlsrv' => [ 'driver' => 'sqlsrv', 'host' => 'localhost', 'port' => '', @@ -84,9 +84,9 @@ return array( 'username' => 'root', 'password' => '', 'prefix' => '', - ), + ], - ), + ], /* |-------------------------------------------------------------------------- @@ -112,16 +112,16 @@ return array( | */ - 'redis' => array( + 'redis' => [ 'cluster' => false, - 'default' => array( + 'default' => [ 'host' => '127.0.0.1', 'port' => 6379, 'database' => 0, - ), + ], - ), + ], -); +]; diff --git a/modules/backend/models/brandsettings/custom.less b/modules/backend/models/brandsettings/custom.less index 9740f336b..52ce04dbe 100644 --- a/modules/backend/models/brandsettings/custom.less +++ b/modules/backend/models/brandsettings/custom.less @@ -45,6 +45,57 @@ body.outer .layout > .layout-row.layout-head { 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 // @@ -146,6 +197,12 @@ div.control-componentlist { } } +.control-assetlist { + ul li.active a.link:after { + background: @color-list-active-border; + } +} + // // Sidenav Tree //