[epiphany] Fix Search Match Counter Bugs

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 7229ccf363bf948de4c16a8c180506b6e26cefd2
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Fri May 10 20:18:06 2019 +0200

    Fix Search Match Counter Bugs
    
    Fixes: https://gitlab.gnome.org/GNOME/epiphany/issues/762

 embed/ephy-find-toolbar.c               |  2 +-
 src/resources/parse-sass.sh             |  2 +-
 src/resources/themes/Adwaita-dark.css   |  2 ++
 src/resources/themes/Adwaita.css        |  2 +-
 src/resources/themes/_Adwaita-base.scss | 10 ++++++++--
 5 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/embed/ephy-find-toolbar.c b/embed/ephy-find-toolbar.c
index 1a8056219..d943dc8a3 100644
--- a/embed/ephy-find-toolbar.c
+++ b/embed/ephy-find-toolbar.c
@@ -549,7 +549,7 @@ counted_matches_cb (WebKitFindController *find_controller,
   EphyFindToolbar *toolbar = EPHY_FIND_TOOLBAR (user_data);
 
   toolbar->num_matches = match_count;
-  toolbar->current_match = 1;
+  toolbar->current_match = toolbar->num_matches ? 1 : 0;
 
   update_search_tag (toolbar);
 }
diff --git a/src/resources/parse-sass.sh b/src/resources/parse-sass.sh
index 65b6e4241..12dba0ec5 100755
--- a/src/resources/parse-sass.sh
+++ b/src/resources/parse-sass.sh
@@ -7,7 +7,7 @@ fi
 
 SASSC_OPT="-M -t compact"
 
-: ${GTK_SOURCE_PATH:="../../../gtk+-3"}
+: ${GTK_SOURCE_PATH:="../../../gtk"}
 
 sassc $SASSC_OPT -I${GTK_SOURCE_PATH}/gtk/theme/Adwaita \
        themes/Adwaita.scss themes/Adwaita.css
diff --git a/src/resources/themes/Adwaita-dark.css b/src/resources/themes/Adwaita-dark.css
index cce8e8577..66f8d6c81 100644
--- a/src/resources/themes/Adwaita-dark.css
+++ b/src/resources/themes/Adwaita-dark.css
@@ -239,3 +239,5 @@ window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked {
 window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked:hover { background-color: 
rgba(53, 53, 53, 0.7); }
 
 window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):backdrop:checked { border-color: 
#202020; background-color: #353535; }
+
+.search-entry-occurrences-tag { background-color: @theme_base_color; background-image: none; color: 
shade(@theme_unfocused_fg_color, 0.8); border: 0px; margin: 2px; padding: 2px; }
diff --git a/src/resources/themes/Adwaita.css b/src/resources/themes/Adwaita.css
index d5e8908f4..8eda3d2c4 100644
--- a/src/resources/themes/Adwaita.css
+++ b/src/resources/themes/Adwaita.css
@@ -240,4 +240,4 @@ window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):checked:ho
 
 window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page):backdrop:checked { border-color: 
#d5d0cc; background-color: #f6f5f4; }
 
-.search-entry-occurrences-tag { background-color: @theme_base_color; background-image: none; color: shade 
(@theme_unfocused_fg_color, 0.8); border: 0px; margin: 2px; padding: 2px; }
+.search-entry-occurrences-tag { background-color: @theme_base_color; background-image: none; color: 
shade(@theme_unfocused_fg_color, 0.8); border: 0px; margin: 2px; padding: 2px; }
diff --git a/src/resources/themes/_Adwaita-base.scss b/src/resources/themes/_Adwaita-base.scss
index 909536c52..05743848d 100644
--- a/src/resources/themes/_Adwaita-base.scss
+++ b/src/resources/themes/_Adwaita-base.scss
@@ -339,5 +339,11 @@ window:not(.incognito-mode) .main-notebook tab:not(.reorderable-page) {
 }
 
 
-.search-entry-occurrences-tag { background-color: themecolor(theme_base_color); background-image: none; 
color: shade (themecolor(theme_unfocused_fg_color), 0.8); border: 0px; margin: 2px; padding: 2px; }
-
+.search-entry-occurrences-tag {
+  background-color: themecolor(theme_base_color);
+  background-image: none;
+  color: shade(themecolor(theme_unfocused_fg_color), 0.8);
+  border: 0px;
+  margin: 2px;
+  padding: 2px;
+}