MDL-55799 inplace_editable: add form-control class to fields
authorSimey Lameze <simey@moodle.com>
Fri, 28 Oct 2016 05:01:42 +0000 (13:01 +0800)
committerSimey Lameze <simey@moodle.com>
Fri, 28 Oct 2016 07:04:54 +0000 (15:04 +0800)
lib/amd/build/inplace_editable.min.js
lib/amd/src/inplace_editable.js
theme/boost/scss/moodle/core.scss

index 6fe2947..372f328 100644 (file)
Binary files a/lib/amd/build/inplace_editable.min.js and b/lib/amd/build/inplace_editable.min.js differ
index 4170825..bc79fda 100644 (file)
@@ -129,7 +129,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                         attr('id', uniqueId('id_inplacevalue_', 20)).
                         attr('value', el.attr('data-value')).
                         attr('aria-describedby', instr.attr('id')).
-                        addClass('ignoredirty'),
+                        addClass('ignoredirty').
+                        addClass('form-control'),
                     lbl = $('<label class="accesshide">' + mainelement.attr('data-editlabel') + '</label>').
                         attr('for', inputelement.attr('id'));
                 el.html('').append(instr).append(lbl).append(inputelement);
@@ -163,8 +164,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
 
         var turnEditingOnSelect = function(el, options) {
             var i,
-                inputelement = $('<select></select>')
-                    .attr('id', uniqueId('id_inplacevalue_', 20)),
+                inputelement = $('<select></select>').
+                    attr('id', uniqueId('id_inplacevalue_', 20)).
+                    addClass('custom-select'),
                 lbl = $('<label class="accesshide">' + mainelement.attr('data-editlabel') + '</label>')
                     .attr('for', inputelement.attr('id'));
             for (i in options) {
index 5dc02c1..ae81ece 100644 (file)
@@ -2008,7 +2008,6 @@ dd:after {
 
         input {
             width: 330px;
-            height: 16px;
             vertical-align: text-bottom;
             margin-bottom: 0;
         }