Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New filtering experience UI enhancements #4296

Merged
merged 16 commits into from
May 12, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
styling improvements, stateful AND operator component
samwinslow committed May 11, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 2d95e25c81a049bf56f83a69f7d2895c89a3abb5
Original file line number Diff line number Diff line change
@@ -19,5 +19,9 @@

.filter-dropdown-container {
min-width: 6em;

.ant-btn {
width: 100%;
}
}
}
Original file line number Diff line number Diff line change
@@ -207,8 +207,16 @@ export function UnifiedPropertyFilter({ index, onComplete, logic }: PropertyFilt
<Row gutter={8} wrap={isSmallScreen} className="property-filter-row">
{key && (
<Col className="filter-where">
<span className="arrow">&#8627;</span>
{index === 0 ? 'where' : 'and'}
{index === 0 ? (
<>
<span className="arrow">&#8627;</span>
where
</>
) : (
<span className="stateful-badge and" style={{ marginLeft: 28, fontSize: '90%' }}>
AND
</span>
)}
</Col>
)}
<Col className="filter-dropdown-container">
@@ -269,6 +277,7 @@ export function UnifiedPropertyFilter({ index, onComplete, logic }: PropertyFilt
style: {
maxWidth: isSmallScreen ? 'unset' : '60%',
minWidth: '11em',
flexShrink: 3,
},
},
]}
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ export function InsightDisplayConfig({
horizontalUI,
...props
}: InsightDisplayConfigProps & { horizontalUI: boolean }): JSX.Element {
return horizontalUI && props.activeView !== ViewType.FUNNELS ? (
return horizontalUI ? (
<HorizontalDefaultInsightDisplayConfig {...props} />
) : (
<DefaultInsightDisplayConfig {...props} />