mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle
Conflicts: theme/bootstrapbase/style/moodle.css
This commit is contained in:
commit
81b07e655c
12 changed files with 177 additions and 160 deletions
|
@ -58,4 +58,43 @@ class behat_blocks extends behat_base {
|
|||
return $steps;
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens a block's actions menu if it is not already opened.
|
||||
*
|
||||
* @Given /^I open the "(?P<block_name_string>(?:[^"]|\\")*)" blocks action menu$/
|
||||
* @throws DriverException The step is not available when Javascript is disabled
|
||||
* @param string $blockname
|
||||
* @return Given
|
||||
*/
|
||||
public function i_open_the_blocks_action_menu($blockname) {
|
||||
|
||||
if (!$this->running_javascript()) {
|
||||
throw new DriverException('Blocks action menu not available when Javascript is disabled');
|
||||
}
|
||||
|
||||
// If it is already opened we do nothing.
|
||||
$blocknode = $this->get_block_node($blockname);
|
||||
$classes = array_flip(explode(' ', $blocknode->getAttribute('class')));
|
||||
if (!empty($classes['action-menu-shown'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
return new Given('I click on "a[role=\'menuitem\']" "css_element" in the "' . $this->escape($blockname) . '" "block"');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the DOM node of the block from <div>.
|
||||
*
|
||||
* @throws ElementNotFoundException Thrown by behat_base::find
|
||||
* @param string $blockname The block name
|
||||
* @return NodeElement
|
||||
*/
|
||||
protected function get_block_node($blockname) {
|
||||
|
||||
$blockname = $this->getSession()->getSelectorsHandler()->xpathLiteral($blockname);
|
||||
$xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block ')][contains(., $blockname)]";
|
||||
|
||||
return $this->find('xpath', $xpath);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ Feature: Add and configure blocks throughout the site
|
|||
And I log in as "manager1"
|
||||
And I follow "Turn editing on"
|
||||
And I add the "Comments" block
|
||||
And I click on "Actions" "link" in the "Comments" "block"
|
||||
And I open the "Comments" blocks action menu
|
||||
And I follow "Configure Comments block"
|
||||
And I fill the moodle form with:
|
||||
| Page contexts | Display throughout the entire site |
|
||||
|
@ -27,7 +27,7 @@ Feature: Add and configure blocks throughout the site
|
|||
Then I should see "Comments" in the "Comments" "block"
|
||||
And I should see "Save comment" in the "Comments" "block"
|
||||
And I am on homepage
|
||||
And I click on "Actions" "link" in the "Comments" "block"
|
||||
And I open the "Comments" blocks action menu
|
||||
And I follow "Configure Comments block"
|
||||
And I fill the moodle form with:
|
||||
| Default weight | -10 (first) |
|
||||
|
|
|
@ -42,6 +42,7 @@ Feature: Block appearances
|
|||
And I follow "Course 1"
|
||||
And I follow "Turn editing on"
|
||||
And I add the "Comments" block
|
||||
And I open the "Comments" blocks action menu
|
||||
And I follow "Configure Comments block"
|
||||
And I fill the moodle form with:
|
||||
| Display on page types | Any page |
|
||||
|
@ -52,6 +53,7 @@ Feature: Block appearances
|
|||
When I follow "Test survey name"
|
||||
Then I should see "Comments" in the "Comments" "block"
|
||||
And I follow "Course 1"
|
||||
And I open the "Comments" blocks action menu
|
||||
And I follow "Configure Comments block"
|
||||
And I fill the moodle form with:
|
||||
| Display on page types | Any course page |
|
||||
|
@ -63,6 +65,7 @@ Feature: Block appearances
|
|||
@javascript
|
||||
Scenario: Block settings can be modified so that a block can be hidden or moved
|
||||
When I follow "Test book name"
|
||||
And I open the "Comments" blocks action menu
|
||||
And I follow "Configure Comments block"
|
||||
And I fill the moodle form with:
|
||||
| Visible | No |
|
||||
|
@ -72,6 +75,7 @@ Feature: Block appearances
|
|||
Then I should not see "Comments"
|
||||
And I expand "Course administration" node
|
||||
And I follow "Turn editing on"
|
||||
And I open the "Comments" blocks action menu
|
||||
And I follow "Configure Comments block"
|
||||
And I fill the moodle form with:
|
||||
| Visible | Yes |
|
||||
|
|
|
@ -15,7 +15,7 @@ Feature: The context of a block can always be returned to it's original state.
|
|||
And I add the "Tags" block
|
||||
Then I should see "Tags" in the "Tags" "block"
|
||||
And I click on "Participants" "link" in the "//li[p/span[contains(normalize-space(string(.)), 'Current course')]]" "xpath_element"
|
||||
And I click on "Actions" "link" in the "Tags" "block"
|
||||
And I open the "Tags" blocks action menu
|
||||
And I follow "Configure Tags block"
|
||||
And I fill the moodle form with:
|
||||
| Display on page types | Any page |
|
||||
|
@ -25,7 +25,7 @@ Feature: The context of a block can always be returned to it's original state.
|
|||
| Assignment name | Assignment1 |
|
||||
| Description | Description |
|
||||
And I follow "Assignment1"
|
||||
And I click on "Actions" "link" in the "Tags" "block"
|
||||
And I open the "Tags" blocks action menu
|
||||
And I follow "Configure Tags block"
|
||||
And I fill the moodle form with:
|
||||
| Display on page types | Any assignment module page |
|
||||
|
@ -41,7 +41,7 @@ Feature: The context of a block can always be returned to it's original state.
|
|||
| Description | Description |
|
||||
And I follow "Assignment2"
|
||||
And I should see "Tags" in the "Tags" "block"
|
||||
And I click on "Actions" "link" in the "Tags" "block"
|
||||
And I open the "Tags" blocks action menu
|
||||
And I follow "Configure Tags block"
|
||||
And I fill the moodle form with:
|
||||
| Display on page types | Any page |
|
||||
|
|
|
@ -859,7 +859,8 @@ class core_course_renderer extends plugin_renderer_base {
|
|||
}
|
||||
} else {
|
||||
// No link, so display only content.
|
||||
$output = html_writer::tag('div', $accesstext . $content, array('class' => $textclasses));
|
||||
$output = html_writer::tag('div', $accesstext . $content,
|
||||
array('class' => 'contentwithoutlink ' . $textclasses));
|
||||
}
|
||||
return $output;
|
||||
}
|
||||
|
@ -982,23 +983,34 @@ class core_course_renderer extends plugin_renderer_base {
|
|||
$output .= course_get_cm_move($mod, $sectionreturn);
|
||||
}
|
||||
|
||||
$output .= html_writer::start_tag('div', array('class' => $indentclasses));
|
||||
$output .= html_writer::start_tag('div', array('class' => 'mod-indent-outer'));
|
||||
|
||||
// Start the div for the activity title, excluding the edit icons.
|
||||
$output .= html_writer::start_tag('div', array('class' => 'activityinstance'));
|
||||
// This div is used to indent the content.
|
||||
$output .= html_writer::div('', $indentclasses);
|
||||
|
||||
// Start a wrapper for the actual content to keep the indentation consistent
|
||||
$output .= html_writer::start_tag('div');
|
||||
|
||||
// Display the link to the module (or do nothing if module has no url)
|
||||
$output .= $this->course_section_cm_name($mod, $displayoptions);
|
||||
if ($this->page->user_is_editing()) {
|
||||
$output .= ' ' . course_get_cm_rename_action($mod, $sectionreturn);
|
||||
$cmname = $this->course_section_cm_name($mod, $displayoptions);
|
||||
|
||||
if (!empty($cmname)) {
|
||||
// Start the div for the activity title, excluding the edit icons.
|
||||
$output .= html_writer::start_tag('div', array('class' => 'activityinstance'));
|
||||
$output .= $cmname;
|
||||
|
||||
|
||||
if ($this->page->user_is_editing()) {
|
||||
$output .= ' ' . course_get_cm_rename_action($mod, $sectionreturn);
|
||||
}
|
||||
|
||||
// Module can put text after the link (e.g. forum unread)
|
||||
$output .= $mod->get_after_link();
|
||||
|
||||
// Closing the tag which contains everything but edit icons. Content part of the module should not be part of this.
|
||||
$output .= html_writer::end_tag('div'); // .activityinstance
|
||||
}
|
||||
|
||||
// Module can put text after the link (e.g. forum unread)
|
||||
$output .= $mod->get_after_link();
|
||||
|
||||
// Closing the tag which contains everything but edit icons. Content part of the module should not be part of this.
|
||||
$output .= html_writer::end_tag('div'); // .activityinstance
|
||||
|
||||
// If there is content but NO link (eg label), then display the
|
||||
// content here (BEFORE any icons). In this case cons must be
|
||||
// displayed after the content so that it makes more sense visually
|
||||
|
@ -1033,7 +1045,10 @@ class core_course_renderer extends plugin_renderer_base {
|
|||
// show availability info (if module is not available)
|
||||
$output .= $this->course_section_cm_availability($mod, $displayoptions);
|
||||
|
||||
$output .= html_writer::end_tag('span'); // $indentclasses
|
||||
$output .= html_writer::end_tag('div'); // $indentclasses
|
||||
|
||||
// End of indentation div.
|
||||
$output .= html_writer::end_tag('div');
|
||||
|
||||
$output .= html_writer::end_tag('div');
|
||||
return $output;
|
||||
|
|
6
course/yui/dragdrop/dragdrop.js
vendored
6
course/yui/dragdrop/dragdrop.js
vendored
|
@ -1,9 +1,9 @@
|
|||
YUI.add('moodle-course-dragdrop', function(Y) {
|
||||
|
||||
var CSS = {
|
||||
ACTIONAREA: '.actions',
|
||||
ACTIVITY : 'activity',
|
||||
ACTIVITYINSTANCE : 'activityinstance',
|
||||
COMMANDSPAN : '.commands',
|
||||
CONTENT : 'content',
|
||||
COURSECONTENT : 'course-content',
|
||||
EDITINGMOVE : 'editing_move',
|
||||
|
@ -375,8 +375,8 @@ YUI.add('moodle-course-dragdrop', function(Y) {
|
|||
var dropnode = e.drop.get('node');
|
||||
|
||||
// Add spinner if it not there
|
||||
var activityinstance = dragnode.one('.' + CSS.ACTIVITYINSTANCE);
|
||||
var spinner = M.util.add_spinner(Y, activityinstance);
|
||||
var actionarea = dragnode.one(CSS.ACTIONAREA);
|
||||
var spinner = M.util.add_spinner(Y, actionarea);
|
||||
|
||||
var params = {};
|
||||
|
||||
|
|
22
course/yui/toolboxes/toolboxes.js
vendored
22
course/yui/toolboxes/toolboxes.js
vendored
|
@ -9,6 +9,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
|
|||
var CSS = {
|
||||
ACTIVITYINSTANCE : 'activityinstance',
|
||||
AVAILABILITYINFODIV : 'div.availabilityinfo',
|
||||
CONTENTWITHOUTLINK : 'contentwithoutlink',
|
||||
CONDITIONALHIDDEN : 'conditionalhidden',
|
||||
DIMCLASS : 'dimmed',
|
||||
DIMMEDTEXT : 'dimmed_text',
|
||||
|
@ -25,6 +26,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
|
|||
},
|
||||
// The CSS selectors we use.
|
||||
SELECTOR = {
|
||||
ACTIONAREA: '.actions',
|
||||
ACTIONLINKTEXT : '.actionlinktext',
|
||||
ACTIVITYACTION : 'a.cm-edit-action[data-action], a.editing_title',
|
||||
ACTIVITYFORM : '.' + CSS.ACTIVITYINSTANCE + ' form',
|
||||
|
@ -35,11 +37,13 @@ YUI.add('moodle-course-toolboxes', function(Y) {
|
|||
ACTIVITYTITLE : 'input[name=title]',
|
||||
COMMANDSPAN : '.commands',
|
||||
CONTENTAFTERLINK : 'div.contentafterlink',
|
||||
CONTENTWITHOUTLINK : 'div.contentwithoutlink',
|
||||
EDITTITLE: 'a.editing_title',
|
||||
HIDE : 'a.editing_hide',
|
||||
HIGHLIGHT : 'a.editing_highlight',
|
||||
INSTANCENAME : 'span.instancename',
|
||||
MODINDENTDIV : '.mod-indent',
|
||||
MODINDENTOUTER : '.mod-indent-outer',
|
||||
PAGECONTENT : 'div#page-content',
|
||||
SECTIONLI : 'li.section',
|
||||
SHOW : 'a.'+CSS.SHOW,
|
||||
|
@ -291,13 +295,8 @@ YUI.add('moodle-course-toolboxes', function(Y) {
|
|||
}
|
||||
},
|
||||
add_spinner: function(activity) {
|
||||
var instance = activity.one(SELECTOR.ACTIVITYINSTANCE);
|
||||
|
||||
if (instance) {
|
||||
return M.util.add_spinner(Y, instance);
|
||||
} else {
|
||||
return M.util.add_spinner(Y, activity);
|
||||
}
|
||||
var actionarea = activity.one(SELECTOR.ACTIONAREA);
|
||||
return M.util.add_spinner(Y, actionarea);
|
||||
},
|
||||
|
||||
/**
|
||||
|
@ -506,7 +505,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
|
|||
*/
|
||||
handle_resource_dim : function(button, activity, action) {
|
||||
var toggleclass = CSS.DIMCLASS,
|
||||
dimarea = activity.one('a'),
|
||||
dimarea = activity.one('a, .contentwithoutlink'),
|
||||
availabilityinfo = activity.one(CSS.AVAILABILITYINFODIV),
|
||||
nextaction = (action === 'hide') ? 'show' : 'hide',
|
||||
buttontext = button.one('span'),
|
||||
|
@ -524,11 +523,12 @@ YUI.add('moodle-course-toolboxes', function(Y) {
|
|||
buttontext.set('text', newstring);
|
||||
}
|
||||
|
||||
// If activity is conditionally hidden, then don't toggle.
|
||||
if (Y.Moodle.core_course.util.cm.getName(activity) === null) {
|
||||
if (activity.one(SELECTOR.CONTENTWITHOUTLINK)) {
|
||||
dimarea = activity.one(SELECTOR.CONTENTWITHOUTLINK);
|
||||
toggleclass = CSS.DIMMEDTEXT;
|
||||
dimarea = activity.all(SELECTOR.MODINDENTDIV + ' > div').item(1);
|
||||
}
|
||||
|
||||
// If activity is conditionally hidden, then don't toggle.
|
||||
if (!dimarea.hasClass(CSS.CONDITIONALHIDDEN)) {
|
||||
// Change the UI.
|
||||
dimarea.toggleClass(toggleclass);
|
||||
|
|
|
@ -736,39 +736,23 @@ body.tag .managelink {padding: 5px;}
|
|||
.corelightbox {background-color:#CCC;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;}
|
||||
.corelightbox img {position:fixed;top:50%; left: 50%;}
|
||||
|
||||
.mod-indent-1 {margin-left:30px;}
|
||||
.mod-indent-2 {margin-left:60px;}
|
||||
.mod-indent-3 {margin-left:90px;}
|
||||
.mod-indent-4 {margin-left:120px;}
|
||||
.mod-indent-5 {margin-left:150px;}
|
||||
.mod-indent-6 {margin-left:180px;}
|
||||
.mod-indent-7 {margin-left:210px;}
|
||||
.mod-indent-8 {margin-left:240px;}
|
||||
.mod-indent-9 {margin-left:270px;}
|
||||
.mod-indent-10 {margin-left:300px;}
|
||||
.mod-indent-11 {margin-left:330px;}
|
||||
.mod-indent-12 {margin-left:360px;}
|
||||
.mod-indent-13 {margin-left:390px;}
|
||||
.mod-indent-14 {margin-left:420px;}
|
||||
.mod-indent {display:table-cell;}
|
||||
.mod-indent-1 {width:30px;}
|
||||
.mod-indent-2 {width:60px;}
|
||||
.mod-indent-3 {width:90px;}
|
||||
.mod-indent-4 {width:120px;}
|
||||
.mod-indent-5 {width:150px;}
|
||||
.mod-indent-6 {width:180px;}
|
||||
.mod-indent-7 {width:210px;}
|
||||
.mod-indent-8 {width:240px;}
|
||||
.mod-indent-9 {width:270px;}
|
||||
.mod-indent-10 {width:300px;}
|
||||
.mod-indent-11 {width:330px;}
|
||||
.mod-indent-12 {width:360px;}
|
||||
.mod-indent-13 {width:390px;}
|
||||
.mod-indent-14 {width:420px;}
|
||||
.mod-indent-15,
|
||||
.mod-indent-huge {margin-left:420px;}
|
||||
|
||||
.dir-rtl .mod-indent-1 {margin-right:30px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-2 {margin-right:60px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-3 {margin-right:90px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-4 {margin-right:120px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-5 {margin-right:150px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-6 {margin-right:180px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-7 {margin-right:210px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-8 {margin-right:240px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-9 {margin-right:270px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-10 {margin-right:300px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-11 {margin-right:330px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-12 {margin-right:360px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-13 {margin-right:390px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-14 {margin-right:420px;margin-left:0;}
|
||||
.dir-rtl .mod-indent-15,
|
||||
.dir-rtl .mod-indent-huge {margin-right:420px;margin-left:0;}
|
||||
.mod-indent-huge {width:420px;}
|
||||
|
||||
.dir-rtl .mform .fitem .felement {margin-right: 16%;margin-left:auto;text-align: right;}
|
||||
.dir-rtl .mform .fitem .felement input[name=email],
|
||||
|
|
|
@ -40,11 +40,12 @@
|
|||
right: 0;
|
||||
}
|
||||
|
||||
.section .activity .mod-indent {
|
||||
.section .activity .mod-indent-outer {
|
||||
display: table;
|
||||
padding-left: 24px;
|
||||
}
|
||||
|
||||
.dir-rtl .section .activity .mod-indent {
|
||||
.dir-rtl .section .activity .mod-indent-outer {
|
||||
padding-left: auto;
|
||||
padding-right: 24px;
|
||||
}
|
||||
|
@ -69,16 +70,35 @@
|
|||
}
|
||||
|
||||
.editing .sitetopic .section .activity .activityinstance,
|
||||
.editing .course-content .section .activity .activityinstance {
|
||||
.editing .course-content .section .activity .activityinstance,
|
||||
.editing .sitetopic .section .activity .contentwithoutlink,
|
||||
.editing .course-content .section .activity .contentwithoutlink {
|
||||
padding-right: 200px;
|
||||
}
|
||||
|
||||
.dir-rtl.editing .sitetopic .section .activity .activityinstance,
|
||||
.dir-rtl.editing .course-content .section .activity .activityinstance,
|
||||
.dir-rtl.editing .sitetopic .section .activity .contentwithoutlink,
|
||||
.dir-rtl.editing .course-content .section .activity .contentwithoutlink {
|
||||
padding-left: 200px;
|
||||
padding-right: initial;
|
||||
}
|
||||
|
||||
.sitetopic .section .activity .activityinstance,
|
||||
.course-content .section .activity .activityinstance,
|
||||
.sitetopic .section .activity .contentwithoutlink,
|
||||
.course-content .section .activity .contentwithoutlink {
|
||||
padding-right: 32px;
|
||||
height: 2em;
|
||||
display: table-cell;
|
||||
}
|
||||
|
||||
.dir-rtl.editing .sitetopic .section .activity .activityinstance,
|
||||
.dir-rtl.editing .course-content .section .activity .activityinstance {
|
||||
padding-left: 200px;
|
||||
padding-right: auto;
|
||||
.dir-rtl .sitetopic .section .activity .activityinstance,
|
||||
.dir-rtl .course-content .section .activity .activityinstance,
|
||||
.dir-rtl .sitetopic .section .activity .contentwithoutlink,
|
||||
.dir-rtl .course-content .section .activity .contentwithoutlink {
|
||||
padding-left: 32px;
|
||||
padding-right: initial;
|
||||
}
|
||||
|
||||
.course-content .section .activity .filler {
|
||||
|
@ -132,7 +152,7 @@
|
|||
.sitetopic .section .activity .availabilityinfo,
|
||||
.sitetopic .section .activity .contentafterlink,
|
||||
.course-content .section .activity .availabilityinfo,
|
||||
.course-content .section .activity .contentafterlink { margin-top: 0.5em; margin-left: 30px;}
|
||||
.course-content .section .activity .contentafterlink { margin-top: 0.5em;}
|
||||
.dir-rtl .sitetopic .section .activity .availabilityinfo,
|
||||
.dir-rtl .sitetopic .section .activity .contentafterlink,
|
||||
.dir-rtl .course-content .section .activity .availabilityinfo,
|
||||
|
|
|
@ -1153,113 +1153,60 @@ body.tag .managelink {
|
|||
top: 50%;
|
||||
left: 50%;
|
||||
}
|
||||
|
||||
.mod-indent-outer {
|
||||
display: table;
|
||||
}
|
||||
.mod-indent {
|
||||
display: table-cell;
|
||||
}
|
||||
.mod-indent-1 {
|
||||
margin-left: 30px;
|
||||
width: 30px;
|
||||
}
|
||||
.mod-indent-2 {
|
||||
margin-left: 60px;
|
||||
width: 60px;
|
||||
}
|
||||
.mod-indent-3 {
|
||||
margin-left: 90px;
|
||||
width: 90px;
|
||||
}
|
||||
.mod-indent-4 {
|
||||
margin-left: 120px;
|
||||
width: 120px;
|
||||
}
|
||||
.mod-indent-5 {
|
||||
margin-left: 150px;
|
||||
width: 150px;
|
||||
}
|
||||
.mod-indent-6 {
|
||||
margin-left: 180px;
|
||||
width: 180px;
|
||||
}
|
||||
.mod-indent-7 {
|
||||
margin-left: 210px;
|
||||
width: 210px;
|
||||
}
|
||||
.mod-indent-8 {
|
||||
margin-left: 240px;
|
||||
width: 240px;
|
||||
}
|
||||
.mod-indent-9 {
|
||||
margin-left: 270px;
|
||||
width: 270px;
|
||||
}
|
||||
.mod-indent-10 {
|
||||
margin-left: 300px;
|
||||
width: 300px;
|
||||
}
|
||||
.mod-indent-11 {
|
||||
margin-left: 330px;
|
||||
width: 330px;
|
||||
}
|
||||
.mod-indent-12 {
|
||||
margin-left: 360px;
|
||||
width: 360px;
|
||||
}
|
||||
.mod-indent-13 {
|
||||
margin-left: 390px;
|
||||
width: 390px;
|
||||
}
|
||||
.mod-indent-14 {
|
||||
margin-left: 420px;
|
||||
width: 420px;
|
||||
}
|
||||
.mod-indent-15,
|
||||
.mod-indent-huge {
|
||||
margin-left: 420px;
|
||||
}
|
||||
.dir-rtl .mod-indent-1 {
|
||||
margin-right: 30px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-2 {
|
||||
margin-right: 60px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-3 {
|
||||
margin-right: 90px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-4 {
|
||||
margin-right: 120px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-5 {
|
||||
margin-right: 150px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-6 {
|
||||
margin-right: 180px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-7 {
|
||||
margin-right: 210px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-8 {
|
||||
margin-right: 240px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-9 {
|
||||
margin-right: 270px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-10 {
|
||||
margin-right: 300px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-11 {
|
||||
margin-right: 330px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-12 {
|
||||
margin-right: 360px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-13 {
|
||||
margin-right: 390px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-14 {
|
||||
margin-right: 420px;
|
||||
margin-left: 0;
|
||||
}
|
||||
.dir-rtl .mod-indent-15,
|
||||
.dir-rtl .mod-indent-huge {
|
||||
margin-right: 420px;
|
||||
margin-left: 0;
|
||||
width: 420px;
|
||||
}
|
||||
|
||||
/* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */
|
||||
.resourcecontent .mediaplugin_mp3 object {
|
||||
height: 25px;
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
top: 0;
|
||||
}
|
||||
|
||||
.mod-indent {
|
||||
.mod-indent-outer {
|
||||
/**
|
||||
* Add appropriate padding such that nothing overlaps the
|
||||
* absolute positioned move icon.
|
||||
|
@ -72,7 +72,14 @@
|
|||
top: 0;
|
||||
}
|
||||
|
||||
.contentwithoutlink,
|
||||
.activityinstance {
|
||||
|
||||
min-width: 40%;
|
||||
display: table-cell;
|
||||
padding-right: 4px;
|
||||
min-height: 2em;
|
||||
|
||||
.dimmed {
|
||||
img.activityicon {
|
||||
opacity: 0.5;
|
||||
|
@ -114,12 +121,12 @@
|
|||
right: 100%;
|
||||
}
|
||||
|
||||
.mod-indent {
|
||||
.mod-indent-outer {
|
||||
/**
|
||||
* Add appropriate padding such that nothing overlaps the
|
||||
* absolute positioned move icon.
|
||||
*/
|
||||
padding-left: auto;
|
||||
padding-left: initial;
|
||||
padding-right: 32px;
|
||||
}
|
||||
|
||||
|
@ -128,6 +135,12 @@
|
|||
left: 0;
|
||||
right: auto;
|
||||
}
|
||||
|
||||
.contentwithoutlink,
|
||||
.activityinstance {
|
||||
padding-left: 4px;
|
||||
padding-right: initial;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -162,11 +175,9 @@
|
|||
.editing {
|
||||
.section {
|
||||
.activity {
|
||||
.contentwithoutlink,
|
||||
.activityinstance {
|
||||
min-width: 40%;
|
||||
display: table-cell;
|
||||
padding-right: 200px;
|
||||
min-height: 2em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -175,6 +186,7 @@
|
|||
.dir-rtl.editing {
|
||||
.section {
|
||||
.activity {
|
||||
.contentwithoutlink,
|
||||
.activityinstance {
|
||||
padding-left: 200px;
|
||||
padding-right: 0;
|
||||
|
@ -192,10 +204,6 @@
|
|||
white-space: nowrap;
|
||||
display: inline;
|
||||
}
|
||||
.section .activity.modtype_label .commands {
|
||||
margin-left: 40%;
|
||||
padding-left: .2em;
|
||||
}
|
||||
.section .activity.modtype_label.label {
|
||||
font-weight: normal;
|
||||
padding: .2em;
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue