Web console: clean up styling imports (#10410)
* fix styling for importing
* fix quotes
diff --git a/web-console/src/blueprint-overrides/_index.scss b/web-console/src/blueprint-overrides/_index.scss
new file mode 100644
index 0000000..0c058ce
--- /dev/null
+++ b/web-console/src/blueprint-overrides/_index.scss
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import 'common/colors';
diff --git a/web-console/src/blueprint-overrides/common/_colors.scss b/web-console/src/blueprint-overrides/common/_colors.scss
new file mode 100644
index 0000000..92e532c
--- /dev/null
+++ b/web-console/src/blueprint-overrides/common/_colors.scss
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+$blue1: #0e5a8a;
+$blue2: #106ba3;
+$blue3: #137cbe; // Changed as a proof of concept
+$blue4: #2b95d6;
+$blue5: #48aff0;
diff --git a/web-console/src/components/auto-form/auto-form.scss b/web-console/src/components/auto-form/auto-form.scss
index a5b4ca2..898f9b1 100644
--- a/web-console/src/components/auto-form/auto-form.scss
+++ b/web-console/src/components/auto-form/auto-form.scss
@@ -17,8 +17,8 @@
*/
.auto-form {
- .ace_scroller {
- background-color: #212c36;
+ .ace-solarized-dark {
+ background-color: #212e37;
}
// Popover in info label
diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
index df604f2..7ee469b 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
@@ -33,7 +33,7 @@
margin-bottom: 5px;
}
- .ace_scroller {
+ .ace-solarized-dark {
background-color: #232c35;
}
diff --git a/web-console/src/dialogs/spec-dialog/spec-dialog.scss b/web-console/src/dialogs/spec-dialog/spec-dialog.scss
index cb1acb3..17d4cff 100644
--- a/web-console/src/dialogs/spec-dialog/spec-dialog.scss
+++ b/web-console/src/dialogs/spec-dialog/spec-dialog.scss
@@ -26,7 +26,7 @@
background-color: #232c35;
margin-bottom: 10px;
- .ace_gutter {
+ .ace-solarized-dark {
background-color: #232c35;
}
}
diff --git a/web-console/src/entry.scss b/web-console/src/entry.scss
index 0fddfa6..d2a088c 100644
--- a/web-console/src/entry.scss
+++ b/web-console/src/entry.scss
@@ -17,8 +17,9 @@
*/
@import '../node_modules/normalize.css/normalize';
-@import '../node_modules/@blueprintjs/core/lib/css/blueprint';
-@import '../node_modules/@blueprintjs/datetime/lib/css/blueprint-datetime';
+@import './blueprint-overrides';
+@import '~@blueprintjs/core/src/blueprint';
+@import '~@blueprintjs/datetime/src/blueprint-datetime';
@import '../lib/react-table';
@import '../node_modules/react-splitter-layout/lib/index.css';
diff --git a/web-console/src/views/load-data-view/load-data-view.scss b/web-console/src/views/load-data-view/load-data-view.scss
index 3d972c3..9e4c988 100644
--- a/web-console/src/views/load-data-view/load-data-view.scss
+++ b/web-console/src/views/load-data-view/load-data-view.scss
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+@import '~@blueprintjs/core/src/common/colors';
@import '../../variables';
.load-data-view {
@@ -258,7 +259,7 @@
}
.edit-controls {
- background: #30404c;
+ background: rgba($gray3, 0.15);
padding: 10px;
border-radius: 2px;
margin-bottom: 15px;
@@ -283,4 +284,8 @@
width: 100%;
height: 100% !important;
}
+
+ .ace-solarized-dark {
+ background-color: #232c35;
+ }
}
diff --git a/web-console/src/views/query-view/query-input/query-input.scss b/web-console/src/views/query-view/query-input/query-input.scss
index bd67bcc..5777509 100644
--- a/web-console/src/views/query-view/query-input/query-input.scss
+++ b/web-console/src/views/query-view/query-input/query-input.scss
@@ -24,7 +24,7 @@
width: 100%;
height: 100%;
- .ace_scroller {
+ .ace-solarized-dark {
background-color: #232c35;
}
