diff --git a/docs/en_US/images/editgrid.png b/docs/en_US/images/editgrid.png index 77e7047d5..5781f23c2 100644 Binary files a/docs/en_US/images/editgrid.png and b/docs/en_US/images/editgrid.png differ diff --git a/docs/en_US/images/geometry_viewer.png b/docs/en_US/images/geometry_viewer.png index 733b921a7..f996ebc76 100644 Binary files a/docs/en_US/images/geometry_viewer.png and b/docs/en_US/images/geometry_viewer.png differ diff --git a/docs/en_US/images/geometry_viewer_property_table.png b/docs/en_US/images/geometry_viewer_property_table.png index 254186e4f..ac38419e4 100644 Binary files a/docs/en_US/images/geometry_viewer_property_table.png and b/docs/en_US/images/geometry_viewer_property_table.png differ diff --git a/docs/en_US/images/main_left_pane.png b/docs/en_US/images/main_left_pane.png old mode 100755 new mode 100644 index 820ed0bdc..3b59753f8 Binary files a/docs/en_US/images/main_left_pane.png and b/docs/en_US/images/main_left_pane.png differ diff --git a/docs/en_US/images/main_query_tool.png b/docs/en_US/images/main_query_tool.png index 8905dcf12..fbd08a3cd 100755 Binary files a/docs/en_US/images/main_query_tool.png and b/docs/en_US/images/main_query_tool.png differ diff --git a/docs/en_US/images/query_autocomplete.png b/docs/en_US/images/query_autocomplete.png index c01aa4b6d..d61e1b3e4 100755 Binary files a/docs/en_US/images/query_autocomplete.png and b/docs/en_US/images/query_autocomplete.png differ diff --git a/docs/en_US/images/query_execute_section.png b/docs/en_US/images/query_execute_section.png index 1dfb8b557..abd869fde 100755 Binary files a/docs/en_US/images/query_execute_section.png and b/docs/en_US/images/query_execute_section.png differ diff --git a/docs/en_US/images/query_explain_analyze_statistics.png b/docs/en_US/images/query_explain_analyze_statistics.png index 3baf39d2e..eb7fce4a0 100644 Binary files a/docs/en_US/images/query_explain_analyze_statistics.png and b/docs/en_US/images/query_explain_analyze_statistics.png differ diff --git a/docs/en_US/images/query_explain_analyze_table.png b/docs/en_US/images/query_explain_analyze_table.png index b7569b650..fabbc582b 100644 Binary files a/docs/en_US/images/query_explain_analyze_table.png and b/docs/en_US/images/query_explain_analyze_table.png differ diff --git a/docs/en_US/images/query_output_data.png b/docs/en_US/images/query_output_data.png index 6f6f0dc11..8bd89a6c9 100644 Binary files a/docs/en_US/images/query_output_data.png and b/docs/en_US/images/query_output_data.png differ diff --git a/docs/en_US/images/query_output_error.png b/docs/en_US/images/query_output_error.png index a1b20b22e..b02b26269 100755 Binary files a/docs/en_US/images/query_output_error.png and b/docs/en_US/images/query_output_error.png differ diff --git a/docs/en_US/images/query_output_explain_details.png b/docs/en_US/images/query_output_explain_details.png index 8e99dbf14..d93954113 100644 Binary files a/docs/en_US/images/query_output_explain_details.png and b/docs/en_US/images/query_output_explain_details.png differ diff --git a/docs/en_US/images/query_output_history.png b/docs/en_US/images/query_output_history.png index 287aa63b9..75acd62fc 100644 Binary files a/docs/en_US/images/query_output_history.png and b/docs/en_US/images/query_output_history.png differ diff --git a/docs/en_US/images/query_output_messages.png b/docs/en_US/images/query_output_messages.png index c733c2eb1..f08cceabf 100755 Binary files a/docs/en_US/images/query_output_messages.png and b/docs/en_US/images/query_output_messages.png differ diff --git a/docs/en_US/images/query_sql_editor.png b/docs/en_US/images/query_sql_editor.png index 2d47113c3..9101b7916 100755 Binary files a/docs/en_US/images/query_sql_editor.png and b/docs/en_US/images/query_sql_editor.png differ diff --git a/docs/en_US/images/query_tool.png b/docs/en_US/images/query_tool.png index 6f6f0dc11..410bf4011 100644 Binary files a/docs/en_US/images/query_tool.png and b/docs/en_US/images/query_tool.png differ diff --git a/docs/en_US/images/query_tool_editable_columns.png b/docs/en_US/images/query_tool_editable_columns.png index 922c0280f..305511b4a 100644 Binary files a/docs/en_US/images/query_tool_editable_columns.png and b/docs/en_US/images/query_tool_editable_columns.png differ diff --git a/docs/en_US/images/query_tool_message.png b/docs/en_US/images/query_tool_message.png index ed41320cc..5d521dd72 100755 Binary files a/docs/en_US/images/query_tool_message.png and b/docs/en_US/images/query_tool_message.png differ diff --git a/docs/en_US/images/query_toolbar.png b/docs/en_US/images/query_toolbar.png index b87c0d72b..a7dfe794d 100644 Binary files a/docs/en_US/images/query_toolbar.png and b/docs/en_US/images/query_toolbar.png differ diff --git a/docs/en_US/images/query_toolbar_explain.png b/docs/en_US/images/query_toolbar_explain.png index ed4a2190a..ef9072a93 100644 Binary files a/docs/en_US/images/query_toolbar_explain.png and b/docs/en_US/images/query_toolbar_explain.png differ diff --git a/docs/en_US/images/toolbar.png b/docs/en_US/images/toolbar.png index e7d54dd06..19c4c574a 100644 Binary files a/docs/en_US/images/toolbar.png and b/docs/en_US/images/toolbar.png differ diff --git a/docs/en_US/release_notes_4_16.rst b/docs/en_US/release_notes_4_16.rst index 3135b42d4..021ad831a 100644 --- a/docs/en_US/release_notes_4_16.rst +++ b/docs/en_US/release_notes_4_16.rst @@ -15,6 +15,7 @@ New features | `Issue #4772 `_ - Added aria-label to provide an invisible label where a visible label cannot be used. | `Issue #4773 `_ - Added role="status" attribute to all the status messages for accessibility. | `Issue #4944 `_ - Allow Gunicorn logs in the container to be directed to a file specified through GUNICORN_ACCESS_LOGFILE. +| `Issue #4990 `_ - Changed the open query tool and data filter icons. Housekeeping ************ diff --git a/web/pgadmin/browser/static/css/browser.css b/web/pgadmin/browser/static/css/browser.css index 57295ee76..cc32c35d3 100644 --- a/web/pgadmin/browser/static/css/browser.css +++ b/web/pgadmin/browser/static/css/browser.css @@ -52,3 +52,11 @@ font-icon: url('../img/drop_cascade.svg'); font-size: 1.6em !important; } + +.icon-filter-table-toolbar:before { + font-icon: url('../img/row_filter.svg'); +} + +.icon-query-tool:before { + font-icon: url('../img/query_tool.svg'); +} diff --git a/web/pgadmin/browser/static/img/query_tool.svg b/web/pgadmin/browser/static/img/query_tool.svg new file mode 100644 index 000000000..88bf37f56 --- /dev/null +++ b/web/pgadmin/browser/static/img/query_tool.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/web/pgadmin/browser/static/img/row_filter.svg b/web/pgadmin/browser/static/img/row_filter.svg new file mode 100644 index 000000000..4d6d09361 --- /dev/null +++ b/web/pgadmin/browser/static/img/row_filter.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index 96e793079..65b61238c 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -57,7 +57,7 @@ define([ name: 'show_query_tool', node: this.type, module: this, applies: ['context'], callback: 'show_query_tool', priority: 998, label: gettext('Query Tool...'), - icon: 'fa fa-bolt', + icon: 'pg-font-icon icon-query-tool', }]); } } diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index c3d6ac04a..28e01dc69 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -185,7 +185,7 @@ define('pgadmin.browser.node', [ callback: 'show_query_tool', priority: 998, label: gettext('Query Tool...'), - icon: 'fa fa-bolt', + icon: 'pg-font-icon icon-query-tool', enable: function(itemData) { if (itemData._type == 'database' && itemData.allowConn) return true; diff --git a/web/pgadmin/browser/static/js/toolbar.js b/web/pgadmin/browser/static/js/toolbar.js index f491bfdbc..75653ad57 100644 --- a/web/pgadmin/browser/static/js/toolbar.js +++ b/web/pgadmin/browser/static/js/toolbar.js @@ -18,7 +18,7 @@ let _browserPanel = null; let _defaultToolBarButtons = [ { label: gettext('Filtered Rows'), - btnClass: 'fa fa-filter', + btnClass: 'pg-font-icon icon-filter-table-toolbar', text: '', toggled: false, toggleClass: '', @@ -36,7 +36,7 @@ let _defaultToolBarButtons = [ }, { label: gettext('Query Tool'), - btnClass: 'fa fa-bolt', + btnClass: 'pg-font-icon icon-query-tool', text: '', toggled: false, toggleClass: '', diff --git a/web/pgadmin/browser/static/scss/_browser.scss b/web/pgadmin/browser/static/scss/_browser.scss index 9ea1ecc5e..0d1573848 100644 --- a/web/pgadmin/browser/static/scss/_browser.scss +++ b/web/pgadmin/browser/static/scss/_browser.scss @@ -51,4 +51,5 @@ samp, margin-left: 0.25rem; border-style: solid; border-width: 1px; + font-size: 1.15em; } diff --git a/web/pgadmin/static/js/sqleditor/history/query_sources.js b/web/pgadmin/static/js/sqleditor/history/query_sources.js index a115fa37f..c96f572df 100644 --- a/web/pgadmin/static/js/sqleditor/history/query_sources.js +++ b/web/pgadmin/static/js/sqleditor/history/query_sources.js @@ -12,7 +12,7 @@ export const QuerySources = { EXECUTE: { - ICON_CSS_CLASS: 'fa fa-bolt', + ICON_CSS_CLASS: 'fa fa-play', }, EXPLAIN: { ICON_CSS_CLASS: 'fa fa-hand-pointer-o', diff --git a/web/pgadmin/static/scss/_webcabin.pgadmin.scss b/web/pgadmin/static/scss/_webcabin.pgadmin.scss index 7a7dd658d..e7cea6e01 100644 --- a/web/pgadmin/static/scss/_webcabin.pgadmin.scss +++ b/web/pgadmin/static/scss/_webcabin.pgadmin.scss @@ -170,7 +170,7 @@ background-position: center; padding: 0px 10px; - &.fa{ + &.fa, &.pg-font-icon{ padding: 0rem 0.25rem 0rem 0rem } } diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js index 1df617386..ddac0c812 100644 --- a/web/pgadmin/tools/datagrid/static/js/datagrid.js +++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js @@ -113,7 +113,7 @@ define('pgadmin.datagrid', [ enable: query_tool_menu_enabled, priority: 1, label: gettext('Query Tool'), - icon: 'fa fa-bolt', + icon: 'pg-font-icon icon-query-tool', }]; // Create context menu diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js b/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js index 0672cdd56..d45aca55a 100644 --- a/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js +++ b/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js @@ -49,7 +49,7 @@ export function setQueryToolDockerTitle(panel, is_query_tool, panel_title, is_fi } else { // Query tool titles panel_tooltip = gettext('Query Tool - ') + panel_title; - panel_icon = 'fa fa-bolt'; + panel_icon = 'pg-font-icon icon-query-tool'; } panel.title(''+ _.escape(panel_title) +''); diff --git a/web/regression/feature_utils/locators.py b/web/regression/feature_utils/locators.py index 847e457d3..6947724d3 100644 --- a/web/regression/feature_utils/locators.py +++ b/web/regression/feature_utils/locators.py @@ -13,7 +13,8 @@ class BrowserToolBarLocators(): open_query_tool_button_css = \ ".wcFrameButton[title='Query Tool']:not(.disabled)" - query_tool_panel_css = ".wcPanelTab .wcTabIcon.fa.fa-bolt" + query_tool_panel_css = \ + ".wcPanelTab .wcTabIcon.pg-font-icon.icon-query-tool" view_table_data_button_css = \ ".wcFrameButton[title='View Data']:not(.disabled)" @@ -205,7 +206,7 @@ class QueryToolLocators: commit_icon = "icon-commit" - execute_icon = "fa-bolt" + execute_icon = "fa-play" explain_icon = "fa-hand-pointer-o"