From df055f1fa59b4cf8fd9af0654674670520d131bb Mon Sep 17 00:00:00 2001
From: Alexander Yuzhin <alexander.yuzhin@onlyoffice.com>
Date: Wed, 16 Nov 2016 14:03:06 +0300
Subject: [PATCH] [DE mobile] Fix search and replace on phone.

---
 .../common/mobile/resources/less/material/_container.less | 1 +
 apps/documenteditor/mobile/app/template/Search.template   | 2 +-
 apps/documenteditor/mobile/app/template/Toolbar.template  | 6 +++---
 apps/documenteditor/mobile/resources/css/app-ios.css      | 4 ++--
 apps/documenteditor/mobile/resources/css/app-material.css | 8 ++++++--
 .../documenteditor/mobile/resources/less/ios/_search.less | 4 ++--
 .../mobile/resources/less/material/_search.less           | 4 ++--
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/common/mobile/resources/less/material/_container.less b/apps/common/mobile/resources/less/material/_container.less
index b6bb1592e..d72f27eaa 100644
--- a/apps/common/mobile/resources/less/material/_container.less
+++ b/apps/common/mobile/resources/less/material/_container.less
@@ -23,6 +23,7 @@
   &.popup,
   &.popover {
     .list-block {
+      margin: 32px 0;
 
       ul {
         border-radius: 0;
diff --git a/apps/documenteditor/mobile/app/template/Search.template b/apps/documenteditor/mobile/app/template/Search.template
index 8042b0183..29edb466c 100644
--- a/apps/documenteditor/mobile/app/template/Search.template
+++ b/apps/documenteditor/mobile/app/template/Search.template
@@ -24,7 +24,7 @@
                     <a href="#" class="link icon-only next disabled"><i class="icon icon-next"></i></a>
                 </p>
                 <p class="buttons-row replace">
-                    <a href="#" class="link disabled">Replace</a>
+                    <a href="#" class="link replace disabled">Replace</a>
                 </p>
                 <% } else { %>
                 <p class="buttons-row">
diff --git a/apps/documenteditor/mobile/app/template/Toolbar.template b/apps/documenteditor/mobile/app/template/Toolbar.template
index e001abf7e..ff5af3bb3 100644
--- a/apps/documenteditor/mobile/app/template/Toolbar.template
+++ b/apps/documenteditor/mobile/app/template/Toolbar.template
@@ -34,9 +34,9 @@
             <a href="#" id="toolbar-add" class="link icon-only" style="display: none;">
                 <i class="icon icon-plus"></i>
             </a>
-            <a href="#" id="toolbar-search" class="link icon-only">
-                <i class="icon icon-search"></i>
-            </a>
+            <!--<a href="#" id="toolbar-search" class="link icon-only">-->
+                <!--<i class="icon icon-search"></i>-->
+            <!--</a>-->
             <a href="#" id="toolbar-settings" class="link icon-only">
                 <i class="icon icon-settings"></i>
             </a>
diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css
index eace9183e..ddfd0d181 100644
--- a/apps/documenteditor/mobile/resources/css/app-ios.css
+++ b/apps/documenteditor/mobile/resources/css/app-ios.css
@@ -6261,7 +6261,7 @@ html.pixel-ratio-3 .color-palette a {
 .phone .searchbar.document.replace .center .replace {
   display: block;
 }
-.phone .searchbar.document.replace .right .replace {
+.phone .searchbar.document.replace .right > .replace {
   display: flex;
 }
 .phone .searchbar.document .left,
@@ -6289,7 +6289,7 @@ html.pixel-ratio-3 .color-palette a {
 .phone .searchbar.document .right > p {
   margin: 0;
 }
-.phone .searchbar.document .right .replace {
+.phone .searchbar.document .right > .replace {
   display: none;
 }
 .searchbar.document {
diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css
index 379765b40..03f88ee78 100644
--- a/apps/documenteditor/mobile/resources/css/app-material.css
+++ b/apps/documenteditor/mobile/resources/css/app-material.css
@@ -5636,6 +5636,10 @@ a.item-link,
 .container-settings.popover {
   width: 360px;
 }
+.settings.popup .list-block,
+.settings.popover .list-block {
+  margin: 32px 0;
+}
 .settings.popup .list-block ul,
 .settings.popover .list-block ul {
   border-radius: 0;
@@ -5865,7 +5869,7 @@ html.pixel-ratio-3 .color-palette a {
 .phone .searchbar.document.replace .center .replace {
   display: block;
 }
-.phone .searchbar.document.replace .right .replace {
+.phone .searchbar.document.replace .right > .replace {
   display: flex;
 }
 .phone .searchbar.document .left,
@@ -5890,7 +5894,7 @@ html.pixel-ratio-3 .color-palette a {
 .phone .searchbar.document .right > p a.link {
   height: 48px;
 }
-.phone .searchbar.document .right .replace {
+.phone .searchbar.document .right > .replace {
   display: none;
 }
 i.icon.icon-expand-up {
diff --git a/apps/documenteditor/mobile/resources/less/ios/_search.less b/apps/documenteditor/mobile/resources/less/ios/_search.less
index 300600da5..5d509e859 100644
--- a/apps/documenteditor/mobile/resources/less/ios/_search.less
+++ b/apps/documenteditor/mobile/resources/less/ios/_search.less
@@ -68,7 +68,7 @@
     }
 
     .right {
-      .replace {
+      > .replace {
         display: flex;
       }
     }
@@ -109,7 +109,7 @@
         margin: 0;
       }
 
-      .replace {
+      > .replace {
         display: none;
       }
     }
diff --git a/apps/documenteditor/mobile/resources/less/material/_search.less b/apps/documenteditor/mobile/resources/less/material/_search.less
index 3ffc9f572..fdbe9bc7b 100644
--- a/apps/documenteditor/mobile/resources/less/material/_search.less
+++ b/apps/documenteditor/mobile/resources/less/material/_search.less
@@ -63,7 +63,7 @@
     }
 
     .right {
-      .replace {
+      > .replace {
         display: flex;
       }
     }
@@ -104,7 +104,7 @@
         }
       }
 
-      .replace {
+      > .replace {
         display: none;
       }
     }