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

Conversation

shaniqwa
Copy link
Contributor

New Theme

  • Added style to the default design - background image (from https://volunteers.spark.midburn.org/), consistent primary color for links and selected items. small fixes in layout and alignment.
  • Still keep the light theme: for accessibility reasons. added link in the footer to change the theme. theme preference is stored in session storage. added a cover div that fades out nicely after 200ms, until page load and the theme setting is fetched (to avoid buggy looking page load, when not on default theme).
  • Added some missing breadcrumbs and translations.

@shaniqwa
fix UI Bug #708 : change title in edit camp page
4d4592a
@shaniqwa
fix UI Bugs #711 & #712 (camp page)
c2179bc
@shaniqwa
fix UI Bugs #711 & #712 (camp page)
f5b5d5b
@shaniqwa
UI Bug fix #710 - remove publish button
c9daaac
@shaniqwa
UI main navigation - remove unnecessary class 'undefined'
52ba074
@shaniqwa
add he translations
fca7f96
@shaniqwa
edit camp - general comments and layout fix
14fd43e
@shaniqwa
minor style changes, remove underline when hovering buttons, align ch…
4f28b62 
…eckboxes to labels
@shaniqwa
fix top navbar style
4d0aa12
@shaniqwa
add moment.js to app.locals so it can be used for date formatting in …
d442d92 
…jade templates. use to format date in edit camp page. use angular date pipe in index_admin page.
@shaniqwa
add some style: to statistics on home page and members table.
f4f415f
@shaniqwa
fix translation, add icon to 'inactive' status
0373731
@shaniqwa
Merge branch 'master' into ui-style-fixes
7008a81
@shaniqwa
update top nav: put all admin manage tabs under one dropdown. fix bug…
55c7542 
… in whoami page (was getting error when logged in with user without camp).
@shaniqwa
theme styling
48b9c55
@shaniqwa
link to button
fbbfba4
@shaniqwa
layout fix
eabe262
@shaniqwa
Merge remote-tracking branch 'midburn/master' into ui-style-fixes
5aa0257 
* 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
add theme toggle (button in footer) - new theme is now default, white…
0b94fd6 
… theme available. fix some breadcrumbs.
@shaniqwa
Merge branch 'ui-style-fixes' of https://github.com/Midburn/spark int…
0f2c30d 
…o ui-style-fixes

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

# Conflicts:
#	public/stylesheets/main.scss
@amotenko
Copy link
Member

Amazing!

@amotenko amotenko merged commit cb156d6 into master Mar 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amotenko amotenko amotenko approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shaniqwa @amotenko