Skip to content

Commit a1e7227

Browse files
authored
Merge pull request #377 from developmentseed/update/pagination-styles
Update pagination button styles
2 parents f54e79f + a6f92b6 commit a1e7227

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

src/components/button.js

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,18 @@ const ButtonStyles = css.global`
4747
.button.primary {
4848
color: #ffffff;
4949
background: ${theme.colors.primaryColor};
50-
border: none;
50+
border: 2px solid transparent;
51+
box-shadow: 2px 2px #ffffff, 4px 4px ${theme.colors.primaryColor};
52+
}
53+
.button.secondary {
54+
color: ${theme.colors.primaryColor};
55+
background: ${theme.colors.primaryLite};
5156
box-shadow: 2px 2px #ffffff, 4px 4px ${theme.colors.primaryColor};
5257
}
58+
.button.flat {
59+
box-shadow: none;
60+
position: relative;
61+
}
5362
5463
.borderless {
5564
border: none;
@@ -164,6 +173,7 @@ export default function Button({
164173
}) {
165174
let classes = [`button`, variant, className]
166175
if (disabled) classes.push('disabled')
176+
if (flat) classes.push('flat')
167177
let classNames = classes.join(' ')
168178
if (type === 'submit') {
169179
return (
@@ -181,16 +191,16 @@ export default function Button({
181191
<style jsx>{ButtonStyles}</style>
182192
<style jsx>{`
183193
.button {
184-
box-shadow: ${flat && 'none'};
185-
position: relative;
194+
min-width: 1.75rem;
195+
min-height: 1.75rem;
186196
}
187197
.button::after {
188198
content: '';
189-
position: absolute;
199+
position: ${useIcon && 'absolute'};
190200
top: 0;
191201
left: 0;
192-
width: 100%;
193-
height: 100%;
202+
width: ${useIcon && '100%'};
203+
height: ${useIcon && '100%'};
194204
mask: ${useIcon
195205
? `url(${join(URL, `/static/icon-${useIcon}.svg`)})`
196206
: 'none'};
@@ -218,16 +228,16 @@ export default function Button({
218228
<style jsx>{ButtonStyles}</style>
219229
<style jsx>{`
220230
.button {
221-
box-shadow: ${flat && 'none'};
222-
position: relative;
231+
min-width: 1.75rem;
232+
min-height: 1.75rem;
223233
}
224234
.button::after {
225235
content: '';
226-
position: absolute;
236+
position: ${useIcon && 'absolute'};
227237
top: 0;
228238
left: 0;
229-
width: 100%;
230-
height: 100%;
239+
width: ${useIcon && '100%'};
240+
height: ${useIcon && '100%'};
231241
mask: ${useIcon
232242
? `url(${join(URL, `/static/icon-${useIcon}.svg`)})`
233243
: 'none'};
@@ -253,18 +263,16 @@ export default function Button({
253263
<style jsx>{ButtonStyles}</style>
254264
<style jsx>{`
255265
.button {
256-
box-shadow: ${flat && 'none'};
257-
position: relative;
258266
min-width: 1.75rem;
259267
min-height: 1.75rem;
260268
}
261269
.button::after {
262270
content: '';
263-
position: absolute;
271+
position: ${useIcon && 'absolute'};
264272
top: 0;
265273
left: 0;
266-
width: 100%;
267-
height: 100%;
274+
width: ${useIcon && '100%'};
275+
height: ${useIcon && '100%'};
268276
mask: ${useIcon
269277
? `url(${join(URL, `/static/icon-${useIcon}.svg`)})`
270278
: 'none'};

src/components/pagination.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ function Pagination({ pagination, setPage, 'data-cy': dataCy }) {
7575
onClick={() => setPage(page)}
7676
key={`page-${page}`}
7777
disabled={page === '...'}
78+
variant={currentPage === page ? 'primary' : 'secondary'}
7879
data-cy={`page-${page}-button`}
7980
className='small'
8081
flat

0 commit comments

Comments
 (0)