Skip to content

Commit 3c61bd7

Browse files
committed
Updating theme areas to look in vendor for the master files
1 parent d7a0dd0 commit 3c61bd7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/controllers/Core_AdminController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ public function getPreferencedelete($preferenceId)
711711

712712
public function getTheme()
713713
{
714-
$masterLess = public_path() .'/css/master3/master.less';
714+
$masterLess = base_path() .'/vendor/syntax/core/public/less/master.less';
715715

716716
$lines = file($masterLess);
717717

@@ -733,8 +733,8 @@ public function postTheme()
733733
$input = e_array(Input::all());
734734

735735
if ($input != null) {
736-
$masterLess = public_path() .'/css/master3/master.less';
737-
$masterCss = public_path() .'/css/master3/master.css';#5097b5
736+
$masterLess = base_path() .'/vendor/syntax/core/public/less/master.less';
737+
$masterCss = base_path() .'/vendor/syntax/core/public/css/master.css';#5097b5
738738

739739
$lines = file($masterLess);
740740

src/controllers/Core_UserController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ public function postCropAvatar()
178178

179179
public function getChangeTheme()
180180
{
181-
$lessTemplate = public_path() .'/css/master3/template.less';
182-
$userLess = public_path() .'/css/master3/users/'. Str::studly($this->activeUser->username) .'_css.less';
181+
$lessTemplate = base_path() .'/vendor/syntax/core/public/less/template.less';
182+
$userLess = public_path() .'/css/users/'. Str::studly($this->activeUser->username) .'_css.less';
183183

184184
// Make a copy of the less file
185185
if (!File::exists($userLess)) {
@@ -206,8 +206,8 @@ public function postChangeTheme()
206206
$input = e_array(Input::all());
207207

208208
if ($input != null) {
209-
$userLess = public_path() .'/css/master3/users/'. Str::studly($this->activeUser->username) .'_css.less';
210-
$userCss = public_path() .'/css/master3/users/'. Str::studly($this->activeUser->username) .'.css';
209+
$userLess = public_path() .'/css/users/'. Str::studly($this->activeUser->username) .'_css.less';
210+
$userCss = public_path() .'/css/users/'. Str::studly($this->activeUser->username) .'.css';
211211

212212
$lines = file($userLess);
213213

@@ -237,7 +237,7 @@ public function postChangeTheme()
237237

238238
public function getResetCss()
239239
{
240-
$userLess = public_path() .'/css/master3/users/'. Str::studly($this->activeUser->username) .'.css';
240+
$userLess = public_path() .'/css/users/'. Str::studly($this->activeUser->username) .'.css';
241241

242242
File::delete($userLess);
243243

0 commit comments

Comments
 (0)