Update Bootstrap to v4.1, fix chosen.js and pagedown on multiple sites
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
// default value for fetch will always be evaluated even if it is not returned
|
||||
- link_target = local_assigns.fetch(:path, false) || send(:"edit_#{object.class.name.underscore}_path", object)
|
||||
= link_to(t('shared.edit'), link_target, class: 'btn btn-default pull-right')
|
||||
= link_to(t('shared.edit'), link_target, class: 'btn btn-secondary float-right')
|
||||
|
@@ -5,6 +5,6 @@
|
||||
= row(label: 'file.hidden', value: file.hidden)
|
||||
= row(label: 'file.read_only', value: file.read_only)
|
||||
- if file.teacher_defined_test?
|
||||
= row(label: 'file.feedback_message', value: render_markdown(file.feedback_message))
|
||||
= row(label: 'file.feedback_message', value: render_markdown(file.feedback_message), class: 'm-0')
|
||||
= row(label: 'file.weight', value: file.weight)
|
||||
= row(label: 'file.content', value: file.native_file? ? link_to(file.native_file.file.filename, file.native_file.url) : code_tag(file.content))
|
||||
|
@@ -1,11 +1,9 @@
|
||||
.well
|
||||
.card.card-body.bg-light
|
||||
= search_form_for(@search, class: 'clearfix filter-form form-inline') do |f|
|
||||
= yield(f)
|
||||
.btn-group.pull-right
|
||||
button.btn.btn-default.btn-sm type='submit' = t('shared.apply_filters')
|
||||
button.btn.btn-default.btn-sm.dropdown-toggle data-toggle='dropdown' type='button'
|
||||
span.caret
|
||||
span.sr-only Toggle Dropdown
|
||||
.btn-group.ml-auto
|
||||
button.btn.btn-primary type='submit' = t('shared.apply_filters')
|
||||
button.btn.btn-primary.dropdown-toggle data-toggle='dropdown' type='button'
|
||||
ul.dropdown-menu role='menu'
|
||||
li
|
||||
a href=request.path = t('shared.reset_filters')
|
||||
a.dropdown-item href=request.path = t('shared.reset_filters')
|
||||
|
@@ -2,10 +2,10 @@
|
||||
.modal-dialog class=local_assigns[:classes]
|
||||
.modal-content
|
||||
.modal-header
|
||||
h4#modal-title.modal-title = title
|
||||
button.close data-dismiss='modal' type='button'
|
||||
span aria-hidden=true ×
|
||||
span.sr-only Close
|
||||
h4#modal-title.modal-title = title
|
||||
.modal-body
|
||||
- if local_assigns.has_key?(:body)
|
||||
= body
|
||||
|
@@ -1,3 +1,2 @@
|
||||
- if (pagination = will_paginate(collection, container: false)).present?
|
||||
.text-center
|
||||
ul.pagination = pagination
|
||||
- if (pagination = will_paginate(collection, container: false, renderer: WillPaginate::ActionView::Bootstrap4LinkRenderer)).present?
|
||||
ul.pagination.justify-content-center = pagination
|
||||
|
@@ -1 +1 @@
|
||||
= f.submit(class: 'btn btn-default', value: t(object.new_record? ? 'shared.create' : 'shared.update', model: object.class.model_name.human))
|
||||
= f.submit(class: 'btn btn-primary', value: t(object.new_record? ? 'shared.create' : 'shared.update', model: object.class.model_name.human))
|
||||
|
Reference in New Issue
Block a user