Skip to content

Commit

Permalink
Merge pull request box#67 from kormoc/issue-65
Browse files Browse the repository at this point in the history
Add in images and update jquery and jqueryui. Should fix box#65
  • Loading branch information
gtowey committed Mar 14, 2014
2 parents e723107 + 8ed3d72 commit 92b844f
Show file tree
Hide file tree
Showing 19 changed files with 118 additions and 239 deletions.
Binary file added css/images/ui-bg_flat_0_aaaaaa_40x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_flat_75_ffffff_40x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_glass_55_fbf9ee_1x400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_glass_65_ffffff_1x400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_glass_75_dadada_1x400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_glass_75_e6e6e6_1x400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_glass_95_fef1ec_1x400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-icons_222222_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-icons_2e83ff_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-icons_454545_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-icons_888888_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/ui-icons_cd0a0a_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
218 changes: 108 additions & 110 deletions css/jquery-ui.css

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions js/jquery-1.8.2.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions js/jquery-1.8.3.min.js

Large diffs are not rendered by default.

125 changes: 0 additions & 125 deletions js/jquery-ui-1.8.24.custom.min.js

This file was deleted.

6 changes: 6 additions & 0 deletions js/jquery-ui-1.9.2.custom.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions views/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<!-- Le styles -->
<link href="css/jquery-ui.css" rel="stylesheet" type="text/css"/>
<script src="js/jquery-1.8.2.min.js"></script>
<script src="js/jquery-ui-1.8.24.custom.min.js"></script>
<script src="js/jquery-1.8.3.min.js"></script>
<script src="js/jquery-ui-1.9.2.custom.min.js"></script>
<link href="css/bootstrap.css" rel="stylesheet">
<!-- addon timepicker to date -->
Expand Down

0 comments on commit 92b844f

Please sign in to comment.