Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
David Monllao committed Dec 17, 2014
2 parents a646812 + d0508fd commit ceb7769
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions theme/bootstrapbase/less/moodle/blocks.less
Expand Up @@ -38,7 +38,7 @@
height: 12px;
}
img.actionmenu {
width:auto;
width: auto;
}
}
}
Expand Down Expand Up @@ -233,19 +233,19 @@
// RTL styles for blocks in general.
.block {
.header {
text-align:right;
text-align: right;
h2 {
text-align:right;
text-align: right;
}
.commands {
text-align: left;
.block_action {
float: left;
> * {
margin-left:0;
margin-right:3px;
margin-left: 0;
margin-right: 3px;
}
}
.block_action {
float: left;
.commands {
text-align: left;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit ceb7769

Please sign in to comment.