Browse code fixed merge conflict and set max width to h1 tags to prevent overlap with alert/notice messages dev
commit 211e91883747eb03ca0b2f93c8c7e94ee2c2615b 2 parents 60a01a3 + 4df5293 briley authored on 11 Jul 2017

Showing 36 changed files

• app/controllers/registrations_controller.rb
• app/models/language.rb
• app/views/annotations/_add_annotation.html.erb
• app/views/annotations/_edit_annotation.html.erb
• app/views/annotations/_show_annotation.html.erb
• app/views/devise/passwords/edit.html.erb
• app/views/devise/passwords/new.html.erb
• app/views/devise/registrations/_password_details.html.erb
• app/views/devise/registrations/_personal_details.html.erb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/notes/_archive.html.erb
• app/views/orgs/shibboleth_ds.html.erb
• app/views/phases/_edit_phase.html.erb
• app/views/phases/_note.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_available_templates.html.erb
• app/views/plans/_edit_details.html.erb
• app/views/plans/new.html.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/questions/_preview_question.html.erb
• app/views/questions/_show_question.html.erb
• app/views/sections/_add_section.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/settings/phases/_export_formatting_form.html.erb
• app/views/shared/_accessible_submit_button.html.erb
• app/views/shared/_login_form.html.erb
• app/views/shared/_register_form.html.erb
• app/views/templates/_edit_annotations.html.erb
• app/views/templates/_edit_template.html.erb
• app/views/templates/admin_new.html.erb
• app/views/users/_notification_preferences.html.erb
• lib/assets/stylesheets/dmproadmap/base.scss

Ignore Space Show notes View app/controllers/registrations_controller.rb

Ignore Space Show notes View app/models/language.rb

Ignore Space Show notes View app/views/annotations/_add_annotation.html.erb

Ignore Space Show notes View app/views/annotations/_edit_annotation.html.erb

Ignore Space Show notes View app/views/annotations/_show_annotation.html.erb

Ignore Space Show notes View app/views/devise/passwords/edit.html.erb

Ignore Space Show notes View app/views/devise/passwords/new.html.erb

Ignore Space Show notes View app/views/devise/registrations/_password_details.html.erb

Ignore Space Show notes View app/views/devise/registrations/_personal_details.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb

Ignore Space Show notes View app/views/guidances/admin_edit.html.erb

Ignore Space Show notes View app/views/guidances/admin_new.html.erb

Ignore Space Show notes View app/views/notes/_archive.html.erb

Ignore Space Show notes View app/views/orgs/shibboleth_ds.html.erb

Ignore Space Show notes View app/views/phases/_edit_phase.html.erb

Ignore Space Show notes View app/views/phases/_note.html.erb

Ignore Space Show notes View app/views/phases/edit.html.erb

Ignore Space Show notes View app/views/plans/_available_templates.html.erb

Ignore Space Show notes View app/views/plans/_edit_details.html.erb

Ignore Space Show notes View app/views/plans/new.html.erb

Ignore Space Show notes View app/views/questions/_add_question.html.erb

Ignore Space Show notes View app/views/questions/_edit_question.html.erb

Ignore Space Show notes View app/views/questions/_preview_question.html.erb

Ignore Space Show notes View app/views/questions/_show_question.html.erb

Ignore Space Show notes View app/views/sections/_add_section.html.erb

Ignore Space Show notes View app/views/sections/_edit_section.html.erb

Ignore Space Show notes View app/views/settings/phases/_export_formatting_form.html.erb

Ignore Space Show notes View app/views/shared/_accessible_submit_button.html.erb

Ignore Space Show notes View app/views/shared/_login_form.html.erb

Ignore Space Show notes View app/views/shared/_register_form.html.erb

Ignore Space Show notes View app/views/templates/_edit_annotations.html.erb

Ignore Space Show notes View app/views/templates/_edit_template.html.erb

Ignore Space Show notes View app/views/templates/admin_new.html.erb

Ignore Space Show notes View app/views/users/_notification_preferences.html.erb

Ignore Space Show notes View lib/assets/stylesheets/dmproadmap/base.scss

Show line notes below