diff --git a/_includes/footer.html b/_includes/footer.html index 308d9db..7323b98 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,5 +1,5 @@ diff --git a/_includes/head.html b/_includes/head.html index 598f9a0..0043c31 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -23,6 +23,7 @@ + diff --git a/_sass/_footer.scss b/_sass/_footer.scss index a96b3cb..a3cbfc8 100644 --- a/_sass/_footer.scss +++ b/_sass/_footer.scss @@ -2,7 +2,7 @@ position: absolute; bottom: 0; width: 100%; - height: 60px; + // height: 60px; background-color: #C94328; } .footerContainer { @@ -16,6 +16,7 @@ } .footerText--link { color: rgb(255, 255, 255); + border-bottom: 1px solid rgb(255,255,255); background-color: transparent; text-decoration: none; } diff --git a/_sass/_front.scss b/_sass/_front.scss index a2b438e..167f077 100644 --- a/_sass/_front.scss +++ b/_sass/_front.scss @@ -5,18 +5,19 @@ html { min-height: 100%; } body { - font-family: $font-sans; + font-family: $font-mono; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - font-weight: 300; + // font-weight: 300; margin-bottom: 120px; } a { color: rgb(51, 51, 51); - background-color: rgb(255, 255, 165); + border-bottom: 2px solid #c94328; } a:hover { - color: rgb(51, 51, 51); + transition: 0.3s; + color: #c94328; text-decoration: none; } .introText { @@ -29,6 +30,9 @@ a:hover { .logoImg { margin-bottom: 30px; } +.patrons { + margin-bottom: 40px; +} .patronLogo { padding-left: 15px; padding-right: 15px; @@ -38,6 +42,17 @@ a:hover { .closingText { font-size: 22px; } +.twitter { + fill: #1da1f2; +} +.lastMeetups { + padding-left: 0; +} +.lastMeetups li { + font-size: 16px; + padding-bottom: 14px; + line-height: 1.8; +} // text selectors <3 ::selection { diff --git a/_sass/_pages.scss b/_sass/_pages.scss index ae429df..1d02da1 100644 --- a/_sass/_pages.scss +++ b/_sass/_pages.scss @@ -12,8 +12,14 @@ article p { font-family: "Georgia", serif; margin-bottom: 20px; } +h1 { + font-weight: 600; + margin-bottom: 20px; +} h2 { + font-weight: 600; margin-top: 30px; + margin-bottom: 20px; } h3 { margin-top: 30px; diff --git a/_sass/_sponsoring.scss b/_sass/_sponsoring.scss index 3edaded..a487366 100644 --- a/_sass/_sponsoring.scss +++ b/_sass/_sponsoring.scss @@ -2,6 +2,7 @@ .baseText { font-size: 22px; + margin-bottom: 20px; } .baseText--list { font-size: 18px; diff --git a/_sass/_utilities.scss b/_sass/_utilities.scss index a3df957..3b751b8 100644 --- a/_sass/_utilities.scss +++ b/_sass/_utilities.scss @@ -30,10 +30,17 @@ .u-moreMarginBottom { margin-bottom: 40px; } +.u-marginRight { + margin-right: 10px; +} .u-zeroDecoration { + border: none; background-color: transparent; text-decoration: none; } +.u-vMiddle { + vertical-align: middle; +} @media screen and (min-width: $screen-lg-min) { .u-imgSameWidth { diff --git a/_sass/_variables.scss b/_sass/_variables.scss index e34cf08..b4e5b64 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -1,5 +1,5 @@ // General variables -$font-mono: "Monaco", "Menlo", Courier, monospace; +$font-mono: "PT Mono", "Monaco", "Menlo", Courier, monospace; $font-sans: "Helvetica Neue", "Helvetica", Arial, sans-serif; // Magic media queries from Bootstrap: http://getbootstrap.com/css/ diff --git a/index.html b/index.html index 482c20f..ff171d7 100644 --- a/index.html +++ b/index.html @@ -12,49 +12,27 @@

Barcelona Free Software is a meetup - and an open space for coders and users who love free software (with — members!) + and an open space for coders and users who love free software (w/ — members!)

Come to our next meeting to discover new projects and have a drink.

Anything to say? Please, contact us directly.

-

Follow us on twitter!

+

You can also follow us on Twitter.

-
-

Last meetups

-
- -

-
-
- -

-
-
- -

+
+
+

Last meetups

+
    - -
    -
    - -

    -
    -
    - -

    -
    -
    - -

    -
    -
    - +

    Patrons

    - - - +
    + + + +

    Want to help us? We have sponsorships available.

    diff --git a/js/main.js b/js/main.js index 2f83655..d73d991 100644 --- a/js/main.js +++ b/js/main.js @@ -3,21 +3,18 @@ $(document).ready(function() { // Update membership count $(".js-members").text(response.data.members) }); - + $.getJSON("https://api.meetup.com/Barcelona-Free-Software/events?desc=true&photo-host=public&page=20&sig_id=103310792&status=past&fields=photo_album&sig=f3ef85dfc4deeae26cc8b29b6bba906dd05cb3fd&callback=?", function(response) { - // We only want the last six meetups that have a picture - var meetups = response.data.filter(function(d) { return d.photo_album }).slice(0, 6); - - // Add the info for each one - $.each(meetups, function(i, d) { - $(".meetupLink") - .eq(i) - .attr("href", d.link) - .text(d.name); - - $(".meetup img") - .eq(i) - .attr("src", d.photo_album.photo_sample[0].photo_link) - }); + var meetups = response.data.slice(0, 20); + + meetups.forEach(function(d) { + var date = new Date(d.created); + var day = date.getUTCDate(); + var month = date.getUTCMonth() + 1; //months from 1-12 + var year = date.getUTCFullYear(); + + $(".lastMeetups") + .append('
  • ' + d.name + '' + day + '/' + month + '/' + year + ' @' + d.venue.name + '
    • ') + }); }); }); diff --git a/sponsoring/index.html b/sponsoring/index.html index e459e5d..8790428 100644 --- a/sponsoring/index.html +++ b/sponsoring/index.html @@ -11,7 +11,7 @@

    Sponsorship opportunities

    -

    Collaborator

    +

    Collaborator

    -

    Patron

    +

    Patron