Permalink
Browse files

Merge branch 'wip-MDL-39819_M25' of git://github.com/gjb2048/moodle i…

…nto MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
2 parents f85cb07 + dfb83eb commit 2b7e18fdedae14a01ef6ba89af40af4a6d3558c7 @danpoltawski danpoltawski committed Jun 4, 2013
Showing with 2 additions and 1 deletion.
  1. +1 −0 theme/bootstrapbase/less/moodle/filemanager.less
  2. +1 −1 theme/bootstrapbase/style/moodle.css
@@ -813,6 +813,7 @@ a.ygtvspacer:hover {
.filemanager-toolbar{
padding: 5px 8px;
min-height: 22px;
+ overflow: hidden;
}
.fp-pathbar {
border-top: 1px solid #BBBBBB;
Oops, something went wrong.

0 comments on commit 2b7e18f

Please sign in to comment.