Merge branch 'feature_1020_secondary_button_color' into dev (b7c99945) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

b7c99945

Commit b7c99945 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'feature_1020_secondary_button_color' into dev

parents 101a39cd b506c758

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

resources/static/css/common.css 19 additions, 0 deletions

resources/static/css/common.css
resources/static/dialog/controllers/add_email.js 1 addition, 1 deletion

resources/static/dialog/controllers/add_email.js
resources/static/dialog/controllers/forgot_password.js 1 addition, 1 deletion

resources/static/dialog/controllers/forgot_password.js
resources/static/dialog/css/popup.css 0 additions, 9 deletions

resources/static/dialog/css/popup.css
resources/static/dialog/views/add_email.ejs 1 addition, 1 deletion

resources/static/dialog/views/add_email.ejs
resources/static/dialog/views/confirm_email.ejs 1 addition, 1 deletion

resources/static/dialog/views/confirm_email.ejs
resources/static/dialog/views/forgot_password.ejs 1 addition, 1 deletion

resources/static/dialog/views/forgot_password.ejs
resources/static/dialog/views/required_email.ejs 1 addition, 1 deletion

resources/static/dialog/views/required_email.ejs
resources/static/dialog/views/verify_primary_user.ejs 1 addition, 1 deletion

resources/static/dialog/views/verify_primary_user.ejs

with 26 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment