diff --git a/dist/js/pages/dashboard2.js b/dist/js/pages/dashboard2.js index 98b152ee0..3c074f48c 100755 --- a/dist/js/pages/dashboard2.js +++ b/dist/js/pages/dashboard2.js @@ -25,12 +25,12 @@ $(function () { datasets: [ { label: "Electronics", - fillColor: "rgba(210, 214, 222, 1)", - strokeColor: "rgba(210, 214, 222, 1)", - pointColor: "rgba(210, 214, 222, 1)", + fillColor: "rgb(210, 214, 222)", + strokeColor: "rgb(210, 214, 222)", + pointColor: "rgb(210, 214, 222)", pointStrokeColor: "#c1c7d1", pointHighlightFill: "#fff", - pointHighlightStroke: "rgba(220,220,220,1)", + pointHighlightStroke: "rgb(220,220,220)", data: [65, 59, 80, 81, 56, 55, 40] }, { @@ -78,7 +78,7 @@ $(function () { //Boolean - Whether to fill the dataset with a color datasetFill: true, //String - A legend template - legendTemplate: "", + legendTemplate: "", //Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container maintainAspectRatio: false, //Boolean - whether to make the chart responsive to window resizing @@ -158,7 +158,9 @@ $(function () { // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container maintainAspectRatio: false, //String - A legend template - legendTemplate: "" + legendTemplate: "", + //String - A tooltip template + tooltipTemplate: "<%=value %> <%=label%> users" }; //Create pie or douhnut chart // You can switch between pie and douhnut using the method below. diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html index bcb0772fd..fe8364ac1 100644 --- a/pages/charts/chartjs.html +++ b/pages/charts/chartjs.html @@ -2,17 +2,15 @@ - AdminLTE 2 | Morris.js Charts + AdminLTE 2 | ChartJS - - - @@ -62,54 +60,6 @@

Why not buy a new awesome theme?

-
  • - -
    - user image -
    -

    - AdminLTE Design Team - 2 hours -

    -

    Why not buy a new awesome theme?

    -     -
    • -
  • - -
    - user image -
    -

    - Developers - Today -

    -

    Why not buy a new awesome theme?

    -     -
    • -
  • - -
    - user image -
    -

    - Sales Department - Yesterday -

    -

    Why not buy a new awesome theme?

    -     -
    • -
  • - -
    - user image -
    -

    - Reviewers - 2 days -

    -

    Why not buy a new awesome theme?

    -     -
  • See All Messages
    • @@ -131,27 +81,6 @@ 5 new members joined today -
  • - - Very long description here that may not fit into the page and may cause design problems - -
    • -
  • - - 5 new members joined - -
    • - -
  • - - 25 sales made - -
    • -
  • - - You changed your username - -
  • View all
    • @@ -181,45 +110,6 @@ -
  • - -

    - Create a nice theme - 40% -

    -
    -
    - 40% Complete -
    -
    -     -
    • -
  • - -

    - Some task I need to do - 60% -

    -
    -
    - 60% Complete -
    -
    -     -
    • -
  • - -

    - Make beautiful transitions - 80% -

    -
    -
    - 80% Complete -
    -
    -     -
  • @@ -437,7 +327,7 @@

    - Morris Charts + ChartJS Preview sample

      @@ -449,10 +339,6 @@
      -
      -

      Warning!

      -

      Morris.js charts are no longer maintained by its author. We would recommend using any of the other charts that come with the template.

      -
      @@ -460,8 +346,8 @@

      Area Chart

      -
      -
      +
      +
      @@ -470,8 +356,10 @@

      Donut Chart

      -
      -
      +
      +
      + +
      @@ -482,8 +370,8 @@

      Line Chart

      -
      -
      +
      +
      @@ -492,8 +380,8 @@

      Bar Chart

      -
      -
      +
      +
      @@ -516,7 +404,7 @@ - + @@ -525,7 +413,210 @@