From 40eb59896c5b88c6358e2231610d6051fe53fade Mon Sep 17 00:00:00 2001 From: elisejakob Date: Sat, 9 Mar 2019 19:07:34 +0100 Subject: [PATCH] add show more links and futura logo test --- src/components/EventList.js | 10 ++++-- src/components/PostList.js | 4 ++- src/css/base.scss | 14 ++++++++ src/css/blog.scss | 1 + src/css/events.scss | 1 - src/css/footer.scss | 3 +- src/img/logo/logo-h-s.svg | 17 +++++++++ src/img/logo/logo-h.svg | 65 ++++++---------------------------- src/templates/event-program.js | 8 +---- src/templates/front-page.js | 8 ++--- 10 files changed, 57 insertions(+), 74 deletions(-) create mode 100644 src/img/logo/logo-h-s.svg diff --git a/src/components/EventList.js b/src/components/EventList.js index 7afb3de..f6406cb 100644 --- a/src/components/EventList.js +++ b/src/components/EventList.js @@ -10,7 +10,7 @@ moment.locale('nb') export default class EventList extends React.Component { render() { - const { events, onlyUpcoming, numDays, groupBy } = this.props + const { events, title, onlyUpcoming, numDays, groupBy, showMore } = this.props const filteredEvents = events.filter(({ node: event }) => { const startTime = moment(event.start_time) @@ -27,11 +27,13 @@ export default class EventList extends React.Component { }) return ( -
+
+ {title &&

{title}

} {groupBy && this.renderEventsByDate(filteredEvents, groupBy)} {!groupBy && filteredEvents.map(({ node: event }) => this.renderEvent(event))} -
+ {showMore &&
Vis alle
} + ) } @@ -121,10 +123,12 @@ export default class EventList extends React.Component { EventList.propTypes = { events: PropTypes.arrayOf(PropTypes.object), + title: PropTypes.string, onlyUpcoming: PropTypes.bool, numDays: PropTypes.number, groupBy: PropTypes.string, compactDate: PropTypes.bool, + showMore: PropTypes.bool } EventList.defaultProps = { diff --git a/src/components/PostList.js b/src/components/PostList.js index 86aa168..482755c 100644 --- a/src/components/PostList.js +++ b/src/components/PostList.js @@ -5,7 +5,7 @@ import Img from 'gatsby-image' export default class PostList extends React.Component { render() { - const { posts, title } = this.props + const { posts, title, showMore } = this.props return (
@@ -36,6 +36,7 @@ export default class PostList extends React.Component { ))} + {showMore &&
Vis alle
}
) } @@ -44,6 +45,7 @@ export default class PostList extends React.Component { PostList.propTypes = { posts: PropTypes.arrayOf(PropTypes.object), title: PropTypes.string, + showMore: PropTypes.bool } export const pageQuery = graphql` diff --git a/src/css/base.scss b/src/css/base.scss index 96c4200..a80c383 100644 --- a/src/css/base.scss +++ b/src/css/base.scss @@ -115,4 +115,18 @@ td, th { .volunteer { background: $color-green; +} + +.show-more { + display: block; + width: 100%; + text-align: center; + padding: 1rem; + + a { + display: inline-block; + text-transform: uppercase; + letter-spacing: 0.05rem; + color: $color-black; + } } \ No newline at end of file diff --git a/src/css/blog.scss b/src/css/blog.scss index dd0f0a5..24bf103 100644 --- a/src/css/blog.scss +++ b/src/css/blog.scss @@ -22,6 +22,7 @@ 0 0 0 0.3rem $color-yellow, 0 0 0 0.35rem $color-yellow; transition: box-shadow .1s ease-in-out; + cursor: pointer; &:hover { color: $color-white; diff --git a/src/css/events.scss b/src/css/events.scss index 6423ce9..219c68e 100644 --- a/src/css/events.scss +++ b/src/css/events.scss @@ -1,7 +1,6 @@ .front-page-events, .event-program, .events { background: $color-pink; color: $color-text-event; - padding-top: 0; } .event-group-header { diff --git a/src/css/footer.scss b/src/css/footer.scss index 6191ed5..f20f5c2 100644 --- a/src/css/footer.scss +++ b/src/css/footer.scss @@ -12,12 +12,13 @@ display: flex; flex-wrap: wrap; justify-content: center; + align-items: center; margin: 0 auto 2rem; } .logo { width: 50%; - padding-right: 3rem; + padding-right: 4rem; } p { width: 50%; diff --git a/src/img/logo/logo-h-s.svg b/src/img/logo/logo-h-s.svg new file mode 100644 index 0000000..19f35cb --- /dev/null +++ b/src/img/logo/logo-h-s.svg @@ -0,0 +1,17 @@ + + + + logo-h-s + Created with Sketch. + + + + CHATEAU NEUF + + + DET NORSKE STUDENTERSAMFUND + + + + + \ No newline at end of file diff --git a/src/img/logo/logo-h.svg b/src/img/logo/logo-h.svg index 91db94d..0cb2689 100644 --- a/src/img/logo/logo-h.svg +++ b/src/img/logo/logo-h.svg @@ -1,57 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + logo-h + Created with Sketch. + + + + + \ No newline at end of file diff --git a/src/templates/event-program.js b/src/templates/event-program.js index fe5a0d7..e8f22be 100644 --- a/src/templates/event-program.js +++ b/src/templates/event-program.js @@ -11,13 +11,7 @@ export default class EventProgram extends React.Component { return ( -
- -
+ ) } diff --git a/src/templates/front-page.js b/src/templates/front-page.js index 4255ab6..01d8a24 100644 --- a/src/templates/front-page.js +++ b/src/templates/front-page.js @@ -15,10 +15,7 @@ export default class IndexPage extends React.Component { return ( -
- - Vis alle -
+

Åpningstider

@@ -39,8 +36,7 @@ export default class IndexPage extends React.Component {

Bli frivillig

Vil du være med å arrangere greier på studentersamfundet? Kom æ

- - Vis alle + ) }