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.

Sign up for GitHub

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

Alternative to country list scroll #195

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Alternative to country list scroll #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
944d7c8
Merge pull request #11 from aatishb/master
MrSpiffyClean May 20, 2020
f1ca9f3
Remove overflow-y from .countries
MrSpiffyClean May 21, 2020
3a46d12
Add countriestopwrapper div
MrSpiffyClean May 22, 2020
1dffc64
Add countriestopwrapper css info
MrSpiffyClean May 22, 2020
ada0aad
Add customizetopwrapper and separator divs
MrSpiffyClean May 22, 2020
00c6e41
Add customizetopwrapper and related func
MrSpiffyClean May 22, 2020
cc4b294
Add click events to the aside section titles
MrSpiffyClean May 22, 2020
60da578
Add event functions
MrSpiffyClean May 22, 2020
71ed61b
Add position: sticky vendor prefixes
MrSpiffyClean May 22, 2020
cf64f6f
Add customize class to div
MrSpiffyClean May 22, 2020
6f2cd7f
Fix quote marks
MrSpiffyClean May 22, 2020
1123a50
Update style.css
MrSpiffyClean Jun 1, 2020
95f7445
Fix scroll bug in scrollToCountries()
MrSpiffyClean Jun 1, 2020
1733118
Fix margin in .separator
MrSpiffyClean Jun 1, 2020
f27da65
Fix scrollToCountries
MrSpiffyClean Jun 1, 2020
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
31 changes: 19 additions & 12 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,10 @@ <h1><a href="https://aatishb.com/covidtrends">Covid Trends</a></h1>
</main>

<aside>

<div>
<h2>Customize</h2>
<div class="customizetopwrapper">
<h2 @click="scrollToCustomize">Customize</h2>
</div>
<div class="customize">
<label for="selectedData">Select Parameter</label>
<select id="selectedData" v-model="selectedData" @mousedown="pause">
<option v-for="d in dataTypes" v-bind:value="d">
Expand Down Expand Up @@ -134,20 +135,26 @@ <h2>Customize</h2>

</div>

<div class="separator"></div>

<div class="countries">

<h2>{{regionType}}</h2>
<div class="countriestopwrapper">

<div class="search">
<input id="searchField" v-model="searchField" placeholder="Search For A Location" aria-label="Search For A Location">
</div>
<h2 @click="scrollToCountries">{{regionType}}</h2>

<div class="buttonwrapper">
<button @click="deselectAll" aria-Label="Deselect All Regions">Deselect All</button>
<button @click="selectAll" aria-Label="Select All Regions">Select All</button>
</div>
<div class="search">
<input id="searchField" v-model="searchField" placeholder="Search For A Location" aria-label="Search For A Location">
</div>

<div class="buttonwrapper">
<button @click="deselectAll" aria-Label="Deselect All Regions">Deselect All</button>
<button @click="selectAll" aria-Label="Select All Regions">Select All</button>
</div>

<p style="padding-top: 1rem;">Showing {{regionType}} with at least {{minCasesInCountry}} {{selectedData}}</p>
<p style="padding-top: 1rem;">Showing {{regionType}} with at least {{minCasesInCountry}} {{selectedData}}</p>

</div>

<ul>
<li v-for="country in visibleCountries">
Expand Down
50 changes: 42 additions & 8 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ aside {

background-color: #fcf8e8;
padding: 1rem;
padding-top: 0; /* Letting customizetopwrapper take care of this */
min-width: 10rem;

overflow-y: auto;
Expand All @@ -168,15 +169,47 @@ aside > div:last-child {
margin-bottom: 0;
}

.countries {

overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

aside h2 {
font-size: 1.5rem;
text-align: center;

transition-duration: 0.4s;
}

aside h2:hover {
color: #FF4C00;
}

.customizetopwrapper {
margin: 0;

position: -webkit-sticky;
position: sticky;
top: 0; /* Same as aside padding-top */
padding-top: 1rem;
background-color: #fcf8e8;
}

.customize {
margin-bottom: 1rem;
}

.separator {
position: -webkit-sticky;
position: sticky;
top: 3.5rem;
border: 1px solid #333;
margin: 0;
}

.countriestopwrapper {
position: -webkit-sticky;
position: sticky;
top: calc(3.5rem + 2px); /* Enough to fit the element before (3.5rem) and a separator */
padding-top: 1rem;
padding-bottom: 0.75rem;

background-color: #fcf8e8;
}

footer {
Expand Down Expand Up @@ -224,7 +257,6 @@ svg {
width: 100%;
display: flex;
flex-direction: row;
min-width: 10rem;
}

.search > input {
Expand Down Expand Up @@ -271,9 +303,11 @@ button:hover {
.countries p {
margin-bottom: 0.75rem;
}
.countriestopwrapper p {
margin-bottom: 0;
}

select {
min-width: 12rem;
font-size: 1rem;
padding: 0.5rem;
width: 100%;
Expand Down
12 changes: 12 additions & 0 deletions vue-definitions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,18 @@ window.app = new Vue({
// reference line for exponential growth with a given doubling time
referenceLine(x) {
return x * (1 - Math.pow(2, -this.lookbackTime / this.doublingTime));
},

scrollToCustomize() {
const ctw = document.getElementsByClassName('customizetopwrapper')[0];
document.getElementsByClassName('customize')[0].scrollIntoView();
document.getElementsByTagName('aside')[0].scrollBy(0,-parseFloat(getComputedStyle(ctw)['height'])-parseFloat(getComputedStyle(ctw)['padding-top']));
},

scrollToCountries() {
const ctw = document.getElementsByClassName('countriestopwrapper')[0];
document.getElementsByClassName('countries')[0].scrollIntoView();
document.getElementsByTagName('aside')[0].scrollBy(0,-parseFloat(getComputedStyle(ctw)['top'])+1); // the +1 avoids a weird (fractional) scrolling issue
}

},
Expand Down