Skip to content

Commit

Permalink
Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle
Browse files Browse the repository at this point in the history
Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
danpoltawski committed Sep 2, 2013
2 parents 70189e7 + f021743 commit fff084b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions theme/base/style/core.css
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ input#id_externalurl {direction:ltr;}
.groupmanagementtable #potentialcell {width: 42%;}
.groupmanagementtable #buttonscell {width: 16%;}
.groupmanagementtable #buttonscell input {width: 80%;}
.groupmanagementtable #buttonscell p.arrow_button input {width: auto;min-width: 80%;margin: 0 auto;}
.groupmanagementtable #removeselect_wrapper,
.groupmanagementtable #addselect_wrapper {width: 100%;}
.groupmanagementtable #removeselect_wrapper label,
Expand Down
5 changes: 5 additions & 0 deletions theme/bootstrapbase/less/moodle/core.less
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,11 @@ a.skip:active {
.groupmanagementtable #buttonscell {
width: 16%;
}
.groupmanagementtable #buttonscell p.arrow_button input {
width: auto;
min-width: 80%;
margin: 0 auto;
}
.groupmanagementtable #removeselect_wrapper,
.groupmanagementtable #addselect_wrapper {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit fff084b

Please sign in to comment.