From a7184670fdb36e8e01efe60ff5ef55c8317d8686 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 21 Jun 2017 11:02:16 +0800
Subject: [PATCH] MDL-56979 group: Template and styles fixes

* Remove custom styles for groups since we're using default Bootstrap
  styles now.
* Hidden input breaks grid layout. Moved it inside the groups column.
* Removed unnecessary 'groups' and 'members' classes. They are not being
  used in JS nor CSS.
---
 group/templates/index.mustache            |  6 +++---
 theme/boost/scss/moodle/core.scss         |  3 ---
 theme/boost/scss/moodle/user.scss         | 15 ---------------
 theme/bootstrapbase/less/moodle/core.less |  3 ---
 theme/bootstrapbase/less/moodle/user.less | 15 ---------------
 theme/bootstrapbase/style/moodle.css      | 15 ---------------
 6 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/group/templates/index.mustache b/group/templates/index.mustache
index fb8be7f75eb..e68bdaf2da4 100644
--- a/group/templates/index.mustache
+++ b/group/templates/index.mustache
@@ -78,8 +78,8 @@
 <form id="groupeditform" action="index.php" method="post">
     <div class="container-fluid groupmanagementtable">
         <div class="row row-fluid rtl-compatible">
-            <input type="hidden" name="id" value="{{courseid}}">
-            <div class="col-md-6 span6 m-b-1 groups">
+            <div class="col-md-6 span6 m-b-1">
+                <input type="hidden" name="id" value="{{courseid}}">
                 <div class="form-group">
                     <label for="groups">
                         <span id="groupslabel">{{#str}}groups{{/str}}</span>
@@ -110,7 +110,7 @@
                     <input type="submit" name="act_showimportgroups" id="showimportgroups" value="{{#str}}importgroups, group{{/str}}" class="btn btn-default" />
                 </div>
             </div>
-            <div class="col-md-6 span6 m-b-1 members">
+            <div class="col-md-6 span6 m-b-1">
                 <div class="form-group">
                     <label for="members">
                         <span id="memberslabel">{{#str}}membersofselectedgroup, group{{/str}}</span>
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 7f757a19c8b..cb149d12d14 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -346,9 +346,6 @@ a.skip:active {
     margin-left: 43px;
 }
 // Group
-#page-group-index #groupeditform {
-    text-align: center;
-}
 
 #doc-contents h1 {
     margin: 1em 0 0 0;
diff --git a/theme/boost/scss/moodle/user.scss b/theme/boost/scss/moodle/user.scss
index 701d8341cef..af83503ca71 100644
--- a/theme/boost/scss/moodle/user.scss
+++ b/theme/boost/scss/moodle/user.scss
@@ -277,21 +277,6 @@
     }
 }
 
-#groupeditform {
-    .groups,
-    .members {
-        min-width: 175px;
-        width: 49%;
-        float: left;
-        text-align: left;
-
-        select {
-            min-width: 175px;
-            max-width: 90%;
-        }
-    }
-}
-
 // Remove the little cog from participants page because we are putting a cog menu there.
 .userlist h3 .action-icon {
     display: none;
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 03e0b8b0500..6a60df6bdd0 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -429,9 +429,6 @@ a.skip:active {
     margin-left: 43px;
 }
 // Group
-#page-group-index #groupeditform {
-    text-align: center;
-}
 #doc-contents h1 {
     margin: 1em 0 0 0;
 }
diff --git a/theme/bootstrapbase/less/moodle/user.less b/theme/bootstrapbase/less/moodle/user.less
index c4df6c0d397..24a48027d9e 100644
--- a/theme/bootstrapbase/less/moodle/user.less
+++ b/theme/bootstrapbase/less/moodle/user.less
@@ -264,21 +264,6 @@
     }
 }
 
-#groupeditform {
-    .groups,
-    .members {
-        min-width: 175px;
-        width: 49%;
-        float: left;
-        text-align: left;
-
-        select {
-            min-width: 175px;
-            max-width: 90%;
-        }
-    }
-}
-
 /** Preferences page */
 .preferences-group {
     ul {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 642399149ee..147abba0c0c 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -2723,9 +2723,6 @@ a.skip:active {
 .blog_entry .content {
   margin-left: 43px;
 }
-#page-group-index #groupeditform {
-  text-align: center;
-}
 #doc-contents h1 {
   margin: 1em 0 0 0;
 }
@@ -9891,18 +9888,6 @@ body.path-question-type .mform fieldset.hidden {
 .profileeditor > .singlebutton input {
   margin: 0;
 }
-#groupeditform .groups,
-#groupeditform .members {
-  min-width: 175px;
-  width: 49%;
-  float: left;
-  text-align: left;
-}
-#groupeditform .groups select,
-#groupeditform .members select {
-  min-width: 175px;
-  max-width: 90%;
-}
 /** Preferences page */
 .preferences-group ul {
   list-style: none;