From f37a1db680cb1c341dc26106d5aa91fe4f4c4f92 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Tue, 8 Nov 2016 18:27:14 -0500 Subject: [PATCH 1/3] Add min-height and overflow:scroll to dropdown in validation page --- .../validation/styles/option-selector.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/internal-packages/validation/styles/option-selector.less b/src/internal-packages/validation/styles/option-selector.less index 3db049903d6..0aee95d22b4 100644 --- a/src/internal-packages/validation/styles/option-selector.less +++ b/src/internal-packages/validation/styles/option-selector.less @@ -3,9 +3,13 @@ padding: 0 5px; } - .has-error .option-selector { button.dropdown-toggle { border-color: #843534; } } + +.open > .dropdown-menu { + overflow: scroll; + max-height: 200px; +} \ No newline at end of file From 64649784400f1467b8a62f261ad8045ee6a88350 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 10 Nov 2016 11:03:36 -0500 Subject: [PATCH 2/3] Made header fixed position. Appended margin-top class to data-reactroot divs in all collection tabs --- src/app/home/index.less | 8 ++++++-- .../crud/lib/component/document-list.jsx | 2 +- .../explain/lib/components/compass-explain.jsx | 2 +- src/internal-packages/indexes/lib/component/indexes.jsx | 2 +- src/internal-packages/schema/lib/component/index.jsx | 2 +- .../validation/lib/components/validation.jsx | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/home/index.less b/src/app/home/index.less index 7c37190ba23..afc619f42b1 100644 --- a/src/app/home/index.less +++ b/src/app/home/index.less @@ -62,8 +62,8 @@ .collection-view { header { padding: 12px 0 0; - position: relative; - z-index: 1; + position: fixed; + z-index: 4; background: @pw; .row { margin-left: 0; @@ -94,6 +94,10 @@ } } + .header-margin { + margin-top: 154px; // size of header + } + .column { overflow: auto; height: auto; diff --git a/src/internal-packages/crud/lib/component/document-list.jsx b/src/internal-packages/crud/lib/component/document-list.jsx index fc5a0cba99a..095c4dd0f25 100644 --- a/src/internal-packages/crud/lib/component/document-list.jsx +++ b/src/internal-packages/crud/lib/component/document-list.jsx @@ -236,7 +236,7 @@ class DocumentList extends React.Component { */ render() { return ( -
+
diff --git a/src/internal-packages/explain/lib/components/compass-explain.jsx b/src/internal-packages/explain/lib/components/compass-explain.jsx index 7b69a27cacd..b7643fb6d3f 100644 --- a/src/internal-packages/explain/lib/components/compass-explain.jsx +++ b/src/internal-packages/explain/lib/components/compass-explain.jsx @@ -35,7 +35,7 @@ class CompassExplain extends React.Component { */ render() { return ( -
+
diff --git a/src/internal-packages/indexes/lib/component/indexes.jsx b/src/internal-packages/indexes/lib/component/indexes.jsx index c11786849b1..9cac29b9ab2 100644 --- a/src/internal-packages/indexes/lib/component/indexes.jsx +++ b/src/internal-packages/indexes/lib/component/indexes.jsx @@ -16,7 +16,7 @@ class Indexes extends React.Component { */ render() { return ( -
+
diff --git a/src/internal-packages/schema/lib/component/index.jsx b/src/internal-packages/schema/lib/component/index.jsx index 6aaeaaf2a29..b1708d2527c 100644 --- a/src/internal-packages/schema/lib/component/index.jsx +++ b/src/internal-packages/schema/lib/component/index.jsx @@ -82,7 +82,7 @@ const Schema = React.createClass({ return ; }); return ( -
+
diff --git a/src/internal-packages/validation/lib/components/validation.jsx b/src/internal-packages/validation/lib/components/validation.jsx index c240eae6d65..932f5dcdd08 100644 --- a/src/internal-packages/validation/lib/components/validation.jsx +++ b/src/internal-packages/validation/lib/components/validation.jsx @@ -62,7 +62,7 @@ class Validation extends React.Component { this.props.viewMode : 'JSON'; return ( -
+
Date: Thu, 10 Nov 2016 11:20:58 -0500 Subject: [PATCH 3/3] Revert "Add min-height and overflow:scroll to dropdown in validation page" This reverts commit f37a1db680cb1c341dc26106d5aa91fe4f4c4f92. --- .../validation/styles/option-selector.less | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/internal-packages/validation/styles/option-selector.less b/src/internal-packages/validation/styles/option-selector.less index 0aee95d22b4..3db049903d6 100644 --- a/src/internal-packages/validation/styles/option-selector.less +++ b/src/internal-packages/validation/styles/option-selector.less @@ -3,13 +3,9 @@ padding: 0 5px; } + .has-error .option-selector { button.dropdown-toggle { border-color: #843534; } } - -.open > .dropdown-menu { - overflow: scroll; - max-height: 200px; -} \ No newline at end of file