Skip to content

Commit 5cc047b

Browse files
authored
Merge pull request #157 from jahn96/sticky
Last fixes
2 parents 4cf33fc + 11e5921 commit 5cc047b

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

src/components/Onboarding/ColumnSelectorSidebar.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,16 @@ export default function ColumnSelectorSidebar(props: { plotArgs: Args }) {
247247
<span style={{ padding: '0px 5px', fontSize: 12 }}>
248248
{column}
249249
</span>
250-
<button
251-
className={`tagButton_${column}`}
252-
onClick={() => handleDelete(column)}
253-
>
254-
<X size={10} />
255-
</button>
250+
{preSelectedColumns.has(column) ? (
251+
<Lock size={15} />
252+
) : (
253+
<button
254+
className={`tagButton_${column}`}
255+
onClick={() => handleDelete(column)}
256+
>
257+
<X size={10} />
258+
</button>
259+
)}
256260
</div>
257261
</Pill>
258262
);

src/components/Sidebar/Tabs/EditTab.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,10 @@ export default function EditTab({
528528
{chartIcons.map(({ icon: Icon, mark }) => {
529529
return (
530530
<li key={mark}>
531-
<Tooltip message={mark} position="top">
531+
<Tooltip
532+
message={mark}
533+
position={mark === 'errorbar' ? 'left' : 'top'}
534+
>
532535
<button
533536
className={mark === graphMark ? 'active' : ''}
534537
onClick={() => handleClickOnMark(mark)}

src/components/Sidebar/Tabs/FilterScreen.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ const screenCss = (theme: BifrostTheme) => css`
1919
top: 0;
2020
background-color: ${theme.color.background[0]};
2121
width: 100%;
22-
height: 100%;
2322
padding: 15px;
2423
2524
.filter-nav {
2625
display: flex;
2726
justify-content: space-between;
2827
align-items: center;
2928
margin-bottom: 15px;
29+
position: sticky;
30+
top: 0;
31+
background-color: ${theme.color.background[0]};
32+
z-index: 1;
3033
}
3134
nav {
3235
padding-bottom: 5px;

src/components/ui-widgets/Slider.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default function RangeSlider({
4141
className="RangeSlider"
4242
css={css`
4343
width: 100%;
44-
padding: 12px;
44+
padding: 12px 20px;
4545
width: ${width}px;
4646
`}
4747
>
@@ -102,7 +102,7 @@ function Tooltip(props: TooltipProps) {
102102
const tooltipCss = css`
103103
left: ${props.percent}%;
104104
position: absolute;
105-
margin-left: -11px;
105+
margin-left: -25px;
106106
margin-top: -35px;
107107
padding: 10px;
108108
`;

0 commit comments

Comments
 (0)