mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47340-master' of git://github.com/jethac/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-10-24 11:54:42 +08:00 committed by Eloy Lafuente (stronk7)
commit c785cc9893
5 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
theme/base/style/core.css
View File

@ -1993,7 +1993,7 @@ img#persona_signin { cursor: pointer; }
.moodle-actionmenu[data-enhanced].show .menu {position: absolute;text-align:left;z-index: 1000;display: block;background-color: #fff;border: 1px solid #ccc;-webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;-webkit-box-shadow: 5px 5px 20px 0 #666666;-moz-box-shadow: 5px 5px 20px 0 #666666;box-shadow: 5px 5px 20px 0 #666666;}
.moodle-actionmenu[data-enhanced].show .menu a {
display: block;
padding: 4px 1em 4px 28px;
padding: 2px 1em 2px 28px;
color: #333333;
}
.moodle-actionmenu[data-enhanced].show .menu a > img {
@ -2002,6 +2002,11 @@ img#persona_signin { cursor: pointer; }
width: 12px;
height: 12px;
}
.moodle-actionmenu[data-enhanced].show .menu a > img,
.moodle-actionmenu[data-enhanced].show .menu a > span {
display: inline-block;
vertical-align: middle;
}
.moodle-actionmenu[data-enhanced].show .menu a:hover {color: #ffffff;background-color: #0088cc;}
.moodle-actionmenu[data-enhanced].show .menu a:first-child {-webkit-border-top-right-radius: 4px;border-top-right-radius: 4px;-webkit-border-top-left-radius: 4px;border-top-left-radius: 4px;-moz-border-radius-topright: 4px;-moz-border-radius-topleft: 4px;}
.moodle-actionmenu[data-enhanced].show .menu a:last-child {-webkit-border-bottom-right-radius: 4px;border-bottom-right-radius: 4px;-webkit-border-bottom-left-radius: 4px;border-bottom-left-radius: 4px;-moz-border-radius-bottomright: 4px;-moz-border-radius-bottomleft: 4px;}
@ -2011,8 +2016,10 @@ img#persona_signin { cursor: pointer; }
.block .moodle-actionmenu {text-align: right;}
.dir-rtl .block .moodle-actionmenu {text-align: right;}
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu a { display: block; padding: 2px 28px 2px 1em; }
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu {text-align: right;right: auto;left: 0;}
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu .iconsmall {margin-right: 0;margin-left: 8px;}
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu .iconsmall,
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu .smallicon { margin-right: -24px; margin-left: 4px; }
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tl-bl {top: 100%;left: 0;margin-top: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tr-bl {top: 100%;right: 100%;}

8
theme/base/style/course.css
View File

@ -414,6 +414,8 @@ input.titleeditor { vertical-align: text-bottom; }
#course-category-listings li[data-selected='1']:last-of-type > div {border-bottom-color:#e1e1e8;}
#course-category-listings > div > div > ul.ml > li:first-child > div {border-top:0;}
#course-category-listings .moodle-actionmenu.show .menu li { line-height: 20px; }
#course-category-listings .listing-actions .moodle-actionmenu:not([data-enhanced]) li {line-height:normal;}
#course-category-listings .listing-actions .moodle-actionmenu:not([data-enhanced]) > .menubar li,
#course-category-listings .listing-actions .moodle-actionmenu:not([data-enhanced]) > .menubar a,
@ -434,10 +436,9 @@ input.titleeditor { vertical-align: text-bottom; }
}
#course-category-listings .item-actions {margin-right:1em;display:inline-block;display:initial;}
#course-category-listings .item-actions img {margin: 0 4px;}
#course-category-listings .item-actions .menubar img {vertical-align:inherit;}
#course-category-listings .item-actions .menubar img,
#course-category-listings .item-actions > a img { margin: 0 4px; vertical-align:inherit; }
#course-category-listings .item-actions .menu img {max-width:none;width:12px;}
#course-category-listings .item-actions.show .menu a {padding:4px 1em 4px 4px;}
#course-category-listings li .tree-icon {margin-left:0;}
#course-category-listings li li .tree-icon {margin-left:1em;}
@ -465,6 +466,7 @@ input.titleeditor { vertical-align: text-bottom; }
#category-listing .course-count {color:#a1a1a8;margin-right:2em;min-width:3.5em;display:inline-block;}
#category-listing .listitem.collapsed > ul.ml {display: none;}
#category-listing .course-count .smallicon {width:0.8em;height:0.8em;margin:0 0.3em;}
.dir-rtl #category-listing .course-count { margin-left: 2em; margin-right: 0; }
#category-listing .listitem > div > .ba-checkbox {vertical-align:middle;width:2.2em;text-align:center;margin:-1px 0;padding-top:2px;margin-right:0.5em;}
.dir-rtl #category-listing .listitem > div > .ba-checkbox {margin-left:0.5em;margin-right:0.5em;}

17
theme/bootstrapbase/less/moodle/core.less
View File

@ -2066,7 +2066,8 @@ img#persona_signin {
padding-left: 4px;
padding-right: 4px;
.iconsmall {
.iconsmall,
.smallicon {
margin: 4px 4px 4px 0px;
padding: 8px 4px 0px 2px;
vertical-align: text-bottom;
@ -2143,8 +2144,10 @@ img#persona_signin {
img {
vertical-align: middle;
}
.iconsmall {
.iconsmall,
.smallicon {
margin: 4px 4px 4px -24px;
padding: 4px;
}
> li {
display:block;
@ -2183,9 +2186,13 @@ img#persona_signin {
text-align: right;
left: 0;
right: auto;
.iconsmall {
margin-right:0;
margin-left:8px;
a {
padding: 2px 28px 2px 1em;
}
.iconsmall,
.smallicon {
margin-right: -24px;
margin-left: 4px;
}
/** bottom left of button **/

12
theme/bootstrapbase/less/moodle/course.less
View File

@ -941,15 +941,16 @@ span.editinstructions {
margin-right:1em;
display:inline-block;
display:initial;
img {
> a img,
.menubar img {
margin: 0 4px;
height:12px;
padding: 0;
vertical-align: inherit;
}
&.show .menu {
a {
padding:4px 1em 4px 4px;
li {
line-height: 20px;
}
img {
width: 12px;
@ -1194,6 +1195,11 @@ span.editinstructions {
}
.course-count {
margin-left:2rem;
.smallicon {
margin-left: 0px;
margin-right: 4px;
}
}
.bulk-action-checkbox {
margin-left: -3px;

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long