From 13b44ef1b1daa896bc30e4e8670378e52664951a Mon Sep 17 00:00:00 2001 From: Vikas Shukla Date: Wed, 16 Sep 2020 22:50:35 -0700 Subject: [PATCH] changes order of filtering to alphabetical --- src/Timeline.css | 6 +++-- src/Timeline.js | 60 ++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/Timeline.css b/src/Timeline.css index d261461..5949e2b 100644 --- a/src/Timeline.css +++ b/src/Timeline.css @@ -45,10 +45,12 @@ .filterDiv { overflow: hidden; overflow-y: scroll; - height: 100%; + height: 90%; } - .timelineModalDiv:hover { + .timelineModalDiv { + position: fixed; overflow-y: scroll; + height: 90%; } } diff --git a/src/Timeline.js b/src/Timeline.js index 81abde5..6d90602 100644 --- a/src/Timeline.js +++ b/src/Timeline.js @@ -31,24 +31,24 @@ import './Timeline.css'; export default () => { const allCompanies = [ - 'Facebook', - 'Google', + 'Adobe', 'Amazon', 'Apple', - 'Netflix', - 'Uber', + 'Cisco', + 'Facebook', + 'Google', 'HP', - 'Palantir', - 'Twitter', + 'IBM', + 'Intel', + 'Microsoft', + 'Netflix', 'Oracle', + 'Palantir', 'Paypal', - 'Microsoft', 'Salesforce', - 'Adobe', - 'IBM', - 'Intel', 'Spotify', - 'Cisco', + 'Twitter', + 'Uber', ]; const allYears = [ '2009', @@ -65,38 +65,38 @@ export default () => { 'Ongoing', ]; const allCountries = [ - 'Internet', - 'France', - 'Germany', - 'USA', - 'China', - 'Worldwide', 'Afghanistan', - 'UK', 'Belgium', + 'China', 'France', - 'Qatar', - 'Palestine', - 'India', + 'France', + 'Germany', 'Ghana', + 'India', + 'Internet', 'Israel', + 'Palestine', + 'Qatar', + 'UK', + 'USA', + 'Worldwide', ]; const allProtests = [ + 'Class Action Lawsuit', + 'Company Policy', 'Consumer Outrage', + 'Discrimination', + 'Environmental Cause', 'Ethics', + 'Forced Arbitration', + 'Foreign Working Conditions', + 'Job Security', 'Labor/Wage', - 'Tax Evasion', - 'Discrimination', - 'Class Action Lawsuit', + 'Public Resignation', 'Sexual Harassment', - 'Forced Arbitration', - 'Company Policy', 'Sexual Harassment', - 'Job Security', + 'Tax Evasion', 'Tech Presence', - 'Public Resignation', - 'Foreign Working Conditions', - 'Environmental Cause', 'Other', ]; const [cardId, setCardId] = useState(0);