RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDATE] MorrisJS 0.5.1

Browse Source
This commit is contained in:
Sebastian Grewe 2015-04-15 14:45:01 +02:00
parent 181c3825c5
commit a1e876ca9c
5 changed files with 11 additions and 1892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/site_assets/bootstrap/css/plugins/morris/morris-0.4.3.min.css vendored
View File

@ -1,2 +0,0 @@
.morris-hover{position:absolute;z-index:1000;}.morris-hover.morris-default-style{border-radius:10px;padding:6px;color:#666;background:rgba(255, 255, 255, 0.8);border:solid 2px rgba(230, 230, 230, 0.8);font-family:sans-serif;font-size:12px;text-align:center;}.morris-hover.morris-default-style .morris-hover-row-label{font-weight:bold;margin:0.25em 0;}
.morris-hover.morris-default-style .morris-hover-point{white-space:nowrap;margin:0.1em 0;}

2
public/site_assets/bootstrap/css/plugins/morris/morris-0.5.1.css Normal file
View File

@ -0,0 +1,2 @@
.morris-hover{position:absolute;z-index:1000}.morris-hover.morris-default-style{border-radius:10px;padding:6px;color:#666;background:rgba(255,255,255,0.8);border:solid 2px rgba(230,230,230,0.8);font-family:sans-serif;font-size:12px;text-align:center}.morris-hover.morris-default-style .morris-hover-row-label{font-weight:bold;margin:0.25em 0}
.morris-hover.morris-default-style .morris-hover-point{white-space:nowrap;margin:0.1em 0}

7
public/site_assets/bootstrap/js/plugins/morris/morris-0.5.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1888
public/site_assets/bootstrap/js/plugins/morris/morris.js
View File

File diff suppressed because it is too large Load Diff

4
templates/bootstrap/master.tpl
View File

@ -17,7 +17,7 @@
<link href="{$PATH}/css/bootstrap.min.css" rel="stylesheet">
<link href="{$PATH}/css/bootstrap-switch.css" rel="stylesheet">
<link href="{$PATH}/font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="{$PATH}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
<link href="{$PATH}/css/plugins/morris/morris-0.5.1.css" rel="stylesheet">
<link href="{$PATH}/css/plugins/timeline/timeline.css" rel="stylesheet">
<link href="{$PATH}/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
<link href="{$PATH}/css/mpos.css" rel="stylesheet">
@ -35,7 +35,7 @@
<script src="{$PATH}/js/plugins/dataTables/dataTables.bootstrap.js"></script>
<script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="{$PATH}/js/plugins/raphael-2.1.2.min.js"></script>
<script src="{$PATH}/js/plugins/morris/morris.js"></script>
<script src="{$PATH}/js/plugins/morris/morris-0.5.1.min.js"></script>
<script src="{$PATH}/js/plugins/sparkline/jquery.sparkline.min.js"></script>
<script src="{$PATH}/js/mpos.js"></script>
</head>