rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix PR conflict

This commit is contained in:
0dp 2018-06-26 10:10:40 +02:00
parent d8ad7b29d4
commit b32d6bae16
7 changed files with 9069 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/fsgtheme.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
css/theme-7a3aa37604.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
css/theme-81e40c6b95.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
inc/enqueue.php
View File

@ -10,7 +10,7 @@
* @return string
*/
function asset_path($filename) {
$manifest_path = get_stylesheet_directory_uri() .'/rev-manifest.json';
$manifest_path = get_stylesheet_directory() .'/rev-manifest.json';
if ( file_exists($manifest_path ) ) {
$manifest = json_decode( file_get_contents( $manifest_path ), TRUE );
} else {

1
js/theme-e677a2ace8.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

9033
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

4
rev-manifest.json Normal file
View File

@ -0,0 +1,4 @@
{
"css/theme.min.css": "css/theme-7a3aa37604.min.css",
"js/theme.min.js": "js/theme-e677a2ace8.min.js"
}