Merge pull request #204 from Xmk/chiffa

Обновление js библиотек
livestreet · Dec 27, 2016 · fbe74d8 · fbe74d8
2 parents ea57708 + 959e403
commit fbe74d8
Show file tree

Hide file tree

Showing 8 changed files with 3,145 additions and 2,221 deletions.
diff --git a/frontend/components/ls-core/vendor/nprogress/nprogress.css b/frontend/components/ls-core/vendor/nprogress/nprogress.css
@@ -7,7 +7,7 @@
   background: #29d;
 
   position: fixed;
-  z-index: 100;
+  z-index: 1031;
   top: 0;
   left: 0;
 
@@ -34,7 +34,7 @@
 #nprogress .spinner {
   display: block;
   position: fixed;
-  z-index: 100;
+  z-index: 1031;
   top: 15px;
   right: 15px;
 }
@@ -53,6 +53,16 @@
           animation: nprogress-spinner 400ms linear infinite;
 }
 
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+.nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
 @-webkit-keyframes nprogress-spinner {
   0%   { -webkit-transform: rotate(0deg); }
   100% { -webkit-transform: rotate(360deg); }