Fix issue #430

2015-08-16 16:31:59 -04:00 · 2015-08-16 16:31:59 -04:00 · dde604023b
parent 6ab5a66fa2
commit dde604023b
40 changed files with 66 additions and 37 deletions
--- a/build/less/core.less
+++ b/build/less/core.less
@ -111,6 +111,18 @@ body {
  }
 }

+body.hold-transition { /* Fix for IE */
+    .content-wrapper, 
+    .right-side, 
+    .main-footer, 
+    .main-sidebar, 
+    .left-side, 
+    .main-header > .navbar,
+    .main-header .logo {
+      .transition(none);
+    }
+}
+
 /* Content */
 .content {
  min-height: 250px;
--- a/dist/css/AdminLTE.css
+++ b/dist/css/AdminLTE.css
@ -129,6 +129,20 @@ body {
 .fixed.layout-boxed .wrapper {
  max-width: 100%;
 }
+body.hold-transition {
+  /* Fix for IE */
+}
+body.hold-transition .content-wrapper,
+body.hold-transition .right-side,
+body.hold-transition .main-footer,
+body.hold-transition .main-sidebar,
+body.hold-transition .left-side,
+body.hold-transition .main-header > .navbar,
+body.hold-transition .main-header .logo {
+  -webkit-transition: none;
+  -o-transition: none;
+  transition: none;
+}
 /* Content */
 .content {
  min-height: 250px;
--- a/dist/css/AdminLTE.min.css
+++ b/dist/css/AdminLTE.min.css
--- a/dist/js/app.js
+++ b/dist/js/app.js
@ -140,6 +140,9 @@ $.AdminLTE.options = {
 $(function () {
  "use strict";

+  //Fix for IE page transitions
+  $("body").removeClass("hold-transition");
+
  //Extend options if external options exist
  if (typeof AdminLTEOptions !== "undefined") {
    $.extend(true,
--- a/dist/js/app.min.js
+++ b/dist/js/app.min.js
--- a/index.html
+++ b/index.html
@ -37,7 +37,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/index2.html
+++ b/index2.html
@ -27,7 +27,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/UI/buttons.html
+++ b/pages/UI/buttons.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/UI/general.html
+++ b/pages/UI/general.html
@ -52,7 +52,7 @@
      }
    </style>
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/UI/icons.html
+++ b/pages/UI/icons.html
@ -71,7 +71,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/UI/modals.html
+++ b/pages/UI/modals.html
@ -40,7 +40,7 @@
      }
    </style>
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/UI/sliders.html
+++ b/pages/UI/sliders.html
@ -31,7 +31,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/UI/timeline.html
+++ b/pages/UI/timeline.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/calendar.html
+++ b/pages/calendar.html
@ -28,7 +28,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/charts/chartjs.html
+++ b/pages/charts/chartjs.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/charts/flot.html
+++ b/pages/charts/flot.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/charts/inline.html
+++ b/pages/charts/inline.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/charts/morris.html
+++ b/pages/charts/morris.html
@ -27,7 +27,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/examples/404.html
+++ b/pages/examples/404.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/examples/500.html
+++ b/pages/examples/500.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/examples/blank.html
+++ b/pages/examples/blank.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <!-- Site wrapper -->
    <div class="wrapper">

--- a/pages/examples/invoice.html
+++ b/pages/examples/invoice.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/examples/lockscreen.html
+++ b/pages/examples/lockscreen.html
@ -22,7 +22,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="lockscreen">
+  <body class="hold-transition lockscreen">
    <!-- Automatic element centering -->
    <div class="lockscreen-wrapper">
      <div class="lockscreen-logo">
--- a/pages/examples/login.html
+++ b/pages/examples/login.html
@ -24,7 +24,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="login-page">
+  <body class="hold-transition login-page">
    <div class="login-box">
      <div class="login-logo">
        <a href="../../index2.html"><b>Admin</b>LTE</a>
--- a/pages/examples/profile.html
+++ b/pages/examples/profile.html
@ -24,7 +24,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/examples/register.html
+++ b/pages/examples/register.html
@ -24,7 +24,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="register-page">
+  <body class="hold-transition register-page">
    <div class="register-box">
      <div class="register-logo">
        <a href="../../index2.html"><b>Admin</b>LTE</a>
--- a/pages/forms/advanced.html
+++ b/pages/forms/advanced.html
@ -35,7 +35,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/forms/editors.html
+++ b/pages/forms/editors.html
@ -27,7 +27,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/forms/general.html
+++ b/pages/forms/general.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/layout/boxed.html
+++ b/pages/layout/boxed.html
@ -26,7 +26,7 @@
    <![endif]-->
  </head>
  <!-- ADD THE CLASS layout-boxed TO GET A BOXED LAYOUT -->
-  <body class="skin-blue layout-boxed sidebar-mini">
+  <body class="hold-transition skin-blue layout-boxed sidebar-mini">
    <!-- Site wrapper -->
    <div class="wrapper">

--- a/pages/layout/collapsed-sidebar.html
+++ b/pages/layout/collapsed-sidebar.html
@ -26,7 +26,7 @@
    <![endif]-->
  </head>
  <!-- ADD THE CLASS sidedar-collapse TO HIDE THE SIDEBAR PRIOR TO LOADING THE SITE -->
-  <body class="skin-blue sidebar-collapse sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-collapse sidebar-mini">
    <!-- Site wrapper -->
    <div class="wrapper">

--- a/pages/layout/fixed.html
+++ b/pages/layout/fixed.html
@ -27,7 +27,7 @@
  </head>
  <!-- ADD THE CLASS fixed TO GET A FIXED HEADER AND SIDEBAR LAYOUT -->
  <!-- the fixed layout is not compatible with sidebar-mini -->
-  <body class="skin-blue fixed sidebar-mini">
+  <body class="hold-transition skin-blue fixed sidebar-mini">
    <!-- Site wrapper -->
    <div class="wrapper">

--- a/pages/layout/top-nav.html
+++ b/pages/layout/top-nav.html
@ -26,7 +26,7 @@
    <![endif]-->
  </head>
  <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-  <body class="skin-blue layout-top-nav">
+  <body class="hold-transition skin-blue layout-top-nav">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/mailbox/compose.html
+++ b/pages/mailbox/compose.html
@ -32,7 +32,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/mailbox/mailbox.html
+++ b/pages/mailbox/mailbox.html
@ -29,7 +29,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/mailbox/read-mail.html
+++ b/pages/mailbox/read-mail.html
@ -29,7 +29,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/tables/data.html
+++ b/pages/tables/data.html
@ -27,7 +27,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/tables/simple.html
+++ b/pages/tables/simple.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/pages/widgets.html
+++ b/pages/widgets.html
@ -25,7 +25,7 @@
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
    <![endif]-->
  </head>
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <header class="main-header">
--- a/starter.html
+++ b/starter.html
@ -51,7 +51,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
  |               | sidebar-mini                            |
  |---------------------------------------------------------|
  -->
-  <body class="skin-blue sidebar-mini">
+  <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">

      <!-- Main Header -->