diff --git a/src/public/app/widgets/search_actions/delete_label.js b/src/public/app/widgets/search_actions/delete_label.js index 0af3bca3a..7141e44e7 100644 --- a/src/public/app/widgets/search_actions/delete_label.js +++ b/src/public/app/widgets/search_actions/delete_label.js @@ -7,16 +7,13 @@ const TPL = ` Delete label: -
-
Label name:
- - -
+ - + `; diff --git a/src/public/app/widgets/search_actions/delete_note.js b/src/public/app/widgets/search_actions/delete_note.js index b4927d09b..9de251a4d 100644 --- a/src/public/app/widgets/search_actions/delete_note.js +++ b/src/public/app/widgets/search_actions/delete_note.js @@ -7,7 +7,7 @@ const TPL = ` Delete matched note - + `; diff --git a/src/public/app/widgets/search_actions/delete_relation.js b/src/public/app/widgets/search_actions/delete_relation.js index 5176633c8..eb60bae35 100644 --- a/src/public/app/widgets/search_actions/delete_relation.js +++ b/src/public/app/widgets/search_actions/delete_relation.js @@ -8,15 +8,14 @@ const TPL = `
-
Relation name:
-
- + `; diff --git a/src/public/app/widgets/search_actions/execute_script.js b/src/public/app/widgets/search_actions/execute_script.js index f340c2334..e7140dbd0 100644 --- a/src/public/app/widgets/search_actions/execute_script.js +++ b/src/public/app/widgets/search_actions/execute_script.js @@ -7,15 +7,11 @@ const TPL = ` Execute script: -
-
Script:
- - -
+ - + `; diff --git a/src/public/app/widgets/search_actions/rename_label.js b/src/public/app/widgets/search_actions/rename_label.js index bd3c958c5..9ab6930de 100644 --- a/src/public/app/widgets/search_actions/rename_label.js +++ b/src/public/app/widgets/search_actions/rename_label.js @@ -3,13 +3,10 @@ import AbstractSearchAction from "./abstract_search_action.js"; const TPL = ` - - Rename label: - - +
-
From:
+
Rename label from:
- + `; diff --git a/src/public/app/widgets/search_actions/rename_relation.js b/src/public/app/widgets/search_actions/rename_relation.js index 13795a4b5..152d996a3 100644 --- a/src/public/app/widgets/search_actions/rename_relation.js +++ b/src/public/app/widgets/search_actions/rename_relation.js @@ -3,13 +3,10 @@ import AbstractSearchAction from "./abstract_search_action.js"; const TPL = ` - - Rename relation: - - +
-
From:
+
Rename relation from:
- + `; diff --git a/src/public/app/widgets/search_actions/set_label_value.js b/src/public/app/widgets/search_actions/set_label_value.js index 63215673e..0c04a0472 100644 --- a/src/public/app/widgets/search_actions/set_label_value.js +++ b/src/public/app/widgets/search_actions/set_label_value.js @@ -3,10 +3,7 @@ import AbstractSearchAction from "./abstract_search_action.js"; const TPL = ` - - Set label value: - - +
Set label
@@ -23,7 +20,7 @@ const TPL = `
- + `; diff --git a/src/public/app/widgets/search_actions/set_relation_target.js b/src/public/app/widgets/search_actions/set_relation_target.js index cb3d8ef7c..d80b6d8ae 100644 --- a/src/public/app/widgets/search_actions/set_relation_target.js +++ b/src/public/app/widgets/search_actions/set_relation_target.js @@ -4,10 +4,7 @@ import noteAutocompleteService from "../../services/note_autocomplete.js"; const TPL = ` - - Set relation target note: - - +
Set relation
@@ -23,7 +20,7 @@ const TPL = `
- + `; diff --git a/src/public/app/widgets/search_definition.js b/src/public/app/widgets/search_definition.js index cc8821f05..778dbd470 100644 --- a/src/public/app/widgets/search_definition.js +++ b/src/public/app/widgets/search_definition.js @@ -30,6 +30,23 @@ const TPL = ` border-spacing: 10px; } + .search-setting-table .button-column { + /* minimal width so that table remains static sized and most space remains for middle column with settings */ + width: 50px; + white-space: nowrap; + text-align: right; + } + + .search-setting-table .title-column { + /* minimal width so that table remains static sized and most space remains for middle column with settings */ + width: 50px; + white-space: nowrap; + } + + .search-setting-table .button-column .dropdown-menu { + white-space: normal; + } + .attribute-list hr { height: 1px; border-color: var(--main-border-color); @@ -47,7 +64,7 @@ const TPL = `
- + - + - `; diff --git a/src/public/app/widgets/search_options/fast_search.js b/src/public/app/widgets/search_options/fast_search.js index f57160117..6f42f758f 100644 --- a/src/public/app/widgets/search_options/fast_search.js +++ b/src/public/app/widgets/search_options/fast_search.js @@ -7,7 +7,7 @@ const TPL = ` Fast search - `; diff --git a/src/public/app/widgets/search_options/include_archived_notes.js b/src/public/app/widgets/search_options/include_archived_notes.js index 746aae56b..a5a0fbe7d 100644 --- a/src/public/app/widgets/search_options/include_archived_notes.js +++ b/src/public/app/widgets/search_options/include_archived_notes.js @@ -7,7 +7,7 @@ const TPL = ` Include archived notes - `; diff --git a/src/public/app/widgets/search_options/order_by.js b/src/public/app/widgets/search_options/order_by.js index 06b1fe9c0..484d272fc 100644 --- a/src/public/app/widgets/search_options/order_by.js +++ b/src/public/app/widgets/search_options/order_by.js @@ -2,7 +2,7 @@ import AbstractSearchOption from "./abstract_search_option.js"; const TPL = ` - - `; diff --git a/src/public/app/widgets/search_options/search_string.js b/src/public/app/widgets/search_options/search_string.js index df4f5d119..d40908c54 100644 --- a/src/public/app/widgets/search_options/search_string.js +++ b/src/public/app/widgets/search_options/search_string.js @@ -5,15 +5,13 @@ import server from "../../services/server.js"; const TPL = ` - + -
Add search option:Add search option:
- Ancestor: + Ancestor: +
+
+
+
+ Order by @@ -23,7 +23,7 @@ const TPL = ` +
Search string:Search string: +