Skip to content

Commit 7da1a87

Browse files
authored
Merge pull request #374 from developmentseed/Update-map-bounds-checkbox
Update map bounds checkbox
2 parents de74483 + 8918467 commit 7da1a87

File tree

3 files changed

+23
-13
lines changed

3 files changed

+23
-13
lines changed

cypress/e2e/teams/index.cy.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ const TEAMS_COUNT = 35
1313
const teams = generateSequenceArray(TEAMS_COUNT, 1).map((i) => ({
1414
id: i,
1515
name: `Team ${addZeroPadding(i, 3)}`,
16+
location: {
17+
type: 'Point',
18+
// Fake coords under 30 degrees
19+
coordinates: [(30 / TEAMS_COUNT) * i, (30 / TEAMS_COUNT) * i],
20+
},
1621
}))
1722

1823
describe('Teams page', () => {

src/components/layout.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,15 @@ export const globalStyles = css.global`
3030
min-width: ${theme.layout.rowMinWidth};
3131
}
3232
33-
.app-container {
34-
overflow: hidden;
35-
}
36-
3733
.page-layout {
3834
display: grid;
3935
position: relative;
4036
grid-template-rows: 4rem 1fr;
4137
grid-template-columns: 100%;
4238
grid-template-areas:
4339
'sidebar'
44-
'main'
45-
'footer';
46-
height: 100vh;
47-
overflow: auto;
40+
'main';
41+
min-height: 100vh;
4842
}
4943
5044
@media screen and (min-width: ${theme.mediaRanges.small}) {
@@ -70,8 +64,9 @@ export const globalStyles = css.global`
7064
7165
.inner.page {
7266
grid-area: main;
73-
margin-top: calc(${theme.layout.globalSpacing} * 4);
74-
margin-bottom: calc(${theme.layout.globalSpacing} * 4);
67+
margin-top: calc(${theme.layout.globalSpacing} * 2);
68+
margin-bottom: calc(${theme.layout.globalSpacing} * 2);
69+
overflow: auto;
7570
}
7671
7772
.inner.page section {

src/pages/teams/index.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,21 +189,31 @@ export default class TeamList extends Component {
189189
{this.renderMap()}
190190
<fieldset>
191191
<input
192+
name='map-bounds-filter'
193+
id='map-bounds-filter'
192194
type='checkbox'
193195
checked={searchOnMapMove}
194196
onChange={(e) => this.setSearchOnMapMove(e)}
195197
/>
196-
<span>Filter teams using map bounds</span>
198+
<label for='map-bounds-filter'>Filter teams by map</label>
197199
</fieldset>
198200
<Section>{this.renderTeams()}</Section>
199201
<style jsx>
200202
{`
201203
fieldset {
202204
display: inline-block;
203-
margin: 1rem 0 2rem;
204-
padding: 1.5rem;
205+
padding: 0.5rem;
205206
background: white;
206207
border-color: ${theme.colors.primaryColor};
208+
border-color: #384a9e;
209+
position: relative;
210+
top: -4rem;
211+
left: 1rem;
212+
z-index: 1000;
213+
}
214+
fieldset input,
215+
fieldset label {
216+
cursor: pointer;
207217
}
208218
209219
fieldset input[type='checkbox'] {

0 commit comments

Comments
 (0)