From 2d8f8f04b3808d601e76a4f3dba8a8f98496dc3e Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Fri, 11 Mar 2022 09:33:59 +0000 Subject: [PATCH] Improve CodeMirror 6 search form (#6943) GitOrigin-RevId: c23ee425f8114aaf2b1669e086e501e348751431 --- .../web/frontend/extracted-translations.json | 2 ++ .../frontend/stylesheets/core/css-variables.less | 16 ++++++++++++++++ services/web/frontend/stylesheets/style.less | 1 + services/web/locales/en.json | 9 +++++---- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 services/web/frontend/stylesheets/core/css-variables.less diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 1de26965ef..54f649444e 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -235,6 +235,7 @@ "no_search_results": "", "no_symbols_found": "", "normal": "", + "of": "", "off": "", "official": "", "ok": "", @@ -310,6 +311,7 @@ "search_all": "", "search_bib_files": "", "search_close": "", + "search_command_all": "", "search_command_find": "", "search_command_go": "", "search_command_go_to_line": "", diff --git a/services/web/frontend/stylesheets/core/css-variables.less b/services/web/frontend/stylesheets/core/css-variables.less new file mode 100644 index 0000000000..9acfd56d1e --- /dev/null +++ b/services/web/frontend/stylesheets/core/css-variables.less @@ -0,0 +1,16 @@ +:root { + --ol-blue: @ol-blue; + + --ol-blue-gray-0: @ol-blue-gray-0; + --ol-blue-gray-1: @ol-blue-gray-1; + --ol-blue-gray-2: @ol-blue-gray-2; + --ol-blue-gray-3: @ol-blue-gray-3; + --ol-blue-gray-4: @ol-blue-gray-4; + --ol-blue-gray-5: @ol-blue-gray-5; + --ol-blue-gray-6: @ol-blue-gray-6; + + --input-color: @input-color; + --input-border: @input-border; + --input-border-radius: @input-border-radius; + --input-border-focus: @input-border-focus; +} diff --git a/services/web/frontend/stylesheets/style.less b/services/web/frontend/stylesheets/style.less index 453129f9b6..344fc67c7f 100644 --- a/services/web/frontend/stylesheets/style.less +++ b/services/web/frontend/stylesheets/style.less @@ -8,6 +8,7 @@ // Core variables and mixins @import 'core/variables.less'; +@import 'core/css-variables.less'; @import 'app/ol-style-guide.less'; @import '_style_includes.less'; @import '_ol_style_includes.less'; diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 8d175e60e3..6cc209bbed 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1591,14 +1591,15 @@ "search_command_go": "Go", "search_command_go_to_line": "Go to line", "search_command_replace": "Replace", + "search_command_all": "All", "search_current_match": "current match", - "search_match_case": "match case", + "search_match_case": "Match case", "search_next": "next", "search_on_line": "on line", "search_previous": "previous", - "search_regexp": "regexp", - "search_replace": "replace", - "search_replace_all": "replace all", + "search_regexp": "Regular expression", + "search_replace": "Replace", + "search_replace_all": "Replace All", "go_to_account_settings": "Go to Account Settings", "keep_your_account_safe": "Keep your account safe", "primary_email_check_question": "Is <0>__email__ still your email address?",