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

Compiled assets and whitespace cleanup

This commit is contained in:
Luke Towers 2018-04-17 13:43:51 -06:00
parent da17a96926
commit 5acbdb12fe
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/system/assets/ui/storm-min.js vendored
View File

File diff suppressed because one or more lines are too long

2
modules/system/assets/ui/storm.css
View File

@ -2184,7 +2184,7 @@ textarea.input-group-sm > .form-control,textarea.input-group-sm > .input-group-a
.input-group-btn > .btn:hover,.input-group-btn > .btn:focus,.input-group-btn > .btn:active{z-index:10}
.input-group-btn:first-child > .btn,.input-group-btn:first-child > .btn-group{margin-right:-1px}
.input-group-btn:last-child > .btn,.input-group-btn:last-child > .btn-group{margin-left:-1px}
.loading-indicator{padding:20px 20px 20px 60px;color:#999999;font-size:14px;font-weight:500;background:#f9f9f9;text-align:left;z-index:10}
.loading-indicator{padding:20px 20px 20px 60px;color:#999999;font-size:14px;font-weight:500;text-align:left;z-index:10}
.loading-indicator > span{background:transparent url('images/loader.gif') no-repeat 0 50%;position:absolute;width:40px;height:40px;top:50%;margin-top:-20px;left:0;display:block}
.loading-indicator-container{position:relative;min-height:40px}
.loading-indicator-container .loading-indicator{position:absolute;left:0;top:0;width:100%;height:100%;padding-top:0}

4
modules/system/traits/AssetMaker.php
View File

@ -197,8 +197,8 @@ trait AssetMaker
public function combineAssets(array $assets, $localPath = '')
{
// Short circuit if no assets actually provided
if (empty($assets)) {
return '';
if (empty($assets)) {
return '';
}
$assetPath = !empty($localPath) ? $localPath : $this->assetPath;
return Url::to(CombineAssets::combine($assets, $assetPath));