mirror of https://github.com/ColorlibHQ/AdminLTE
ChartJS requires css height in newer version
Abdullah Almsaeed
parent
4bebda892a
commit
d75e3e18c9
|
|
@ -1281,6 +1281,20 @@ a:focus {
|
|||
.icheck > label {
|
||||
padding-left: 0;
|
||||
}
|
||||
/* support Font Awesome icons in form-control */
|
||||
.form-control-feedback.fa {
|
||||
line-height: 34px;
|
||||
}
|
||||
.input-lg + .form-control-feedback.fa,
|
||||
.input-group-lg + .form-control-feedback.fa,
|
||||
.form-group-lg .form-control + .form-control-feedback.fa {
|
||||
line-height: 46px;
|
||||
}
|
||||
.input-sm + .form-control-feedback.fa,
|
||||
.input-group-sm + .form-control-feedback.fa,
|
||||
.form-group-sm .form-control + .form-control-feedback.fa {
|
||||
line-height: 30px;
|
||||
}
|
||||
/*
|
||||
* Component: Progress Bar
|
||||
* -----------------------
|
||||
|
|
@ -3139,55 +3153,59 @@ table.text-center th {
|
|||
margin-top: 0;
|
||||
}
|
||||
/*
|
||||
* Plugin: Social Buttons
|
||||
* ----------------------
|
||||
* Social Buttons for Bootstrap
|
||||
*
|
||||
* Copyright 2013-2015 Panayiotis Lipiridis
|
||||
* Licensed under the MIT License
|
||||
*
|
||||
* https://github.com/lipis/bootstrap-social
|
||||
*/
|
||||
.btn-social {
|
||||
position: relative;
|
||||
padding-left: 44px !important;
|
||||
padding-left: 44px;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.btn-social :first-child {
|
||||
.btn-social > :first-child {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 32px !important;
|
||||
line-height: 34px !important;
|
||||
font-size: 1.6em!important;
|
||||
width: 32px;
|
||||
line-height: 34px;
|
||||
font-size: 1.6em;
|
||||
text-align: center;
|
||||
border-right: 1px solid rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-social.btn-lg {
|
||||
padding-left: 61px !important;
|
||||
padding-left: 61px;
|
||||
}
|
||||
.btn-social.btn-lg :first-child {
|
||||
.btn-social.btn-lg > :first-child {
|
||||
line-height: 45px;
|
||||
width: 45px;
|
||||
font-size: 1.8em;
|
||||
}
|
||||
.btn-social.btn-sm {
|
||||
padding-left: 38px !important;
|
||||
padding-left: 38px;
|
||||
}
|
||||
.btn-social.btn-sm :first-child {
|
||||
.btn-social.btn-sm > :first-child {
|
||||
line-height: 28px;
|
||||
width: 28px;
|
||||
font-size: 1.4em;
|
||||
}
|
||||
.btn-social.btn-xs {
|
||||
padding-left: 30px !important;
|
||||
padding-left: 30px;
|
||||
}
|
||||
.btn-social.btn-xs :first-child {
|
||||
.btn-social.btn-xs > :first-child {
|
||||
line-height: 20px;
|
||||
width: 20px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
.btn-social-icon {
|
||||
position: relative;
|
||||
padding-left: 44px !important;
|
||||
padding-left: 44px;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
|
@ -3196,42 +3214,42 @@ table.text-center th {
|
|||
width: 34px;
|
||||
padding: 0;
|
||||
}
|
||||
.btn-social-icon :first-child {
|
||||
.btn-social-icon > :first-child {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 32px !important;
|
||||
line-height: 34px !important;
|
||||
font-size: 1.6em!important;
|
||||
width: 32px;
|
||||
line-height: 34px;
|
||||
font-size: 1.6em;
|
||||
text-align: center;
|
||||
border-right: 1px solid rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-social-icon.btn-lg {
|
||||
padding-left: 61px !important;
|
||||
padding-left: 61px;
|
||||
}
|
||||
.btn-social-icon.btn-lg :first-child {
|
||||
.btn-social-icon.btn-lg > :first-child {
|
||||
line-height: 45px;
|
||||
width: 45px;
|
||||
font-size: 1.8em;
|
||||
}
|
||||
.btn-social-icon.btn-sm {
|
||||
padding-left: 38px !important;
|
||||
padding-left: 38px;
|
||||
}
|
||||
.btn-social-icon.btn-sm :first-child {
|
||||
.btn-social-icon.btn-sm > :first-child {
|
||||
line-height: 28px;
|
||||
width: 28px;
|
||||
font-size: 1.4em;
|
||||
}
|
||||
.btn-social-icon.btn-xs {
|
||||
padding-left: 30px !important;
|
||||
padding-left: 30px;
|
||||
}
|
||||
.btn-social-icon.btn-xs :first-child {
|
||||
.btn-social-icon.btn-xs > :first-child {
|
||||
line-height: 20px;
|
||||
width: 20px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
.btn-social-icon :first-child {
|
||||
.btn-social-icon > :first-child {
|
||||
border: none;
|
||||
text-align: center;
|
||||
width: 100%!important;
|
||||
|
|
@ -3254,6 +3272,30 @@ table.text-center th {
|
|||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
.btn-adn {
|
||||
color: #ffffff;
|
||||
background-color: #d87a68;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-adn:hover,
|
||||
.btn-adn:focus,
|
||||
.btn-adn.focus,
|
||||
.btn-adn:active,
|
||||
.btn-adn.active,
|
||||
.open > .dropdown-toggle.btn-adn {
|
||||
color: #ffffff;
|
||||
background-color: #ce563f;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-adn:active,
|
||||
.btn-adn.active,
|
||||
.open > .dropdown-toggle.btn-adn {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-adn .badge {
|
||||
color: #d87a68;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-bitbucket {
|
||||
color: #ffffff;
|
||||
background-color: #205081;
|
||||
|
|
@ -3352,7 +3394,7 @@ table.text-center th {
|
|||
}
|
||||
.btn-foursquare {
|
||||
color: #ffffff;
|
||||
background-color: #0072b1;
|
||||
background-color: #f94877;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-foursquare:hover,
|
||||
|
|
@ -3362,7 +3404,7 @@ table.text-center th {
|
|||
.btn-foursquare.active,
|
||||
.open > .dropdown-toggle.btn-foursquare {
|
||||
color: #ffffff;
|
||||
background-color: #00517e;
|
||||
background-color: #f71752;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-foursquare:active,
|
||||
|
|
@ -3371,7 +3413,7 @@ table.text-center th {
|
|||
background-image: none;
|
||||
}
|
||||
.btn-foursquare .badge {
|
||||
color: #0072b1;
|
||||
color: #f94877;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-github {
|
||||
|
|
@ -3398,27 +3440,27 @@ table.text-center th {
|
|||
color: #444444;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-google-plus {
|
||||
.btn-google {
|
||||
color: #ffffff;
|
||||
background-color: #dd4b39;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-google-plus:hover,
|
||||
.btn-google-plus:focus,
|
||||
.btn-google-plus.focus,
|
||||
.btn-google-plus:active,
|
||||
.btn-google-plus.active,
|
||||
.open > .dropdown-toggle.btn-google-plus {
|
||||
.btn-google:hover,
|
||||
.btn-google:focus,
|
||||
.btn-google.focus,
|
||||
.btn-google:active,
|
||||
.btn-google.active,
|
||||
.open > .dropdown-toggle.btn-google {
|
||||
color: #ffffff;
|
||||
background-color: #c23321;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-google-plus:active,
|
||||
.btn-google-plus.active,
|
||||
.open > .dropdown-toggle.btn-google-plus {
|
||||
.btn-google:active,
|
||||
.btn-google.active,
|
||||
.open > .dropdown-toggle.btn-google {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-google-plus .badge {
|
||||
.btn-google .badge {
|
||||
color: #dd4b39;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
|
@ -3470,6 +3512,126 @@ table.text-center th {
|
|||
color: #007bb6;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-microsoft {
|
||||
color: #ffffff;
|
||||
background-color: #2672ec;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-microsoft:hover,
|
||||
.btn-microsoft:focus,
|
||||
.btn-microsoft.focus,
|
||||
.btn-microsoft:active,
|
||||
.btn-microsoft.active,
|
||||
.open > .dropdown-toggle.btn-microsoft {
|
||||
color: #ffffff;
|
||||
background-color: #125acd;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-microsoft:active,
|
||||
.btn-microsoft.active,
|
||||
.open > .dropdown-toggle.btn-microsoft {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-microsoft .badge {
|
||||
color: #2672ec;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-openid {
|
||||
color: #ffffff;
|
||||
background-color: #f7931e;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-openid:hover,
|
||||
.btn-openid:focus,
|
||||
.btn-openid.focus,
|
||||
.btn-openid:active,
|
||||
.btn-openid.active,
|
||||
.open > .dropdown-toggle.btn-openid {
|
||||
color: #ffffff;
|
||||
background-color: #da7908;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-openid:active,
|
||||
.btn-openid.active,
|
||||
.open > .dropdown-toggle.btn-openid {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-openid .badge {
|
||||
color: #f7931e;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-pinterest {
|
||||
color: #ffffff;
|
||||
background-color: #cb2027;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-pinterest:hover,
|
||||
.btn-pinterest:focus,
|
||||
.btn-pinterest.focus,
|
||||
.btn-pinterest:active,
|
||||
.btn-pinterest.active,
|
||||
.open > .dropdown-toggle.btn-pinterest {
|
||||
color: #ffffff;
|
||||
background-color: #9f191f;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-pinterest:active,
|
||||
.btn-pinterest.active,
|
||||
.open > .dropdown-toggle.btn-pinterest {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-pinterest .badge {
|
||||
color: #cb2027;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-reddit {
|
||||
color: #000000;
|
||||
background-color: #eff7ff;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-reddit:hover,
|
||||
.btn-reddit:focus,
|
||||
.btn-reddit.focus,
|
||||
.btn-reddit:active,
|
||||
.btn-reddit.active,
|
||||
.open > .dropdown-toggle.btn-reddit {
|
||||
color: #000000;
|
||||
background-color: #bcddff;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-reddit:active,
|
||||
.btn-reddit.active,
|
||||
.open > .dropdown-toggle.btn-reddit {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-reddit .badge {
|
||||
color: #eff7ff;
|
||||
background-color: #000000;
|
||||
}
|
||||
.btn-soundcloud {
|
||||
color: #ffffff;
|
||||
background-color: #ff5500;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-soundcloud:hover,
|
||||
.btn-soundcloud:focus,
|
||||
.btn-soundcloud.focus,
|
||||
.btn-soundcloud:active,
|
||||
.btn-soundcloud.active,
|
||||
.open > .dropdown-toggle.btn-soundcloud {
|
||||
color: #ffffff;
|
||||
background-color: #cc4400;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-soundcloud:active,
|
||||
.btn-soundcloud.active,
|
||||
.open > .dropdown-toggle.btn-soundcloud {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-soundcloud .badge {
|
||||
color: #ff5500;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-tumblr {
|
||||
color: #ffffff;
|
||||
background-color: #2c4762;
|
||||
|
|
@ -3518,6 +3680,30 @@ table.text-center th {
|
|||
color: #55acee;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-vimeo {
|
||||
color: #ffffff;
|
||||
background-color: #1ab7ea;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-vimeo:hover,
|
||||
.btn-vimeo:focus,
|
||||
.btn-vimeo.focus,
|
||||
.btn-vimeo:active,
|
||||
.btn-vimeo.active,
|
||||
.open > .dropdown-toggle.btn-vimeo {
|
||||
color: #ffffff;
|
||||
background-color: #1295bf;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-vimeo:active,
|
||||
.btn-vimeo.active,
|
||||
.open > .dropdown-toggle.btn-vimeo {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-vimeo .badge {
|
||||
color: #1ab7ea;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-vk {
|
||||
color: #ffffff;
|
||||
background-color: #587ea3;
|
||||
|
|
@ -3542,6 +3728,30 @@ table.text-center th {
|
|||
color: #587ea3;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
.btn-yahoo {
|
||||
color: #ffffff;
|
||||
background-color: #720e9e;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-yahoo:hover,
|
||||
.btn-yahoo:focus,
|
||||
.btn-yahoo.focus,
|
||||
.btn-yahoo:active,
|
||||
.btn-yahoo.active,
|
||||
.open > .dropdown-toggle.btn-yahoo {
|
||||
color: #ffffff;
|
||||
background-color: #500a6f;
|
||||
border-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.btn-yahoo:active,
|
||||
.btn-yahoo.active,
|
||||
.open > .dropdown-toggle.btn-yahoo {
|
||||
background-image: none;
|
||||
}
|
||||
.btn-yahoo .badge {
|
||||
color: #720e9e;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
/*
|
||||
* Plugin: Full Calendar
|
||||
* ---------------------
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -317,9 +317,9 @@ function _init() {
|
|||
//Enable sidebar push menu
|
||||
if ($(window).width() > (screenSizes.sm - 1)) {
|
||||
if ($("body").hasClass('sidebar-collapse')) {
|
||||
$("body").removeClass('sidebar-collapse').trigger('expanded.pushMenu');
|
||||
$("body").removeClass('sidebar-collapse').trigger('expanded.pushMenu');
|
||||
} else {
|
||||
$("body").addClass('sidebar-collapse').trigger('collapsed.pushMenu');
|
||||
$("body").addClass('sidebar-collapse').trigger('collapsed.pushMenu');
|
||||
}
|
||||
}
|
||||
//Handle sidebar push menu for small screens
|
||||
|
|
@ -534,10 +534,10 @@ function _init() {
|
|||
$.AdminLTE.boxWidget = {
|
||||
selectors: $.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors,
|
||||
icons: $.AdminLTE.options.boxWidgetOptions.boxWidgetIcons,
|
||||
animationSpeed: $.AdminLTE.options.animationSpeed,
|
||||
animationSpeed: $.AdminLTE.options.animationSpeed,
|
||||
activate: function (_box) {
|
||||
var _this = this;
|
||||
if (! _box) {
|
||||
if (!_box) {
|
||||
_box = document; // activate all boxes per default
|
||||
}
|
||||
//Listen for collapse event triggers
|
||||
|
|
@ -578,7 +578,7 @@ function _init() {
|
|||
});
|
||||
}
|
||||
},
|
||||
remove: function (element) {
|
||||
remove: function (element) {
|
||||
//Find the box parent
|
||||
var box = element.parents(".box").first();
|
||||
box.slideUp(this.animationSpeed);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ $(function () {
|
|||
//String - A legend template
|
||||
legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%=datasets[i].label%></li><%}%></ul>",
|
||||
//Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
|
||||
maintainAspectRatio: false,
|
||||
maintainAspectRatio: true,
|
||||
//Boolean - whether to make the chart responsive to window resizing
|
||||
responsive: true
|
||||
};
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@
|
|||
</p>
|
||||
<div class="chart">
|
||||
<!-- Sales Chart Canvas -->
|
||||
<canvas id="salesChart" height="180"></canvas>
|
||||
<canvas id="salesChart" style="height: 180px;"></canvas>
|
||||
</div><!-- /.chart-responsive -->
|
||||
</div><!-- /.col -->
|
||||
<div class="col-md-4">
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@
|
|||
</div>
|
||||
<div class="box-body">
|
||||
<div class="chart">
|
||||
<canvas id="areaChart" height="250"></canvas>
|
||||
<canvas id="areaChart" style="height:250px"></canvas>
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas id="pieChart" height="250"></canvas>
|
||||
<canvas id="pieChart" style="height:250px"></canvas>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
||||
|
|
@ -397,7 +397,7 @@
|
|||
</div>
|
||||
<div class="box-body">
|
||||
<div class="chart">
|
||||
<canvas id="lineChart" height="250"></canvas>
|
||||
<canvas id="lineChart" style="height:250px"></canvas>
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
|
@ -413,7 +413,7 @@
|
|||
</div>
|
||||
<div class="box-body">
|
||||
<div class="chart">
|
||||
<canvas id="barChart" height="230"></canvas>
|
||||
<canvas id="barChart" style="height:230px"></canvas>
|
||||
</div>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
|
|
@ -686,7 +686,7 @@
|
|||
//String - A legend template
|
||||
legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>",
|
||||
//Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
|
||||
maintainAspectRatio: false,
|
||||
maintainAspectRatio: true,
|
||||
//Boolean - whether to make the chart responsive to window resizing
|
||||
responsive: true
|
||||
};
|
||||
|
|
@ -767,7 +767,7 @@
|
|||
//Boolean - whether to make the chart responsive to window resizing
|
||||
responsive: true,
|
||||
// Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
|
||||
maintainAspectRatio: false,
|
||||
maintainAspectRatio: true,
|
||||
//String - A legend template
|
||||
legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li><span style=\"background-color:<%=segments[i].fillColor%>\"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>"
|
||||
};
|
||||
|
|
@ -809,7 +809,7 @@
|
|||
legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].fillColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>",
|
||||
//Boolean - whether to make the chart responsive
|
||||
responsive: true,
|
||||
maintainAspectRatio: false
|
||||
maintainAspectRatio: true
|
||||
};
|
||||
|
||||
barChartOptions.datasetFill = false;
|
||||
|
|
|
|||
Loading…
Reference in New Issue