Merge branch 'MDL-42858_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-11-25 10:49:02 +08:00
commit 9e2bc0490f
4 changed files with 1 additions and 18 deletions

View file

@ -461,14 +461,11 @@ input.titleeditor { vertical-align: text-bottom; }
.dir-rtl #course-category-listings .listitem > div > .float-right {float:left;text-align:left;}
#course-category-listings .listitem[data-visible="0"],
#course-category-listings .listitem[data-visible="0"] a.categoryname,
#course-category-listings .listitem[data-visible="0"] > div > a {color:#AAA;}
#course-category-listings .listitem > div .item-actions .action-hide,
#course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show {display:inline;}
#course-category-listings .listitem > div .item-actions .action-show,
#course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide,
#course-category-listings .listitem[data-visible="0"] > ul .item-actions.category-item-actions .action-hide,
#course-category-listings .listitem[data-visible="0"] > ul .item-actions.category-item-actions .action-show,
#category-listing .listitem:first-child > div .item-actions .action-moveup,
#category-listing .listitem:last-child > div .item-actions .action-movedown,