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

Ui style and fixes #786

Merged
merged 20 commits into from
Mar 24, 2018
Merged

Ui style and fixes #786

merged 20 commits into from
Mar 24, 2018

Commits on Mar 7, 2018

  1. fix UI Bug #708 : change title in edit camp page

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    4d4592a View commit details
    Browse the repository at this point in the history

  2. fix UI Bugs #711 & #712 (camp page)

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    c2179bc View commit details
    Browse the repository at this point in the history

  3. fix UI Bugs #711 & #712 (camp page)

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    f5b5d5b View commit details
    Browse the repository at this point in the history

  4. UI Bug fix #710 - remove publish button

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    c9daaac View commit details
    Browse the repository at this point in the history

  5. UI main navigation - remove unnecessary class 'undefined'

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    52ba074 View commit details
    Browse the repository at this point in the history

  6. add he translations

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    fca7f96 View commit details
    Browse the repository at this point in the history

  7. edit camp - general comments and layout fix

    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    14fd43e View commit details
    Browse the repository at this point in the history

  8. minor style changes, remove underline when hovering buttons, align ch… 

    …eckboxes to labels
    @shaniqwa
    shaniqwa committed Mar 7, 2018
    Configuration menu
    Copy the full SHA
    4f28b62 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. fix top navbar style

    @shaniqwa
    shaniqwa committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    4d0aa12 View commit details
    Browse the repository at this point in the history

  2. add moment.js to app.locals so it can be used for date formatting in … 

    …jade templates. use to format date in edit camp page. use angular date pipe in index_admin page.
    @shaniqwa
    shaniqwa committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    d442d92 View commit details
    Browse the repository at this point in the history

  3. add some style: to statistics on home page and members table.

    @shaniqwa
    shaniqwa committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    f4f415f View commit details
    Browse the repository at this point in the history

  4. fix translation, add icon to 'inactive' status

    @shaniqwa
    shaniqwa committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    0373731 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into ui-style-fixes

    @shaniqwa
    shaniqwa committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    7008a81 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. update top nav: put all admin manage tabs under one dropdown. fix bug… 

    … in whoami page (was getting error when logged in with user without camp).
    @shaniqwa
    shaniqwa committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    55c7542 View commit details
    Browse the repository at this point in the history

  2. theme styling

    @shaniqwa
    shaniqwa committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    48b9c55 View commit details
    Browse the repository at this point in the history

  3. link to button

    @shaniqwa
    shaniqwa committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    fbbfba4 View commit details
    Browse the repository at this point in the history

  4. layout fix

    @shaniqwa
    shaniqwa committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    eabe262 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'midburn/master' into ui-style-fixes 

    * midburn/master:
  fix camp selection content (#782)
  continuous deployment from api-refactor-feb-2018 to sparktesting environment (#770)
  enable continuous deployment for spark-drupal-sync (#763)
  Sorting using ng-repeat filter sortBy (#741)
  Tagging v2.10.30
  Update package.json
  fixed incorrect tickets number displayed (#739)
  Fixed for unsynced tickets (#737)
  Fixed code in free text in the camp page (#713) (#736)
  Fix ticket sync from Drupal (#734)
  Tagging v2.10.27
  update docs for import pre sale ticket allocations (#732)
  Ui style improvment and fixes (#733)
  Ui Bugs fixed: #708, #710, #711, #712 (#726)
  bumping version to v2.10.26
  Bundle IDs should be int, not string (#729)
  Added correct bundle IDs for 2018 sale (#727)

# Conflicts:
#	public/stylesheets/_camps.scss
#	public/stylesheets/_colors.scss
#	public/stylesheets/main.scss
#	views/includes/page.jade
#	views/pages/camps/index_user.jade
    @shaniqwa
    shaniqwa committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    5aa0257 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

  1. add theme toggle (button in footer) - new theme is now default, white… 

    … theme available. fix some breadcrumbs.
    @shaniqwa
    shaniqwa committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    0b94fd6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ui-style-fixes' of https://github.com/Midburn/spark int… 

    …o ui-style-fixes

* 'ui-style-fixes' of https://github.com/Midburn/spark:

# Conflicts:
#	public/stylesheets/main.scss
    @shaniqwa
    shaniqwa committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    0f2c30d View commit details
    Browse the repository at this point in the history