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

Fixes to core so compile assets works again

This commit is contained in:
Samuel Georges 2015-05-29 20:40:25 +10:00
parent 89b4b09638
commit 7a4b76e021
12 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/backend/ServiceProvider.php
View File

@ -63,7 +63,6 @@ class ServiceProvider extends ModuleServiceProvider
protected function registerAssetBundles()
{
CombineAssets::registerCallback(function($combiner) {
$combiner->registerBundle('~/modules/backend/assets/less/controls.less');
$combiner->registerBundle('~/modules/backend/assets/less/october.less');
$combiner->registerBundle('~/modules/backend/assets/js/october.js');
$combiner->registerBundle('~/modules/backend/assets/js/vendor/vendor.js');

17
modules/backend/assets/less/core/boot.less
View File

@ -5,10 +5,17 @@
//
// Core variables and mixins
@import "../../../system/assets/ui/less/global.less";
@import "../../../system/assets/ui/less/site.variables.less";
@import "../../../system/assets/ui/less/site.mixins.less";
@import "../../../system/assets/ui/less/icon.variables.less";
@import "../../../system/assets/ui/less/icon.mixins.less";
@import "../../../../system/assets/ui/less/global.less";
@import "../../../../system/assets/ui/less/site.mixins.less";
@import "../../../../system/assets/ui/less/site.variables.less";
@import "../../../../system/assets/ui/less/icon.mixins.less";
@import "../../../../system/assets/ui/less/icon.variables.less";
@import "../../../../system/assets/ui/less/form.variables.less";
@import "../../../../system/assets/ui/less/button.variables.less";
@import "../../../../system/assets/ui/less/dropdown.variables.less";
@import "variables.less";
@import "mixins.less";

5
modules/backend/assets/less/core/variables.less
View File

@ -21,11 +21,14 @@
@link-hover-color: darken(@link-color, 30%);
//
// Fonts
// Paths
// --------------------------------------------------
@fontsPath: "../font";
@font-path: "../../../system/assets/ui/font";
@image-path: "../../../system/assets/ui/images";
// Callouts
// --------------------------------------------------
@callout-padding: 20px;

1
modules/backend/assets/less/october.less
View File

@ -56,6 +56,7 @@
@import "../../../system/assets/ui/less/loader.less";
@import "../../../system/assets/ui/less/popover.less";
@import "../../../system/assets/ui/less/popup.less";
@import "../../../system/assets/ui/less/tab.less";
//
// Combines layout and vendor styles

13
modules/system/assets/ui/less/button.less
View File

@ -8,15 +8,10 @@
// Buttons
// --------------------------------------------------
@import "button.mixins";
@import "button.variables";
@import "button.base";
@import "button.groups";
@color-button-disabled-bg: #dbdbdb;
@color-button-disabled-text: #aaaaaa;
@color-icon-btn-default: #bcc3c7;
@color-btn-danger: #c63e26;
@import "button.mixins.less";
@import "button.variables.less";
@import "button.base.less";
@import "button.groups.less";
//
// Buttons

5
modules/system/assets/ui/less/button.variables.less
View File

@ -25,3 +25,8 @@
@btn-danger-border: darken(@btn-danger-bg, 5%);
@btn-link-disabled-color: @gray-light;
@color-button-disabled-bg: #dbdbdb;
@color-button-disabled-text: #aaaaaa;
@color-icon-btn-default: #bcc3c7;
@color-btn-danger: #c63e26;

27
modules/system/assets/ui/less/dropdown.less
View File

@ -11,32 +11,7 @@
// --------------------------------------------------
@import "dropdown.base.less";
@dropdown-bg: #fff;
@dropdown-border: rgba(0,0,0,.15);
@dropdown-fallback-border: #ccc;
@dropdown-divider-bg: #e5e5e5;
@dropdown-link-color: @gray-dark;
@dropdown-link-hover-color: darken(@gray-dark, 5%);
@dropdown-link-hover-bg: #f5f5f5;
@dropdown-link-active-color: @component-active-color;
@dropdown-link-active-bg: @component-active-bg;
@dropdown-link-disabled-color: @gray-light;
@dropdown-header-color: @gray-light;
// Note: Deprecated @dropdown-caret-color as of v3.1.0
@dropdown-caret-color: #000;
@color-dropdown-title-border: #c9c9c9;
@color-dropdown-title-text: @dropdown-link-color;
@color-dropdown-hover-color: #2f99da;
@color-dropdown-hover-text: #ffffff;
@import "dropdown.variables.less";
//
// Dropdowns

24
modules/system/assets/ui/less/dropdown.variables.less Normal file
View File

@ -0,0 +1,24 @@
@dropdown-bg: #fff;
@dropdown-border: rgba(0,0,0,.15);
@dropdown-fallback-border: #ccc;
@dropdown-divider-bg: #e5e5e5;
@dropdown-link-color: @gray-dark;
@dropdown-link-hover-color: darken(@gray-dark, 5%);
@dropdown-link-hover-bg: #f5f5f5;
@dropdown-link-active-color: @component-active-color;
@dropdown-link-active-bg: @component-active-bg;
@dropdown-link-disabled-color: @gray-light;
@dropdown-header-color: @gray-light;
// Note: Deprecated @dropdown-caret-color as of v3.1.0
@dropdown-caret-color: #000;
@color-dropdown-title-border: #c9c9c9;
@color-dropdown-title-text: @dropdown-link-color;
@color-dropdown-hover-color: #2f99da;
@color-dropdown-hover-text: #ffffff;

2
modules/system/assets/ui/less/flag.less
View File

@ -8,7 +8,7 @@
// Flag
// --------------------------------------------------
@flag-image-path: "../images";
@flag-image-path: @image-path;
[class^="flag-"],
[class*=" flag-"] {

7
modules/system/assets/ui/less/global.variables.less
View File

@ -15,6 +15,13 @@
@link-hover-color: darken(@link-color, 15%);
@link-hover-decoration: underline;
//
// Paths
// --------------------------------------------------
@font-path: "../font";
@image-path: "../images";
//
// Breakpoints
// --------------------------------------------------

2
modules/system/assets/ui/less/icon.variables.less
View File

@ -1,7 +1,7 @@
// Variables
// --------------------------
@icon-font-path: "../font";
@icon-font-path: @font-path;
@icon-font-version: "1.0.0";
@adjust: "\f042";

2
modules/system/assets/ui/less/loader.less
View File

@ -10,7 +10,7 @@
@color-loading-indicator-text: #999999;
@color-stripe-loader: #0090c0;
@loader-image-path: "../images";
@loader-image-path: @image-path;
.loading-indicator {
padding: 20px 20px 20px 60px;