Merge branch 'issues_1101_1317_responsive_layout' into dev (20421047) · 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

20421047

Commit 20421047 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'issues_1101_1317_responsive_layout' into dev

parents d11fcf7f ea5ce6ca

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/static_resources.js 1 addition, 0 deletions

lib/static_resources.js
resources/static/css/common.css 8 additions, 13 deletions

resources/static/css/common.css
resources/static/css/m.css 8 additions, 0 deletions

resources/static/css/m.css
resources/static/dialog/controllers/actions.js 2 additions, 0 deletions

resources/static/dialog/controllers/actions.js
resources/static/dialog/css/m.css 42 additions, 38 deletions

resources/static/dialog/css/m.css
resources/static/dialog/css/popup.css 122 additions, 160 deletions

resources/static/dialog/css/popup.css
resources/static/dialog/resources/screen_size_hacks.js 104 additions, 0 deletions

resources/static/dialog/resources/screen_size_hacks.js
resources/static/dialog/views/pick_email.ejs 5 additions, 1 deletion

resources/static/dialog/views/pick_email.ejs
resources/views/dialog.ejs 12 additions, 5 deletions

resources/views/dialog.ejs
resources/views/dialog_layout.ejs 8 additions, 22 deletions

resources/views/dialog_layout.ejs

with 312 additions and 239 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