mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #998 from gpasztor87/master

Browse Source 
Updates on Brand Settings
This commit is contained in:
Samuel Georges 2015-03-12 08:14:32 +11:00
commit a3380d4c86
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.phar
.DS_Store
.idea
php_errors.log
nginx-error.log
nginx-access.log

12
config/app.php
View File

@ -1,6 +1,6 @@
<?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
'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
)),
]),
);
];

4
config/cms.php
View File

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

30
config/database.php
View File

@ -1,6 +1,6 @@
<?php
return array(
return [
/*
|--------------------------------------------------------------------------
@ -44,15 +44,15 @@ return array(
|
*/
'connections' => 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,
),
],
),
],
);
];

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;
}
//
// 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
//