upgrade version

This commit is contained in:
Yan
2017-10-31 18:41:19 +06:30
4746 changed files with 442138 additions and 9031 deletions

34
app/assets/stylesheets/CRM.scss Normal file → Executable file
View File

@@ -1,14 +1,15 @@
@import "bootstrap";
@import "font-awesome";
@import "theme";
@import "jquery-ui";
@import "bootstrap-datepicker3";
/* Show it is fixed to the top */
// body {
// min-height: 75rem;
// padding-top: 4.5rem;
// }
@import "material_icons";
@import "tether";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
@import "animate-css/animate";
@import "sweetalert/sweetalert.css";
@import "multi-select/css/multi-select.css";
@import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
@import "morrisjs/morris";
@import "BSBMaterial/style";
@import "BSBMaterial/themes/all-themes";
@import "reset";
.selected-item {
color: #fff !important;
@@ -44,14 +45,6 @@
.jconfirm-box-container{
margin-left:-40px !important
}
.card-columns {
@include media-breakpoint-only(lg) {
column-count: 4;
}
@include media-breakpoint-only(xl) {
column-count: 4;
}
}
#sxModal {
display: none;
@@ -92,4 +85,5 @@
width: 480px;
height: 375px;
}
}