Browse Source

plugins updates part 2
- added .editorconfig
- updated package.json & build/npm/Plugins.js according to the following changes
- updated dev dependencies to clear audits
- updated daterangepicker
- updated overlayScrollbars
- moved flot (0.8.2) to flot-old for plugins
- updated flot
- updated fullcalendar
- replaced icheck with icheck-bootstrap & updated demo files
- added icheck-bootstrap color overrides
- updated inputmask
- updated ion-rangeslider
- updated jquery-ui
- updated bootstrap-slider tweaks & demo files
- replaced jvectormap with jqvmap & updated demo files
- added jquery-mapael & replaced in index2 jvectormap
- updated jquery-knob
- replaced pace with pace-progress
- updated select2 & demo files
- replaced jquery.sparkline with sparklines & updated demo files and removed jquery.sparkline demo section

REJack 5 years ago
parent
commit
f70483a806

+ 2 - 2
.babelrc

@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "env",
+      "@babel/preset-env",
       {
         "loose": true,
         "modules": false
@@ -9,6 +9,6 @@
     ]
   ],
   "plugins": [
-    "external-helpers"
+    "@babel/plugin-external-helpers"
   ]
 }

+ 9 - 0
.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+

+ 92 - 1
build/npm/Plugins.js

@@ -37,6 +37,16 @@ const Plugins = [
     from: 'node_modules/chart.js/dist/',
     to  : 'plugins/chart.js'
   },
+  // jQuery UI
+  {
+    from: 'node_modules/jquery-ui-dist/',
+    to  : 'plugins/jquery-ui'
+  },
+  // Flot
+  {
+    from: 'node_modules/flot/dist/es5/',
+    to  : 'plugins/flot'
+  },
   // Summernote
   {
     from: 'node_modules/summernote/dist/',
@@ -83,7 +93,11 @@ const Plugins = [
     from: 'node_modules/fastclick/lib',
     to  : 'plugins/fastclick'
   },
-
+  // Date Range Picker
+  {
+    from: 'node_modules/daterangepicker/',
+    to  : 'plugins/daterangepicker'
+  },
   // DataTables
   {
     from: 'node_modules/datatables.net/js',
@@ -97,6 +111,83 @@ const Plugins = [
     from: 'node_modules/datatables.net-bs4/css',
     to: 'plugins/datatables'
   },
+  // Fullcalendar
+  {
+    from: 'node_modules/@fullcalendar/core/',
+    to  : 'plugins/fullcalendar'
+  },
+  {
+    from: 'node_modules/@fullcalendar/bootstrap/',
+    to  : 'plugins/fullcalendar-bootstrap'
+  },
+  {
+    from: 'node_modules/@fullcalendar/daygrid/',
+    to  : 'plugins/fullcalendar-daygrid'
+  },
+  {
+    from: 'node_modules/@fullcalendar/timegrid/',
+    to  : 'plugins/fullcalendar-timegrid'
+  },
+  {
+    from: 'node_modules/@fullcalendar/interaction/',
+    to  : 'plugins/fullcalendar-interaction'
+  },
+  // icheck bootstrap
+  {
+    from: 'node_modules/icheck-bootstrap/',
+    to  : 'plugins/icheck-bootstrap'
+  },
+  // inputmask
+  {
+    from: 'node_modules/inputmask/dist/',
+    to  : 'plugins/inputmask'
+  },
+  // ion-rangeslider
+  {
+    from: 'node_modules/ion-rangeslider/',
+    to  : 'plugins/ion-rangeslider'
+  },
+  // JQVMap
+  {
+    from: 'node_modules/jqvmap/dist/',
+    to  : 'plugins/jqvmap'
+  },
+  // jQuery Mapael
+  {
+    from: 'node_modules/jquery-mapael/js/',
+    to  : 'plugins/jquery-mapael'
+  },
+  // Raphael
+  {
+    from: 'node_modules/raphael/',
+    to  : 'plugins/raphael'
+  },
+  // jQuery Mousewheel
+  {
+    from: 'node_modules/jquery-mousewheel/',
+    to  : 'plugins/jquery-mousewheel'
+  },
+  // jQuery Knob
+  {
+    from: 'node_modules/jquery-knob-chif/dist/',
+    to  : 'plugins/jquery-knob'
+  },
+  // pace-progress
+  {
+    from: 'node_modules/@lgaitan/pace-progress/dist/',
+    to  : 'plugins/pace-progress'
+  },
+  // Select2
+  {
+    from: 'node_modules/select2/dist/',
+    to  : 'plugins/select2'
+  },
+  // Select2
+  {
+    from: 'node_modules/sparklines/source/',
+    to  : 'plugins/sparklines'
+  },
+
 
   // // Doc Assets
   // // AdminLTE Dist

+ 7 - 2
build/scss/AdminLTE.scss

@@ -41,6 +41,7 @@
 @import "users-list";
 @import "carousel";
 @import "social-widgets";
+@import "modals";
 // PAGES
 // ---------------------------------------------------
 @import "mailbox";
@@ -51,8 +52,12 @@
 @import "profile";
 // Plugins
 // ---------------------------------------------------
-@import "fullcalendar";
-@import "select2";
+@import "plugins/fullcalendar";
+@import "plugins/select2";
+@import "plugins/bootstrap-slider";
+@import "plugins/icheck-bootstrap";
+@import "plugins/mapael";
+@import "plugins/jqvmap";
 // Miscellaneous
 // ---------------------------------------------------
 @import "miscellaneous";

+ 10 - 10
build/scss/_buttons.scss

@@ -34,14 +34,14 @@
 
 // Button color variations
 .btn-default {
-  background-color: #f4f4f4;
-  color: #444;
-  border-color: #ddd;
+  background-color: $button-default-background-color;
+  color: $button-default-color;
+  border-color: $button-default-border-color;
   &:hover,
   &:active,
   &.hover {
-    color: #222;
-    background-color: darken(#f4f4f4, 5%);
+    color: darken($button-default-color, 10%);
+    background-color: darken($button-default-background-color, 5%);
   }
 }
 
@@ -55,8 +55,8 @@
   height: 60px;
   text-align: center;
   color: #666;
-  border: 1px solid #ddd;
-  background-color: #f4f4f4;
+  border: 1px solid $button-default-border-color;
+  background-color: $button-default-background-color;
   font-size: 12px;
   // Icons within the btn
   > .fa,
@@ -70,9 +70,9 @@
   }
 
   &:hover {
-    background: #f4f4f4;
-    color: #444;
-    border-color: #aaa;
+    background: $button-default-background-color;
+    color: $button-default-color;
+    border-color: darken($button-default-border-color, 20%);
   }
 
   &:active,

+ 0 - 43
build/scss/_miscellaneous.scss

@@ -361,46 +361,3 @@ a.text-muted:hover {
 .flex-1 {
   flex: 1;
 }
-
-// Modals
-.modal-dialog {
-  .overlay {
-      display: block;
-      position: absolute;
-      z-index: ($zindex-modal + 2);
-      background: rgba(255, 255, 255, 0.7);
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-  }
-}
-
-.modal-content {
-  &.bg-warning {
-    .modal-header,
-    .modal-footer {
-      border-color: $gray-800;
-    }
-  }
-}
-.modal-content {
-  &.bg-primary,
-  &.bg-secondary,
-  &.bg-info,
-  &.bg-danger,
-  &.bg-success, {
-    .close{
-      color: $white;
-    }
-  }
-}
-
-// Background colors (colors)
-@each $name, $color in $colors {
-  ##{$name}.slider {
-    .slider-selection {
-      background: $color;
-    }
-  }
-}

+ 39 - 0
build/scss/_modals.scss

@@ -0,0 +1,39 @@
+/*
+ * General: Modals
+ * ----------------------
+ */
+
+// Overlay
+.modal-dialog {
+  .overlay {
+      display: block;
+      position: absolute;
+      z-index: ($zindex-modal + 2);
+      background: rgba(255, 255, 255, 0.7);
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+  }
+}
+
+// BG Color Variations Fixes
+.modal-content {
+  &.bg-warning {
+    .modal-header,
+    .modal-footer {
+      border-color: $gray-800;
+    }
+  }
+}
+.modal-content {
+  &.bg-primary,
+  &.bg-secondary,
+  &.bg-info,
+  &.bg-danger,
+  &.bg-success, {
+    .close{
+      color: $white;
+    }
+  }
+}

+ 8 - 0
build/scss/_variables.scss

@@ -151,3 +151,11 @@ $transition-fn: ease-in-out !default;
 // TEXT
 // --------------------------------------------------------
 $font-size-xl: ($font-size-base * 2);
+
+
+// BUTTON
+// --------------------------------------------------------
+$button-default-background-color: #f4f4f4 !default;
+$button-default-color: #444 !default;
+$button-default-border-color: #ddd !default;
+  

+ 25 - 0
build/scss/plugins/_bootstrap-slider.scss

@@ -0,0 +1,25 @@
+/*
+ * Plugin: Bootstrap Slider
+ * ---------------------
+ */
+
+// Style override
+.slider {
+  &.slider-vertical {
+    height: 100%;
+  }
+  &.slider-horizontal {
+    width: 100%;
+  }
+}
+
+// Colors
+@each $name, $color in $colors {
+  .slider-#{$name} .slider {
+    .slider-selection {
+      background: $color;
+    }
+  }
+}
+
+

+ 2 - 1
build/scss/_fullcalendar.scss → build/scss/plugins/_fullcalendar.scss

@@ -2,7 +2,8 @@
  * Plugin: Full Calendar
  * ---------------------
  */
-//Fullcalendar buttons
+
+// Buttons
 .fc-button {
   background: #f4f4f4;
   background-image: none;

Some files were not shown because too many files changed in this diff