Merge branch '44944-27' of git://github.com/samhemelryk/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Marina Glancy 2014-04-09 09:48:41 +08:00
commit 47a1315f02
2 changed files with 2 additions and 1 deletions

View file

@ -16,6 +16,7 @@
display:none;
}
.content-only #region-main.span9, // Two column layout with no block or all blocks docked.
.empty-region-side-post #region-bs-main-and-pre.span9, // LTR with no post area.
.empty-region-side-pre #region-bs-main-and-post.span9, // RTL with no pre area.
.empty-region-side-post #region-bs-main-and-post.span9 #region-main.span8, // RTL with no post area.

File diff suppressed because one or more lines are too long