mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-38923 theme_bootstrapbase: tidied up dock implementation
Also: * Changed to a CSS based compacting solution * Converted dock colours to variables * RTL fixes for the dock
This commit is contained in:
parent
a799631bb1
commit
2a203eee8d
11 changed files with 141 additions and 202 deletions
|
@ -204,12 +204,10 @@ M.core.dock.fixTitleOrientation = function(title, text) {
|
|||
|
||||
// Move the title into position
|
||||
title.setStyles({
|
||||
'margin' : '0',
|
||||
'padding' : '0',
|
||||
'position' : 'relative',
|
||||
'fontSize' : fontsize,
|
||||
'width' : width,
|
||||
'top' : width/2
|
||||
'top' : (width - height)/2
|
||||
});
|
||||
|
||||
// Positioning is different when in RTL mode.
|
||||
|
@ -760,14 +758,16 @@ DOCK.prototype = {
|
|||
showregions = false,
|
||||
i;
|
||||
// First look for understood regions.
|
||||
Y.all(SELECTOR.blockregion).each(function(){
|
||||
Y.all(SELECTOR.blockregion).each(function(region){
|
||||
var regionname = region.getData('blockregion');
|
||||
if (region.all('.block').size() > 0) {
|
||||
populatedblockregions++;
|
||||
BODY.addClass('used-region-'+regionname);
|
||||
BODY.removeClass('empty-region-'+regionname);
|
||||
BODY.removeClass('docked-region-'+regionname);
|
||||
} else {
|
||||
BODY.addClass('empty-region-'+regionname);
|
||||
BODY.addClass('docked-region-'+regionname);
|
||||
BODY.removeClass('used-region-'+regionname);
|
||||
}
|
||||
});
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -203,12 +203,10 @@ M.core.dock.fixTitleOrientation = function(title, text) {
|
|||
|
||||
// Move the title into position
|
||||
title.setStyles({
|
||||
'margin' : '0',
|
||||
'padding' : '0',
|
||||
'position' : 'relative',
|
||||
'fontSize' : fontsize,
|
||||
'width' : width,
|
||||
'top' : width/2
|
||||
'top' : (width - height)/2
|
||||
});
|
||||
|
||||
// Positioning is different when in RTL mode.
|
||||
|
@ -753,14 +751,16 @@ DOCK.prototype = {
|
|||
showregions = false,
|
||||
i;
|
||||
// First look for understood regions.
|
||||
Y.all(SELECTOR.blockregion).each(function(){
|
||||
Y.all(SELECTOR.blockregion).each(function(region){
|
||||
var regionname = region.getData('blockregion');
|
||||
if (region.all('.block').size() > 0) {
|
||||
populatedblockregions++;
|
||||
BODY.addClass('used-region-'+regionname);
|
||||
BODY.removeClass('empty-region-'+regionname);
|
||||
BODY.removeClass('docked-region-'+regionname);
|
||||
} else {
|
||||
BODY.addClass('empty-region-'+regionname);
|
||||
BODY.addClass('docked-region-'+regionname);
|
||||
BODY.removeClass('used-region-'+regionname);
|
||||
}
|
||||
});
|
||||
|
|
8
lib/yui/src/dock/js/dock.js
vendored
8
lib/yui/src/dock/js/dock.js
vendored
|
@ -202,12 +202,10 @@ M.core.dock.fixTitleOrientation = function(title, text) {
|
|||
|
||||
// Move the title into position
|
||||
title.setStyles({
|
||||
'margin' : '0',
|
||||
'padding' : '0',
|
||||
'position' : 'relative',
|
||||
'fontSize' : fontsize,
|
||||
'width' : width,
|
||||
'top' : width/2
|
||||
'top' : (width - height)/2
|
||||
});
|
||||
|
||||
// Positioning is different when in RTL mode.
|
||||
|
@ -758,14 +756,16 @@ DOCK.prototype = {
|
|||
showregions = false,
|
||||
i;
|
||||
// First look for understood regions.
|
||||
Y.all(SELECTOR.blockregion).each(function(){
|
||||
Y.all(SELECTOR.blockregion).each(function(region){
|
||||
var regionname = region.getData('blockregion');
|
||||
if (region.all('.block').size() > 0) {
|
||||
populatedblockregions++;
|
||||
BODY.addClass('used-region-'+regionname);
|
||||
BODY.removeClass('empty-region-'+regionname);
|
||||
BODY.removeClass('docked-region-'+regionname);
|
||||
} else {
|
||||
BODY.addClass('empty-region-'+regionname);
|
||||
BODY.addClass('docked-region-'+regionname);
|
||||
BODY.removeClass('used-region-'+regionname);
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue