Skip to content
Permalink
Browse files

Merge branch 'MDL-45076-25' of git://github.com/FMCorz/moodle into MO…

…ODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
danpoltawski committed Apr 16, 2014
2 parents 0f2e18f + e969f5f commit 58eea2b5000185018c6dde1aef60550f467d26ca
Showing with 18 additions and 13 deletions.
  1. +17 −12 theme/bootstrapbase/less/moodle/user.less
  2. +1 −1 theme/bootstrapbase/style/moodle.css
@@ -54,18 +54,23 @@
text-align: left; text-align: left;
padding: 4px; padding: 4px;
} }
.userlist table.controls { .userlist {
width: 100%; table.controls {
} width: 100%;
.userlist table.controls tr { tr {
vertical-align: top; vertical-align: top;
} }
.userlist table.controls td.right, .right {
.userlist table.controls td.left { text-align: right;
padding: 4px; }
} .groupselector {
.userlist table.controls .right { margin-bottom: 0;
text-align: right; margin-top: 0;
label {
display: block;
}
}
}
} }
.userinfobox { .userinfobox {
width: 100%; width: 100%;

Large diffs are not rendered by default.

0 comments on commit 58eea2b

Please sign in to comment.
You can’t perform that action at this time.