github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

managed jquery-ui by bower (#1558)

pull/1560/merge
linxuhua 2017-07-02 04:33:53 +08:00 committed by Abdullah Almsaeed
parent e47823e6f1
commit 9ccb1f6b68
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -56,6 +56,7 @@
"bootstrap-timepicker": "^0.5.2", "bootstrap-timepicker": "^0.5.2",
"jquery-sparkline": "^2.1.3", "jquery-sparkline": "^2.1.3",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"Ionicons": "ionicons#^2.0.1" "Ionicons": "ionicons#^2.0.1",
"jquery-ui": "1.11.4"
} }
} }

2
index.html
View File

@ -1233,7 +1233,7 @@
<!-- jQuery 3 --> <!-- jQuery 3 -->
<script src="bower_components/jquery/dist/jquery.min.js"></script> <script src="bower_components/jquery/dist/jquery.min.js"></script>
<!-- jQuery UI 1.11.4 --> <!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script> <script src="bower_components/jquery-ui/jquery-ui.min.js"></script>
<!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip --> <!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip -->
<script> <script>
$.widget.bridge('uibutton', $.ui.button); $.widget.bridge('uibutton', $.ui.button);

2
pages/calendar.html
View File

@ -805,7 +805,7 @@
<!-- Bootstrap 3.3.7 --> <!-- Bootstrap 3.3.7 -->
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<!-- jQuery UI 1.11.4 --> <!-- jQuery UI 1.11.4 -->
<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script> <script src="../bower_components/jquery-ui/jquery-ui.min.js"></script>
<!-- Slimscroll --> <!-- Slimscroll -->
<script src="../bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script> <script src="../bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script>
<!-- FastClick --> <!-- FastClick -->