Resolve conflicts

ColorlibHQ · May 18, 2017 · 4169db0 · 4169db0
2 parents 342a0ac + b5f4bba
commit 4169db0
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 6 deletions.
diff --git a/build/less/AdminLTE.less b/build/less/AdminLTE.less
@@ -1,5 +1,5 @@
 /*!
- *   AdminLTE v2.3.8
+ *   AdminLTE v2.3.12
  *   Author: Almsaeed Studio
  *	 Website: Almsaeed Studio <http://almsaeedstudio.com>
  *   License: Open source - MIT

diff --git a/dist/css/AdminLTE.css b/dist/css/AdminLTE.css
@@ -1,5 +1,5 @@
 /*!
- *   AdminLTE v2.3.8
+ *   AdminLTE v2.3.12
  *   Author: Almsaeed Studio
  *	 Website: Almsaeed Studio <http://almsaeedstudio.com>
  *   License: Open source - MIT

diff --git a/dist/css/AdminLTE.min.css b/dist/css/AdminLTE.min.css
diff --git a/documentation/build/index.html b/documentation/build/index.html
@@ -166,7 +166,7 @@ <h1>
 
       <footer class="main-footer">
         <div class="pull-right hidden-xs">
-          <b>Version</b> 2.4.0
+          <b>Version</b> 2.3.12
         </div>
         <strong>Copyright &copy; 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved.
       </footer>

diff --git a/pages/UI/sliders.html b/pages/UI/sliders.html
@@ -814,8 +814,68 @@ <h3 class="control-sidebar-heading">Chat Settings</h3>
 <script>
   $(function () {
     /* BOOTSTRAP SLIDER */
-    $('.slider').slider()
-  })
+    $('.slider').slider();
+
+    /* ION SLIDER */
+    $("#range_1").ionRangeSlider({
+      min: 0,
+      max: 5000,
+      from: 1000,
+      to: 4000,
+      type: 'double',
+      step: 1,
+      prefix: "$",
+      prettify: false,
+      hasGrid: true
+    });
+    $("#range_2").ionRangeSlider({});
+
+    $("#range_5").ionRangeSlider({
+      min: 0,
+      max: 10,
+      type: 'single',
+      step: 0.1,
+      postfix: " mm",
+      prettify: false,
+      hasGrid: true
+    });
+    $("#range_6").ionRangeSlider({
+      min: -50,
+      max: 50,
+      from: 0,
+      type: 'single',
+      step: 1,
+      postfix: "°",
+      prettify: false,
+      hasGrid: true
+    });
+
+    $("#range_4").ionRangeSlider({
+      type: "single",
+      step: 100,
+      postfix: " light years",
+      from: 55000,
+      hideMinMax: true,
+      hideFromTo: false
+    });
+    $("#range_3").ionRangeSlider({
+      type: "double",
+      postfix: " miles",
+      step: 10000,
+      from: 25000000,
+      to: 35000000,
+      onChange: function (obj) {
+        var t = "";
+        for (var prop in obj) {
+          t += prop + ": " + obj[prop] + "\r\n";
+        }
+        $("#result").html(t);
+      },
+      onLoad: function (obj) {
+        //
+      }
+    });
+  });
 </script>
 </body>
 </html>