fixing merge conflicts

1 files changed, 10 insertions, 0 deletions

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index fd6225bdd..1fb970075 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -10,6 +10,9 @@ body {
   height: 100%;
   &.white {
     background: #fff;
+    > .container-fluid {
+      overflow: auto;
+    }
     .inner__wrap {
       > .row.content {
         min-height: 100%;
@@ -53,6 +56,9 @@ div.theme {
 
 .form-control {
   @include border-radius(2px);
+  &.no-resize {
+    resize: none;
+  }
 }
 
 .form-group {
@@ -126,6 +132,10 @@ div.theme {
   to { transform: scale(1) rotate(360deg);}
 }
 
+.glyphicon-refresh-animate {
+  @include animation(spin .7s infinite linear);
+}
+
 .black-bg {
   background-color: black !important;
 }