Merge branch 'develop' into release/1.19.0

shenyezh · Jun 17, 2022 · b25e2ad · b25e2ad
2 parents 7a8ec89 + 50cf1f5
commit b25e2ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/frontend/src/Editor/QueryManager/QueryManager.jsx b/frontend/src/Editor/QueryManager/QueryManager.jsx
@@ -494,15 +494,15 @@ let QueryManager = class QueryManager extends React.Component {
                   className={`btn btn-primary ${isUpdating || isCreating ? 'btn-loading' : ''} ${
                     this.state.selectedDataSource ? '' : 'disabled'
                   }`}
-                  style={{ width: '100px', height: '28px' }}
+                  style={{ height: '28px', zIndex: 10 }}
                   onClick={this.createOrUpdateDataQuery}
                   disabled={buttonDisabled}
                 >
                   {this.state.buttonText}
                 </Button>
                 <Dropdown.Toggle
                   split
-                  className="btn btn-primary d-none d-lg-inline"
+                  className="btn btn-primary d-none d-lg-inline create-save-button-dropdown-toggle"
                   style={{ height: '28px', paddingTop: '5px' }}
                 />
                 <Dropdown.Menu className="import-lg-position">

diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
@@ -537,6 +537,14 @@ button {
       border: solid rgba(0, 0, 0, 0.125);
       border-width: 1px 0px 0px 0px;
 
+      .create-save-button-dropdown-toggle {
+        background-color: #4a6ce8;
+      }
+
+      .create-save-button-dropdown-toggle:hover {
+        background-color: #4066f0;
+      }
+
       .table-responsive {
         scrollbar-width: none;
       }