Skip to content

Commit 2d5184b

Browse files
committed
Tweaks for various places where the track table appears so that the autosizer can expand it to full size
1 parent 94e776b commit 2d5184b

File tree

7 files changed

+22
-21
lines changed

7 files changed

+22
-21
lines changed

packages/app/app/components/Dashboard/ChartsTab/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const ChartsTab: React.FC<ChartsTabProps> = ({
2626
}) => {
2727
const { t } = useTranslation('dashboard');
2828
return (
29-
<Tab.Pane attached={false}>
29+
<Tab.Pane attached={false} className={styles.popular_tracks_tab}>
3030
<div
3131
className={styles.popular_tracks_container}
3232
>

packages/app/app/components/Dashboard/ChartsTab/styles.scss

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
@import "../../../vars";
22

3+
.active.tab.popular_tracks_tab {
4+
display: flex;
5+
flex-flow: column;
6+
flex: 1 1 auto;
7+
}
8+
39
.popular_tracks_container {
10+
flex: 1 1 auto;
11+
412
.popular_tracks_header {
513
display: flex;
614
flex-flow: row;

packages/app/app/components/Dashboard/styles.scss

+2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
.dashboard_tabs {
66
position: relative;
77
height: 100%;
8+
display: flex;
9+
flex-flow: column;
810
}
911
}

packages/app/app/components/FavoriteTracksView/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const FavoriteTracksView: React.FC<FavoriteTracksViewProps> = ({
5959
/>
6060
}/>
6161
</Header>
62-
<Segment>
62+
<Segment className={styles.favorite_tracks_segment}>
6363
<TrackTableContainer
6464
tracks={tracks}
6565
onDelete={removeFavoriteTrack}

packages/app/app/components/FavoriteTracksView/styles.scss

+4-17
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,15 @@
1010
@include emptyState;
1111
}
1212

13+
.favorite_tracks_segment {
14+
flex: 1 1 auto;
15+
}
16+
1317
.header_container {
1418
display: flex;
1519
justify-content: space-between;
1620
}
1721

18-
.button_container {
19-
padding-top: 1rem;
20-
margin-left: 1rem;
21-
a {
22-
padding: 0.375rem 2.5rem;
23-
}
24-
}
25-
26-
.play_button {
27-
background: $pink;
28-
color: $white;
29-
border-radius: 1.5rem;
30-
text-transform: uppercase;
31-
display: inline-block;
32-
margin: auto;
33-
}
34-
3522
.tracks_container {
3623
overflow: auto;
3724
}

packages/app/app/components/TagView/TagTopTracks/styles.scss

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
display: flex;
66
flex-flow: column;
77
width: 100%;
8+
height: 510px;
89

910
.track {
1011
transition: $short-duration;
@@ -22,6 +23,10 @@
2223
max-width: 50%;
2324
}
2425

26+
.track_table_wrapper {
27+
margin-right: 1em;
28+
}
29+
2530
table {
2631
width: 100%;
2732
}

packages/ui/lib/components/TrackTable/HistoryTable.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import TrackTable, { TrackTableProps } from '.';
55
import { Track } from '../../types';
66
import DateCell from './Cells/DateCell';
77
import { TrackTableColumn } from './types';
8-
import { GridTrackTable } from '../GridTrackTable';
98
import { Column } from 'react-table';
109
import { TextHeader } from '../GridTrackTable/Headers/TextHeader';
1110

@@ -26,7 +25,7 @@ const HistoryTable: React.FC<HistoryTableProps> = ({ tracks, dateHeader, ...prop
2625
columnnWidth: '3em'
2726
} as Column<HistoryTableTrack>], []);
2827

29-
return <GridTrackTable
28+
return <TrackTable
3029
className={styles.history_table}
3130
tracks={tracks}
3231
customColumns={customColumns}

0 commit comments

Comments
 (0)