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.

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

Fix styling glitch when Surveyor modal appears [#127814203] #768

Merged
merged 1 commit into from
Dec 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 25 additions & 29 deletions app/views/layouts/surveyor_custom.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,28 @@
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!!!
%html
%head
%title
= t(:proper)[:header]
= stylesheet_link_tag 'application'
= stylesheet_link_tag 'system_satisfaction'
= surveyor_includes
= csrf_meta_tags
:javascript
window.I18n = #{current_translations.to_json.html_safe};
%body#body
#surveyor-modal.modal-dialog
.modal-content
.modal-header
%button.close{ type: 'button', data: { dismiss: 'modal' } }
%span{ aria: { hidden: 'true' } } ×
%h4.text-center#modal-title
= t(:proper)[:survey][:header]
.modal-body
#modal_errors
.form-group.text-center
= yield
.modal-footer
.center-block
%a.btn.btn-default#survey-submit-button
= t(:actions)[:submit]
%a.btn.btn-default{ data: { dismiss: 'modal' } }
= t(:actions)[:cancel]
= javascript_include_tag('surveyor/jquery-1.9.0',
'surveyor/jquery-ui-1.10.0.custom',
'surveyor/jquery-ui-timepicker-addon',
'surveyor/jquery.selectToUISlider',
'surveyor/jquery.surveyor',
'surveyor/jquery.maskedinput')
:javascript
window.I18n = #{current_translations.to_json.html_safe};
#surveyor-modal.modal-dialog
.modal-content
.modal-header
%button.close{ type: 'button', data: { dismiss: 'modal' } }
%span{ aria: { hidden: 'true' } } ×
%h4.text-center#modal-title
= t(:proper)[:survey][:header]
.modal-body
#modal_errors
.form-group.text-center
= yield
.modal-footer
.center-block
%a.btn.btn-default#survey-submit-button
= t(:actions)[:submit]
%a.btn.btn-default{ data: { dismiss: 'modal' } }
= t(:actions)[:cancel]
8 changes: 8 additions & 0 deletions app/views/service_requests/review.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@
= javascript_include_tag 'system_satisfaction'
= hidden_field_tag :use_system_satisfaction, 'true'
= render 'service_requests/modals/participate_in_survey_modal'
= stylesheet_link_tag('surveyor/reset',
'surveyor/jquery-ui-1.10.0.custom',
'surveyor/jquery-ui-timepicker-addon',
'surveyor/ui.slider.extras',
'surveyor/results',
'surveyor',
'custom')
= stylesheet_link_tag 'system_satisfaction'