fixing merge conflicts

1 files changed, 14 insertions, 5 deletions

diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 9c0c09ee3..a33d69378 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -413,7 +413,7 @@
         }
     }
     .footer, .footer-pane, .footer-push {
-        height: 185px;
+        height: auto;
     }
     .footer-pane {
         .footer-link {
@@ -432,14 +432,16 @@
         color: #fff;
         .search__form {
             border: none;
-            padding: 0 10px 0 30px;
+            padding: 0 60px 0 25px;
             .form-control {
+                line-height: 31px;
                 background: none;
                 color: #fff;
-                border-bottom: 1px solid #fff;
-                border-bottom: 1px solid rgba(#fff, 0.7);
                 border-radius: 0;
-                padding: 0 0 0 23px;
+                padding: 0 10px 0;
+                @include input-placeholder {
+                    color: rgba(#fff, 0.6);
+                }
             }
             ::-webkit-input-placeholder {
                 color: #fff;
@@ -534,6 +536,11 @@
         .sidebar--right__close {
             display: none;
         }
+        .search__form {
+            .glyphicon {
+                color: #fff;
+            }
+        }
     }
     .inner__wrap {
         &.move--right {
@@ -570,6 +577,8 @@
     .modal {
         .modal-image {
             .image-wrapper {
+                font-size: 12px;
+                max-width: 280px;
                 .modal-close {
                     @include opacity(1);
                 }