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

Jump to bottom

Update design [WIP] #303

Merged
merged 96 commits into from
Jul 11, 2016
Merged

Update design [WIP] #303

merged 96 commits into from
Jul 11, 2016

Commits on Jun 20, 2016

  1. inital attempts at new design

    Knut Hühne committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    4ea636d View commit details
    Browse the repository at this point in the history

  2. Ignore .sass-cache

    Knut Hühne committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    b5b287d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2016

  1. Update more things, include libraries

    Knut Hühne committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    5344ba7 View commit details
    Browse the repository at this point in the history

  2. Add custom plugin for including blog entries

    Knut Hühne committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    2f54aef View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. Use bower to track depencies

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    0459809 View commit details
    Browse the repository at this point in the history

  2. Add feedparser requirement

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    3f0de35 View commit details
    Browse the repository at this point in the history

  3. Use sass for templating, not less

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    9e66e14 View commit details
    Browse the repository at this point in the history

  4. Add Gemfile to install sass

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    a53a012 View commit details
    Browse the repository at this point in the history

  5. Remove all mentions of node

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    b762789 View commit details
    Browse the repository at this point in the history

  6. use pytho's libsass not ruby's sass

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    f737f2a View commit details
    Browse the repository at this point in the history

  7. Install bower depencies on heroku

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    0d1aeef View commit details
    Browse the repository at this point in the history

  8. Add bower as depency to package.json

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    57dd10e View commit details
    Browse the repository at this point in the history

  9. do not keep bower install packages in git

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    bda2be2 View commit details
    Browse the repository at this point in the history

  10. Update scss files

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    837374b View commit details
    Browse the repository at this point in the history

  11. Inlcude mmenu

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    6483802 View commit details
    Browse the repository at this point in the history

  12. Properly ignore static/vendor/

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    e95529f View commit details
    Browse the repository at this point in the history

  13. npm install with travis

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    fffb220 View commit details
    Browse the repository at this point in the history

  14. Update install insturctions

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    80e09ac View commit details
    Browse the repository at this point in the history

  15. Add webfontloader

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    ded697f View commit details
    Browse the repository at this point in the history

  16. Link to correct webfontloader file

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    5f3a68b View commit details
    Browse the repository at this point in the history

  17. Remove vendorized jquery, jquery-lettering

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    65eb871 View commit details
    Browse the repository at this point in the history

  18. remove less files

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    bf447bf View commit details
    Browse the repository at this point in the history

  19. Properly set path for glyphicons

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    0c10103 View commit details
    Browse the repository at this point in the history

  20. Add travis notification for slack

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    025f01a View commit details
    Browse the repository at this point in the history

  21. Conditonall show different navigation menu

    Knut Hühne committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    e0a7aab View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. Use new banner style

    Knut Hühne committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    ff09669 View commit details
    Browse the repository at this point in the history

  2. Remove djangocms_pagebanner extension

    Knut Hühne committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    18de1a5 View commit details
    Browse the repository at this point in the history

  3. Chng comment from sass to less

    Knut Hühne committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    a6ad5e2 View commit details
    Browse the repository at this point in the history

  4. ths mss ltrs

    Knut Hühne committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    abfbfa2 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. Add team page, update sidebar navigation

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    c2bad8d View commit details
    Browse the repository at this point in the history

  2. Add email field, show twitter, homepage

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    3800bd4 View commit details
    Browse the repository at this point in the history

  3. Add skip email option, remove duplicate

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    38645c4 View commit details
    Browse the repository at this point in the history

  4. Use https for twitter links ins tests

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    e8aa04c View commit details
    Browse the repository at this point in the history

  5. Update mailing list html

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    bbe0e23 View commit details
    Browse the repository at this point in the history

  6. Add home banner content 

    Copies
https://github.com/okfn/website-mockups/commit/f4d2f1dbb88d0095462dd2ec11bdee23d18dbff1
    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    869a1f3 View commit details
    Browse the repository at this point in the history

  7. Show menu two levels deep 

    So now when you are on the about page you can also navigate two a `How
to Open Data` which is below `What is Open?` for example
    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    70618a7 View commit details
    Browse the repository at this point in the history

  8. Apply the new design to more pages

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    2a56475 View commit details
    Browse the repository at this point in the history

  9. Apply new design to networkgroup pages

    Knut Hühne committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    50fa466 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2016

  1. Update css to latest website-mockups version

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    0c98e13 View commit details
    Browse the repository at this point in the history

  2. User typekit instead of google fonts

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    6a3d6c9 View commit details
    Browse the repository at this point in the history

  3. Restore bootstrap glyphicons

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    a98a0c8 View commit details
    Browse the repository at this point in the history

  4. Use bower version of mmenu css, not cdnjs

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    bc1d75c View commit details
    Browse the repository at this point in the history

  5. Apply new style to 404 & search page

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    5c1f7bb View commit details
    Browse the repository at this point in the history

  6. Only show nowdoing for people that have username_on_slack set

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    5b5772d View commit details
    Browse the repository at this point in the history

  7. Proper check for nowdoing

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    a14953b View commit details
    Browse the repository at this point in the history

  8. Style theme-details

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    07d1cbc View commit details
    Browse the repository at this point in the history

  9. Log to console

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    696dd77 View commit details
    Browse the repository at this point in the history

  10. Style more pages

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    3c89257 View commit details
    Browse the repository at this point in the history

  11. Remove template if from javascript block

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    7cb5bfb View commit details
    Browse the repository at this point in the history

  12. Use js to check if mmenu should make navigation

    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    e084368 View commit details
    Browse the repository at this point in the history

  13. Revert "Log to console" 

    This reverts commit 696dd77.
    Knut Hühne committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    34d0f52 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Merge branch 'master' into design-update

    Knut Hühne committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    627bae5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into design-update

    Knut Hühne committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    6e4257d View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2016

  1. Properly display doing_type

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    27d3d6a View commit details
    Browse the repository at this point in the history

  2. Update csp allowed sources

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    f78de63 View commit details
    Browse the repository at this point in the history

  3. Allow loadings style from typekit, reindent

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    dcdfd58 View commit details
    Browse the repository at this point in the history

  4. Whitelist gravatar

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    31f4d38 View commit details
    Browse the repository at this point in the history

  5. Allow typekit ping images

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    8f4fe35 View commit details
    Browse the repository at this point in the history

  6. pep8 compliable indentation

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    ed4cb81 View commit details
    Browse the repository at this point in the history

  7. Let editors search for people in admin interface

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    eb05ab0 View commit details
    Browse the repository at this point in the history

  8. Preselect latest status update

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    cb4638f View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into design-update

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    c22901d View commit details
    Browse the repository at this point in the history

  10. Change migration order to reflect new merged status

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    d780447 View commit details
    Browse the repository at this point in the history

  11. Add secure.gravatar.com to allowed domains

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    46850eb View commit details
    Browse the repository at this point in the history

  12. Add test for new NowDoing functions

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    d1a3073 View commit details
    Browse the repository at this point in the history

  13. update advisory board template

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    83b1a2e View commit details
    Browse the repository at this point in the history

  14. update advisory board template

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    a757994 View commit details
    Browse the repository at this point in the history

  15. Check if there is any nowdoing to show

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    37ce469 View commit details
    Browse the repository at this point in the history

  16. Enable possibility to filter people by email address

    Knut Hühne committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    f6f542c View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2016

  1. Apply new design to project list, project details

    Knut Hühne committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    92dca6f View commit details
    Browse the repository at this point in the history

  2. Set href for header social and donate links

    Knut Hühne committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    a46f80f View commit details
    Browse the repository at this point in the history

  3. Remove all custom body css classes 

    They were used in the previous css but are not needed int the new design
anymore
    Knut Hühne committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    fa7f0c9 View commit details
    Browse the repository at this point in the history

  4. Always show sidebar navigation 

    This change always includes the side navigation on
the left. Previously it was hidden if there was
additional content supplied by a custom sidebar
extension. This is now shown additionally above
the navigation itself.
    Knut Hühne committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    24351cd View commit details
    Browse the repository at this point in the history

  5. Add links to features from homepage

    Knut Hühne committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    ee8b4ac View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2016

  1. Move custom sidebar below navigation

    Knut Hühne committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    403ec25 View commit details
    Browse the repository at this point in the history

  2. Resize the navbar after click

    Knut Hühne committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    34b8984 View commit details
    Browse the repository at this point in the history

  3. Drop fixed height on nav 

    This was needed before but is not anymore because now the height of the
inner navbar is set with javascript
    Knut Hühne committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    d7c6dd5 View commit details
    Browse the repository at this point in the history

  4. Only hide navigation on mobile, not sidebar

    Knut Hühne committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    fe7a067 View commit details
    Browse the repository at this point in the history

  5. Remove newsletter signup 

    Fixes #310

This might be reverted later when the new communication person decides
that we do want to have the newsletter signup displayed so prominently
    Knut Hühne committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    45ed239 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Update scss, use two columns everywhere 

    This copies the structure of `cms_twocolumn.html` to `cms_apphook.html`
and makes sure that all custom templates that are inheriting from
apphook properly use the new styling
    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    1fd7b13 View commit details
    Browse the repository at this point in the history

  2. Update project page 

    - Removes old fields from model
- Adds new field `forum_url` to `Project` (replaces `mailinglist_url`)
- Uses same template layout as team page
    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    5768bad View commit details
    Browse the repository at this point in the history

  3. Update icons

    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    c4da6e1 View commit details
    Browse the repository at this point in the history

  4. replace forgotten occurrences of mailinglist_url

    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    b8b1bec View commit details
    Browse the repository at this point in the history

  5. Add old_project boolean to Project

    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    5395d6e View commit details
    Browse the repository at this point in the history

  6. Properly include images

    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    a3929f9 View commit details
    Browse the repository at this point in the history

  7. Link to project homepage from image

    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    91d7ec0 View commit details
    Browse the repository at this point in the history

  8. Show old and current projects in navigation 

    - This change adds the two navigation points below
  the "Projects" entry in the navigation
  - "Current projects"
  - "Old projects"

It also refactors some of the not so pretty code
    Knut Hühne committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    19b35f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. Add featured new plugin 

    This is for the news carousel on the homepage.

Instead of hardcoding the items in the template there now is a new model
and a new plugin. It lets users add Featured news through the admin
interface.
    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    6752ea3 View commit details
    Browse the repository at this point in the history

  2. Add updated help text for order in networkgroup

    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    d0b98a0 View commit details
    Browse the repository at this point in the history

  3. Add dropdown to top navigation 

    This changes the top navigation to show the dropdown for all objects one
level down
    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    36e6e80 View commit details
    Browse the repository at this point in the history

  4. Remove local groups from navigation 

    There were too many and it was getting obstructive
    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    d2bf263 View commit details
    Browse the repository at this point in the history

  5. Style top navigation dropdown above carousel pagers

    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    86bcc9c View commit details
    Browse the repository at this point in the history

  6. Load default image if no gravatar available

    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    43ab91d View commit details
    Browse the repository at this point in the history

  7. Only load images through gravatar

    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    bac3a9b View commit details
    Browse the repository at this point in the history

  8. Load 132px resolution images from gravatar

    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    a6198d1 View commit details
    Browse the repository at this point in the history

  9. Unconfigure hover on project page 

    Adds the same image as background image to make sure that the hover does
not change the image
    Knut Hühne committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    0a52c85 View commit details
    Browse the repository at this point in the history