[MERGE] fix conflicts.

4981cc3f · Alexandre Delanoë · 015011ca · e9191d83 · 4981cc3f · 4981cc3f
Commit 4981cc3f authored Nov 18, 2019 by Alexandre Delanoë
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

Login.sass dist/styles/Login.sass +3 -0

SearchField.purs src/Gargantext/Components/Search/SearchField.purs +4 -0

Types.purs src/Gargantext/Components/Search/Types.purs +1 -0

No files found.
--- a/dist/styles/Login.sass
+++ b/dist/styles/Login.sass
@@ -170,3 +170,6 @@ li
 .tab-pane
  .reload-btn
    padding-right: 6px
+
+
+
--- a/src/Gargantext/Components/Search/SearchField.purs
+++ b/src/Gargantext/Components/Search/SearchField.purs
@@ -312,3 +312,7 @@ submitButton node_id (datafield /\ _) (term /\ _) (lang /\ _) (_ /\ setSearch) =
      case term of
        "" -> setSearch $ const Nothing
        _  -> setSearch $ const $ Just {datafield, term, lang, node_id}
+
+
+
+
--- a/src/Gargantext/Components/Search/Types.purs
+++ b/src/Gargantext/Components/Search/Types.purs
@@ -355,3 +355,4 @@ instance encodeJsonSearchQuery :: EncodeJson SearchQuery where
 performSearch :: forall a. DecodeJson a => Session -> SearchQuery -> Aff a
 performSearch session q = post session q q

+