This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 69fe50a [cosmetic] remove margin-bottom on dropdowns (#6627)
69fe50a is described below
commit 69fe50a5c9f2338535581158aaef69aa4ad9ebda
Author: Maxime Beauchemin <[email protected]>
AuthorDate: Thu Jan 17 22:56:39 2019 -0800
[cosmetic] remove margin-bottom on dropdowns (#6627)
* [cosmetic] remove margin-bottom on dropdowns
react-select components have been added 15px bottom-margin without a
good reason. Other controls like text or checkboxes don't have that,
making Selects look non-standard, add making the control list too
sparse.
My perspective is that all controls should have the same
padding/margins.
* Adding a few licenses
---
superset/assets/src/explore/components/Control.css | 21 +++++++++++++++++++++
superset/assets/src/explore/components/Control.jsx | 2 ++
superset/assets/src/explore/main.css | 3 ---
superset/migrations/versions/8b70aa3d0f87_.py | 16 ++++++++++++++++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/superset/assets/src/explore/components/Control.css
b/superset/assets/src/explore/components/Control.css
new file mode 100644
index 0000000..87b223c
--- /dev/null
+++ b/superset/assets/src/explore/components/Control.css
@@ -0,0 +1,21 @@
+/**
+ * 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.
+ */
+.Control {
+ padding-bottom: 4px;
+}
diff --git a/superset/assets/src/explore/components/Control.jsx
b/superset/assets/src/explore/components/Control.jsx
index 58876ac..31942e9 100644
--- a/superset/assets/src/explore/components/Control.jsx
+++ b/superset/assets/src/explore/components/Control.jsx
@@ -19,6 +19,7 @@
import React from 'react';
import PropTypes from 'prop-types';
+import './Control.css';
import controlMap from './controls';
const controlTypes = Object.keys(controlMap);
@@ -106,6 +107,7 @@ export default class Control extends React.PureComponent {
const divStyle = this.props.hidden ? { display: 'none' } : null;
return (
<div
+ className="Control"
data-test={this.props.name}
style={divStyle}
onMouseEnter={this.setHover.bind(this, true)}
diff --git a/superset/assets/src/explore/main.css
b/superset/assets/src/explore/main.css
index 8f277a8..118b796 100644
--- a/superset/assets/src/explore/main.css
+++ b/superset/assets/src/explore/main.css
@@ -235,6 +235,3 @@ h2.section-header {
padding-bottom: 5px;
}
-.Select {
- margin-bottom: 15px;
-}
diff --git a/superset/migrations/versions/8b70aa3d0f87_.py
b/superset/migrations/versions/8b70aa3d0f87_.py
index 9368e60..044102e 100644
--- a/superset/migrations/versions/8b70aa3d0f87_.py
+++ b/superset/migrations/versions/8b70aa3d0f87_.py
@@ -1,3 +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.
"""empty message
Revision ID: 8b70aa3d0f87
