Merge branch 'MDL-56511-master' of git://github.com/andrewnicols/moodle

admin/tool/lp/templates/manage_competencies_page.mustache

@@ -39,7 +39,7 @@
 </h2>
 <div>{{{framework.description}}}</div>
     <h3>{{#str}}competencies, core_competency{{/str}}</h3>
-    <div class="row-fluid">
+    <div class="row-fluid row">
         <div class="span6 col-lg-6">
             <p>
                 <form data-region="filtercompetencies" data-frameworkid="{{framework.id}}" class="form-inline">
@@ -56,7 +56,7 @@
         </div>
 
         <div class="span6 card col-lg-6">
-            <div class="card-block">
+            <div class="card-block card-body">
                 <div class="card-title">
                     <h4 data-region="selected-competency">{{#str}}selectedcompetency, tool_lp{{/str}}</h4>
                         <span data-region="competencyactionsmenu" class="pull-xs-right">