clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4349 from MrPetovan/task/4265-move-perfect-scrollbar-to-composer 

Fix wrong path to perfect-scrollbar library files
This commit is contained in:
Hypolite Petovan 2018-01-27 21:49:16 -05:00 committed by GitHub
parent b85a9cbff6 19e197ef51
commit b158914c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/templates/head.tpl
View File

@ -6,7 +6,7 @@
<link rel="stylesheet" href="vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/perfect-scrollbar/dist/css/perfect-scrollbar.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" /> <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
@ -42,7 +42,7 @@
<script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script> <script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script> <script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script> <script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="vendor/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js" ></script> <script type="text/javascript" src="vendor/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
<script type="text/javascript" src="js/acl.js" ></script> <script type="text/javascript" src="js/acl.js" ></script>
<script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script> <script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="js/main.js" ></script> <script type="text/javascript" src="js/main.js" ></script>

4
view/theme/frio/templates/head.tpl
View File

@ -11,7 +11,7 @@
<link rel="stylesheet" href="vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/perfect-scrollbar/dist/css/perfect-scrollbar.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" /> <link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css" type="text/css" media="screen"/> <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css" type="text/css" media="screen"/>
@ -66,7 +66,7 @@
<script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script> <script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script> <script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script> <script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="vendor/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js" ></script> <script type="text/javascript" src="vendor/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
<script type="text/javascript" src="js/acl.js" ></script> <script type="text/javascript" src="js/acl.js" ></script>
<script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script> <script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="js/main.js" ></script> <script type="text/javascript" src="js/main.js" ></script>