Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Marina Glancy 2013-11-13 18:24:06 +11:00
commit 4c35937514
4 changed files with 29 additions and 3 deletions

View file

@ -1503,7 +1503,14 @@ img#persona_signin { cursor: pointer; }
display: block;
margin-left: 4px;
padding-left: 4px;
padding-right: 4px;
}
.jsenabled.dir-rtl .moodle-actionmenu[data-enhance] .toggle-display.textmenu {
margin-right: 4px;
margin-left: initial;
}
.jsenabled .moodle-actionmenu[data-enhance] .toggle-display.textmenu .iconsmall {
margin: 8px 4px 0px 2px;
}
@ -1513,6 +1520,11 @@ img#persona_signin { cursor: pointer; }
margin-left: 2px;
}
.jsenabled.dir-rtl .moodle-actionmenu[data-enhance] .toggle-display.textmenu .caret {
margin-right: 2px;
margin-left: initial;
}
.jsenabled .moodle-actionmenu[data-enhanced] .toggle-display {opacity: 1;filter: alpha(opacity=100);}
.jsenabled .moodle-actionmenu[data-enhanced] .menu-action-text {
display: inline;

View file

@ -101,6 +101,7 @@
padding-right: initial;
}
.sitetopic .section .activity .filler,
.course-content .section .activity .filler {
width: 16px;
height: 16px;
@ -116,8 +117,6 @@
white-space: nowrap;
display: inline-block;
}
.dir-rtl .sitetopic .section .activity .commands,
.dir-rtl .course-content .section .activity .commands { padding: 0 0 0 3em;}
.section .activity .moodle-actionmenu .menu > li > *,
.section .activity .moodle-actionmenu .menubar > li > * {

View file

@ -1989,6 +1989,7 @@ img#persona_signin {
display: block;
margin-left: 4px;
padding-left: 4px;
padding-right: 4px;
.iconsmall {
margin: 4px 4px 4px 0px;
@ -2015,6 +2016,20 @@ img#persona_signin {
display:inline;
}
}
&.dir-rtl {
.moodle-actionmenu[data-enhance] {
.toggle-display.textmenu {
margin-left: initial;
margin-right: 4px;
.caret {
margin-left: initial;
margin-right: 2px;
}
}
}
}
}
.moodle-actionmenu[data-enhanced].show {

File diff suppressed because one or more lines are too long