moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-08-02 20:09:45 +01:00
commit 805f1c8d0b
37 changed files with 1625 additions and 940 deletions
Download patch file Download diff file Expand all files Collapse all files

92
.stylelintrc Normal file
View file

@ -0,0 +1,92 @@
{
"rules": {
"at-rule-empty-line-before": [ "always",
{"except": [ "blockless-group", "first-nested" ], ignore: ["after-comment"]}
],
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-no-unknown": true,
"at-rule-semicolon-newline-after": "always",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-no-single-line": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": ["lower", { "severity": "warning" }],
"color-hex-length": ["short", { "severity": "warning" }],
"color-no-invalid-hex": true,
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-duplicate-properties": true,
"declaration-block-no-ignored-properties": true,
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-url-data-uris": never,
"function-whitespace-after": "always",
"indentation": 4,
"keyframe-declaration-no-important": true,
"length-zero-no-unit": [true, { "severity": "warning" }],
"max-empty-lines": 2,
"max-line-length": [132, { "severity": "warning" }],
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-no-missing-punctuation": true,
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"no-browser-hacks": [true, { "severity": "warning" }],
"no-empty-source": true,
"no-eol-whitespace": true,
"no-extra-semicolons": [true, { "severity": "warning" }],
"no-invalid-double-slash-comments": true,
"no-unknown-animations": true,
"property-case": "lower",
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-no-unknown": true,
"selector-root-no-composition": true,
"selector-type-case": "lower",
"selector-type-no-unknown": true,
"shorthand-property-no-redundant-values": [null, { "severity": "warning" }],
"string-no-newline": true,
"time-no-imperceptible": true,
"unit-blacklist": ["pt", "rem"],
"unit-case": "lower",
"unit-no-unknown": true,
"value-keyword-case": ["lower", {"ignoreKeywords": ["/@/"]}],
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
}
}

27
Gruntfile.js
View file

@ -157,7 +157,7 @@ module.exports = function(grunt) {
}, },
bootstrapbase: { bootstrapbase: {
files: ["theme/bootstrapbase/less/**/*.less"], files: ["theme/bootstrapbase/less/**/*.less"],
tasks: ["less:bootstrapbase"] tasks: ["css"]
}, },
yui: { yui: {
files: ['**/yui/src/**/*.js'], files: ['**/yui/src/**/*.js'],
@ -169,6 +169,27 @@ module.exports = function(grunt) {
recursive: true, recursive: true,
paths: [cwd] paths: [cwd]
} }
},
stylelint: {
less: {
options: {
syntax: 'less',
configOverrides: {
rules: {
// TODO: MDL-55165 -Enable these rules once we make output-changing changes to less.
"declaration-block-no-ignored-properties": null,
"value-keyword-case": null,
"declaration-block-no-duplicate-properties": null,
"declaration-block-no-shorthand-property-overrides": null,
"selector-type-no-unknown": null,
"length-zero-no-unit": null,
"color-hex-case": null,
"color-hex-length": null
}
}
},
src: ['theme/**/*.less', '!theme/bootstrapbase/less/bootstrap/*'],
}
} }
}); });
@ -295,6 +316,7 @@ module.exports = function(grunt) {
grunt.config('eslint.yui.src', files); grunt.config('eslint.yui.src', files);
grunt.config('uglify.amd.files', [{ expand: true, src: files, rename: uglifyRename }]); grunt.config('uglify.amd.files', [{ expand: true, src: files, rename: uglifyRename }]);
grunt.config('shifter.options.paths', files); grunt.config('shifter.options.paths', files);
grunt.config('stylelint.less.src', files);
changedFiles = Object.create(null); changedFiles = Object.create(null);
}, 200); }, 200);
@ -308,6 +330,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-less'); grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-eslint'); grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-stylelint');
// Register JS tasks. // Register JS tasks.
grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter); grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
@ -317,7 +340,7 @@ module.exports = function(grunt) {
grunt.registerTask('js', ['amd', 'yui']); grunt.registerTask('js', ['amd', 'yui']);
// Register CSS taks. // Register CSS taks.
grunt.registerTask('css', ['less:bootstrapbase']); grunt.registerTask('css', ['stylelint:less', 'less:bootstrapbase']);
// Register the startup task. // Register the startup task.
grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup); grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);

3
completion/tests/behat/behat_completion.php
View file

@ -102,6 +102,9 @@ class behat_completion extends behat_base {
// Go to course editing. // Go to course editing.
$this->execute("behat_general::click_link", get_string('editsettings')); $this->execute("behat_general::click_link", get_string('editsettings'));
// Expand all the form fields.
$this->execute("behat_forms::i_expand_all_fieldsets");
// Enable completion. // Enable completion.
$this->execute("behat_forms::i_set_the_field_to", $this->execute("behat_forms::i_set_the_field_to",
array(get_string('enablecompletion', 'completion'), $toggle)); array(get_string('enablecompletion', 'completion'), $toggle));

23
lib/tests/htmlpurifier_test.php
View file

@ -335,25 +335,12 @@ class core_htmlpurifier_testcase extends basic_testcase {
* Test cases for the test_media_tags test. * Test cases for the test_media_tags test.
*/ */
public function media_tags_provider() { public function media_tags_provider() {
// Given a 1D array, computes the power set of those elements. // Takes an array of attributes, then generates a test for each of them.
$p = function(array $set) {
return array_reduce($set, function($carry, $element) {
return array_merge($carry, array_map(function($subset) use ($element) {
return array_merge([$element], $subset);
}, $carry));
}, [[]]);
};
// Takes an array of attributes, then generates a test for every possible combination of them
// (i.e., every element of the power set). The testcases are named using $prefix and then
// a '/' delimited string describing the attributes being used. $templats is for the
// raw data and expected result.
$generatetestcases = function($prefix, array $attrs, array $templates) use ($p) { $generatetestcases = function($prefix, array $attrs, array $templates) use ($p) {
$attrcombinations = $p($attrs); return array_reduce($attrs, function($carry, $attr) use ($prefix, $templates) {
return array_reduce($attrcombinations, function($carry, $attrset) use ($prefix, $templates) { $testcase = [$prefix . '/' . $attr => [
$testcase = [$prefix . '/' . join('/', $attrset) => [ sprintf($templates[0], $attr),
sprintf($templates[0], join(" ", $attrset)), sprintf($templates[1], $attr)
sprintf($templates[1], join(" ", $attrset))
]]; ]];
return empty(array_values($carry)[0]) ? $testcase : $carry + $testcase; return empty(array_values($carry)[0]) ? $testcase : $carry + $testcase;
}, [[]]); }, [[]]);

16
mod/lti/locallib.php
View file

@ -2700,24 +2700,32 @@ function lti_load_tool_from_cartridge($url, $lti) {
function lti_load_cartridge($url, $map, $propertiesmap = array()) { function lti_load_cartridge($url, $map, $propertiesmap = array()) {
global $CFG; global $CFG;
require_once($CFG->libdir. "/filelib.php"); require_once($CFG->libdir. "/filelib.php");
// TODO MDL-46023 Replace this code with a call to the new library.
$origentity = libxml_disable_entity_loader(true);
$curl = new curl(); $curl = new curl();
$response = $curl->get($url); $response = $curl->get($url);
// TODO MDL-46023 Replace this code with a call to the new library.
$origerrors = libxml_use_internal_errors(true);
$origentity = libxml_disable_entity_loader(true);
libxml_clear_errors();
$document = new DOMDocument(); $document = new DOMDocument();
@$document->loadXML($response, LIBXML_DTDLOAD | LIBXML_DTDATTR); @$document->loadXML($response, LIBXML_DTDLOAD | LIBXML_DTDATTR);
$cartridge = new DomXpath($document); $cartridge = new DomXpath($document);
$errors = libxml_get_errors(); $errors = libxml_get_errors();
libxml_clear_errors();
libxml_use_internal_errors($origerrors);
libxml_disable_entity_loader($origentity);
if (count($errors) > 0) { if (count($errors) > 0) {
$message = 'Failed to load cartridge.'; $message = 'Failed to load cartridge.';
foreach ($errors as $error) { foreach ($errors as $error) {
$message .= "\n" . trim($error->message, "\n\r\t .") . " at line " . $error->line; $message .= "\n" . trim($error->message, "\n\r\t .") . " at line " . $error->line;
} }
throw new moodle_exception($message); throw new moodle_exception('errorreadingfile', '', '', $url, $message);
} }
$toolinfo = array(); $toolinfo = array();
@ -2735,7 +2743,7 @@ function lti_load_cartridge($url, $map, $propertiesmap = array()) {
} }
} }
} }
libxml_disable_entity_loader($origentity);
return $toolinfo; return $toolinfo;
} }

2
mod/lti/tests/behat/addtool.feature
View file

@ -21,7 +21,7 @@ Feature: Add tools
And I set the following fields to these values: And I set the following fields to these values:
| Tool name | Teaching Tool 1 | | Tool name | Teaching Tool 1 |
| Tool configuration usage | Show in activity chooser and as a preconfigured tool | | Tool configuration usage | Show in activity chooser and as a preconfigured tool |
And I set the field "Tool base URL/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.html" And I set the field "Tool base URL/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.php"
And I press "Save changes" And I press "Save changes"
And I log out And I log out

2
mod/lti/tests/behat/addtype.feature
View file

@ -67,7 +67,7 @@ Feature: Add preconfigured tools via teacher interface
| Activity name | Test tool activity 1 | | Activity name | Test tool activity 1 |
And I open "Test tool activity 1" actions menu And I open "Test tool activity 1" actions menu
And I follow "Edit settings" in the open menu And I follow "Edit settings" in the open menu
And I set the field "Launch/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.html" And I set the field "Launch/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.php"
And I press "Save and return to course" And I press "Save and return to course"
And I follow "Test tool activity 1" And I follow "Test tool activity 1"
And I switch to "contentframe" iframe And I switch to "contentframe" iframe

2
mod/lti/tests/behat/toolconfigure.feature
View file

@ -37,7 +37,7 @@ Feature: Configure tool types
@javascript @javascript
Scenario: Attempt to add a tool type from a configuration URL, then cancel Scenario: Attempt to add a tool type from a configuration URL, then cancel
When I set the field "url" to local url "/mod/lti/tests/fixtures/tool_provider.html" When I set the field "url" to local url "/mod/lti/tests/fixtures/tool_provider.php"
And I press "Add" And I press "Add"
Then I should see "Cancel" Then I should see "Cancel"
And I press "cancel-external-registration" And I press "cancel-external-registration"

3
mod/lti/tests/externallib_test.php
View file

@ -52,7 +52,8 @@ class mod_lti_external_testcase extends externallib_advanced_testcase {
// Setup test data. // Setup test data.
$this->course = $this->getDataGenerator()->create_course(); $this->course = $this->getDataGenerator()->create_course();
$this->lti = $this->getDataGenerator()->create_module('lti', array('course' => $this->course->id)); $this->lti = $this->getDataGenerator()->create_module('lti',
array('course' => $this->course->id, 'toolurl' => 'http://localhost/not/real/tool.php'));
$this->context = context_module::instance($this->lti->cmid); $this->context = context_module::instance($this->lti->cmid);
$this->cm = get_coursemodule_from_instance('lti', $this->lti->id); $this->cm = get_coursemodule_from_instance('lti', $this->lti->id);

8
mod/lti/tests/fixtures/tool_provider.html vendored
View file

@ -1,8 +0,0 @@
<html>
<head>
<title>Tool provider</title>
</head>
<body>
<p>This represents a tool provider</p>
</body>
</html>

33
mod/lti/tests/fixtures/tool_provider.php vendored Normal file
View file

@ -0,0 +1,33 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Testing fixture.
*
* @package mod_lti
* @copyright 2016 John Okely
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
?>
<html>
<head>
<title>Tool provider</title>
</head>
<body>
<p>This represents a tool provider</p>
</body>
</html>

2
mod/lti/tests/generator/lib.php
View file

@ -41,7 +41,7 @@ class mod_lti_generator extends testing_module_generator {
$record = (object) (array) $record; $record = (object) (array) $record;
if (!isset($record->toolurl)) { if (!isset($record->toolurl)) {
$record->toolurl = 'http://www.imsglobal.org/developers/LTI/test/v1p1/tool.php'; $record->toolurl = '';
} }
if (!isset($record->resourcekey)) { if (!isset($record->resourcekey)) {
$record->resourcekey = '12345'; $record->resourcekey = '12345';

4
mod/wiki/classes/external.php
View file

@ -824,7 +824,7 @@ class mod_wiki_external extends external_api {
return new external_function_parameters ( return new external_function_parameters (
array( array(
'pageid' => new external_value(PARAM_INT, 'Page ID to edit.'), 'pageid' => new external_value(PARAM_INT, 'Page ID to edit.'),
'section' => new external_value(PARAM_TEXT, 'Section page title.', VALUE_DEFAULT, null) 'section' => new external_value(PARAM_RAW, 'Section page title.', VALUE_DEFAULT, null)
) )
); );
} }
@ -1088,7 +1088,7 @@ class mod_wiki_external extends external_api {
array( array(
'pageid' => new external_value(PARAM_INT, 'Page ID.'), 'pageid' => new external_value(PARAM_INT, 'Page ID.'),
'content' => new external_value(PARAM_RAW, 'Page contents.'), 'content' => new external_value(PARAM_RAW, 'Page contents.'),
'section' => new external_value(PARAM_TEXT, 'Section page title.', VALUE_DEFAULT, null) 'section' => new external_value(PARAM_RAW, 'Section page title.', VALUE_DEFAULT, null)
) )
); );
} }

18
mod/wiki/tests/externallib_test.php
View file

@ -1155,7 +1155,8 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
$this->create_individual_wikis_with_groups(); $this->create_individual_wikis_with_groups();
$sectioncontent = '<h1>Title1</h1>Text inside section'; // We add a <span> in the first title to verify the WS works sending HTML in section.
$sectioncontent = '<h1><span>Title1</span></h1>Text inside section';
$pagecontent = $sectioncontent.'<h1>Title2</h1>Text inside section'; $pagecontent = $sectioncontent.'<h1>Title2</h1>Text inside section';
$newpage = $this->getDataGenerator()->get_plugin_generator('mod_wiki')->create_page( $newpage = $this->getDataGenerator()->get_plugin_generator('mod_wiki')->create_page(
$this->wiki, array('content' => $pagecontent)); $this->wiki, array('content' => $pagecontent));
@ -1181,7 +1182,7 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
'version' => '1' 'version' => '1'
); );
$result = mod_wiki_external::get_page_for_editing($newpage->id, 'Title1'); $result = mod_wiki_external::get_page_for_editing($newpage->id, '<span>Title1</span>');
$result = external_api::clean_returnvalue(mod_wiki_external::get_page_for_editing_returns(), $result); $result = external_api::clean_returnvalue(mod_wiki_external::get_page_for_editing_returns(), $result);
$this->assertEquals($expected, $result['pagesection']); $this->assertEquals($expected, $result['pagesection']);
} }
@ -1273,8 +1274,9 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
array('group' => $this->group1->id, 'content' => 'Test')); array('group' => $this->group1->id, 'content' => 'Test'));
// Test edit whole page. // Test edit whole page.
$sectioncontent = '<h1>Title1</h1>Text inside section'; // We add <span> in the titles to verify the WS works sending HTML in section.
$newpagecontent = $sectioncontent.'<h1>Title2</h1>Text inside section'; $sectioncontent = '<h1><span>Title1</span></h1>Text inside section';
$newpagecontent = $sectioncontent.'<h1><span>Title2</span></h1>Text inside section';
$result = mod_wiki_external::edit_page($newpage->id, $newpagecontent); $result = mod_wiki_external::edit_page($newpage->id, $newpagecontent);
$result = external_api::clean_returnvalue(mod_wiki_external::edit_page_returns(), $result); $result = external_api::clean_returnvalue(mod_wiki_external::edit_page_returns(), $result);
@ -1284,8 +1286,8 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
$this->assertEquals($newpagecontent, $version->content); $this->assertEquals($newpagecontent, $version->content);
// Test edit section. // Test edit section.
$newsectioncontent = '<h1>Title2</h1>New test2'; $newsectioncontent = '<h1><span>Title2</span></h1>New test2';
$section = 'Title2'; $section = '<span>Title2</span>';
$result = mod_wiki_external::edit_page($newpage->id, $newsectioncontent, $section); $result = mod_wiki_external::edit_page($newpage->id, $newsectioncontent, $section);
$result = external_api::clean_returnvalue(mod_wiki_external::edit_page_returns(), $result); $result = external_api::clean_returnvalue(mod_wiki_external::edit_page_returns(), $result);
@ -1297,8 +1299,8 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
$this->assertEquals($expected, $version->content); $this->assertEquals($expected, $version->content);
// Test locked section. // Test locked section.
$newsectioncontent = '<h1>Title2</h1>New test2'; $newsectioncontent = '<h1><span>Title2</span></h1>New test2';
$section = 'Title2'; $section = '<span>Title2</span>';
try { try {
// Using user 1 to avoid other users to edit. // Using user 1 to avoid other users to edit.

1194
npm-shrinkwrap.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -10,7 +10,9 @@
"grunt-contrib-uglify": "1.0.1", "grunt-contrib-uglify": "1.0.1",
"grunt-contrib-watch": "1.0.0", "grunt-contrib-watch": "1.0.0",
"grunt-eslint": "19.0.0", "grunt-eslint": "19.0.0",
"grunt-stylelint": "0.6.0",
"shifter": "0.5.0", "shifter": "0.5.0",
"stylelint-checkstyle-formatter": "0.1.0",
"xmldom": "0.1.22", "xmldom": "0.1.22",
"xpath": "0.0.23" "xpath": "0.0.23"
}, },

1
theme/bootstrapbase/less/editor.less
View file

@ -17,6 +17,7 @@
@import "bootstrap/sprites.less"; @import "bootstrap/sprites.less";
@iconSpritePath: ~"[[pix:theme|glyphicons-halflings]]"; @iconSpritePath: ~"[[pix:theme|glyphicons-halflings]]";
@iconWhiteSpritePath: ~"[[pix:theme|glyphicons-halflings-white]]"; @iconWhiteSpritePath: ~"[[pix:theme|glyphicons-halflings-white]]";
@import "bootstrap/wells.less"; @import "bootstrap/wells.less";
// Components: Buttons & Alerts. // Components: Buttons & Alerts.

1
theme/bootstrapbase/less/moodle.less
View file

@ -76,6 +76,5 @@ body {
@import "bootstrap/responsive-767px-max.less"; @import "bootstrap/responsive-767px-max.less";
@import "bootstrap/responsive-navbar.less"; @import "bootstrap/responsive-navbar.less";
@import "moodle/responsive"; @import "moodle/responsive";
@import "moodle/debug"; @import "moodle/debug";
@import "moodle/expendable"; @import "moodle/expendable";

49
theme/bootstrapbase/less/moodle/admin.less
View file

@ -20,7 +20,7 @@
.environmenttable { .environmenttable {
p.warn { p.warn {
background-color : @warningBackground; background-color: @warningBackground;
color: @warningText; color: @warningText;
} }
.error, .error,
@ -29,10 +29,10 @@
.label; .label;
} }
.error { .error {
background-color : @errorText; background-color: @errorText;
} }
span.warn { span.warn {
background-color : @orange; background-color: @orange;
} }
.ok { .ok {
background-color: @successText; background-color: @successText;
@ -264,7 +264,7 @@ img.iconsmall {
.path-admin .roleassigntable td { .path-admin .roleassigntable td {
vertical-align: top; vertical-align: top;
padding: 0.2em 0.3em padding: 0.2em 0.3em;
} }
.path-admin .roleassigntable p { .path-admin .roleassigntable p {
@ -360,7 +360,7 @@ img.iconsmall {
.dir-rtl .environmenttable img.iconhelp { .dir-rtl .environmenttable img.iconhelp {
padding-left: .3em; padding-left: .3em;
padding-right: 0 padding-right: 0;
} }
#trustedhosts .generaltable { #trustedhosts .generaltable {
@ -526,7 +526,7 @@ img.iconsmall {
.dir-rtl .form-item .form-label, .dir-rtl .form-item .form-label,
.dir-rtl .form-item .form-description, .dir-rtl .form-item .form-description,
.dir-rtl.path-admin .roleassigntable p { .dir-rtl.path-admin .roleassigntable p {
text-align: right text-align: right;
} }
#page-admin-index #notice .checkforupdates { #page-admin-index #notice .checkforupdates {
@ -561,7 +561,8 @@ img.iconsmall {
.singlebutton { .singlebutton {
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
div, input { div,
input {
margin: 0 3px 0 0; margin: 0 3px 0 0;
} }
} }
@ -570,7 +571,8 @@ img.iconsmall {
.updateavailableinstallall { .updateavailableinstallall {
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
div, input { div,
input {
margin: 0 3px 5px 0; margin: 0 3px 5px 0;
} }
} }
@ -595,13 +597,8 @@ img.iconsmall {
font-size: @fontSizeSmall; font-size: @fontSizeSmall;
.muted; .muted;
} }
.release {
}
}
.availability {
}
.settings {
} }
.uninstall { .uninstall {
a { a {
color: @errorText; color: @errorText;
@ -632,7 +629,8 @@ img.iconsmall {
.singlebutton { .singlebutton {
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
div, input { div,
input {
margin: 0 3px 0 0; margin: 0 3px 0 0;
} }
} }
@ -648,7 +646,8 @@ img.iconsmall {
.singlebutton { .singlebutton {
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
div, input { div,
input {
margin: 0 3px 0 0; margin: 0 3px 0 0;
} }
} }
@ -661,7 +660,8 @@ img.iconsmall {
.muted; .muted;
} }
.status-missing, .status-downgrade { .status-missing,
.status-downgrade {
td { td {
background-color: @errorBackground; background-color: @errorBackground;
} }
@ -701,7 +701,8 @@ img.iconsmall {
.singlebutton { .singlebutton {
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
div, input { div,
input {
margin: 0 3px 0 0; margin: 0 3px 0 0;
} }
} }
@ -732,13 +733,15 @@ img.iconsmall {
// Available plugin update notification. // Available plugin update notification.
#plugins-check-page, #plugins-control-panel { #plugins-check-page,
#plugins-control-panel {
.pluginupdateinfo { .pluginupdateinfo {
background-color: @infoBackground; background-color: @infoBackground;
&.maturity50 { &.maturity50 {
background-color: @errorBackground; background-color: @errorBackground;
} }
&.maturity100, &.maturity150 { &.maturity100,
&.maturity150 {
background-color: @warningBackground; background-color: @warningBackground;
} }
padding: 5px; padding: 5px;
@ -753,7 +756,8 @@ img.iconsmall {
.singlebutton { .singlebutton {
margin: 5px 0; margin: 5px 0;
padding: 0; padding: 0;
div, input { div,
input {
margin: 0 3px 0 0; margin: 0 3px 0 0;
} }
} }
@ -767,7 +771,8 @@ img.iconsmall {
} }
.continue { .continue {
padding: 0; padding: 0;
div, input { div,
input {
margin: 0; margin: 0;
} }
} }

3
theme/bootstrapbase/less/moodle/backup-restore.less
View file

@ -36,8 +36,7 @@
font-weight: bold; font-weight: bold;
color: inherit; color: inherit;
} }
.path-backup .backup_progress .backup_stage.backup_stage_next {
}
.path-backup .backup_progress span.backup_stage.backup_stage_complete { .path-backup .backup_progress span.backup_stage.backup_stage_complete {
color: inherit; color: inherit;
} }

4
theme/bootstrapbase/less/moodle/blocks.less
View file

@ -14,7 +14,7 @@
padding: 3px 15px; padding: 3px 15px;
float: right; float: right;
> * { > * {
margin-left:3px; margin-left: 3px;
} }
.block-hider-show, .block-hider-show,
.block-hider-hide { .block-hider-hide {
@ -196,7 +196,7 @@
padding-bottom: 10px; padding-bottom: 10px;
} }
ul li { ul li {
border-top: 1px rgba(0,0,0,0.05) solid; border-top: 1px rgba(0, 0, 0, 0.05) solid;
padding: 2px; padding: 2px;
display: table; display: table;
width: 100%; width: 100%;

52
theme/bootstrapbase/less/moodle/bootstrapoverride.less vendored
View file

@ -12,17 +12,45 @@
@warningText: #8a6d3b; @warningText: #8a6d3b;
// Headings. // Headings.
h1 { font-size: round(@baseFontSize * 2.30); } // ~32px h1 {
h2 { font-size: round(@baseFontSize * 2.00); } // ~28px font-size: round(@baseFontSize * 2.30); // ~32px
h3 { font-size: round(@baseFontSize * 1.70); } // ~24px }
h4 { font-size: round(@baseFontSize * 1.40); } // ~20px
h5 { font-size: round(@baseFontSize * 1.15); } // ~16px
h6 { font-size: round(@baseFontSize * 0.85); } // ~12px
h1 small { font-size: round(@baseFontSize * 1.70); } // ~24px h2 {
h2 small { font-size: round(@baseFontSize * 1.40); } // ~20px font-size: round(@baseFontSize * 2.00); // ~28px
h3 small { font-size: round(@baseFontSize * 1.15); } // ~16px }
h4 small { font-size: round(@baseFontSize * 0.85); } // ~12px
h3 {
font-size: round(@baseFontSize * 1.70); // ~24px
}
h4 {
font-size: round(@baseFontSize * 1.40); // ~20px
}
h5 {
font-size: round(@baseFontSize * 1.15); // ~16px
}
h6 {
font-size: round(@baseFontSize * 0.85); // ~12px
}
h1 small {
font-size: round(@baseFontSize * 1.70); // ~24px
}
h2 small {
font-size: round(@baseFontSize * 1.40); // ~20px
}
h3 small {
font-size: round(@baseFontSize * 1.15); // ~16px
}
h4 small {
font-size: round(@baseFontSize * 0.85); // ~12px
}
// Printing. // Printing.
@media print { @media print {
@ -35,10 +63,14 @@ h4 small { font-size: round(@baseFontSize * 0.85); } // ~12px
.fluid-span (@columns) { .fluid-span (@columns) {
.fluid-span-full(@columns, @fluidGridColumnWidth, @fluidGridGutterWidth); .fluid-span-full(@columns, @fluidGridColumnWidth, @fluidGridGutterWidth);
} }
// TODO: MDL-55142 remove browser these brwoser hacks:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
.fluid-span-full (@columns, @columnWidth, @gutterWidth) { .fluid-span-full (@columns, @columnWidth, @gutterWidth) {
width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1)); width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1));
*width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%); *width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
} }
/* stylelint-enable */
/** /**
* Implement missing variables, or faulty ones, in Bootstrap rules. * Implement missing variables, or faulty ones, in Bootstrap rules.

12
theme/bootstrapbase/less/moodle/calendar.less
View file

@ -24,7 +24,8 @@
.path-calendar { .path-calendar {
.calendartable { .calendartable {
width: 100%; width: 100%;
th, td { th,
td {
width: 14%; width: 14%;
vertical-align: top; vertical-align: top;
text-align: center; text-align: center;
@ -144,7 +145,8 @@
} }
} }
.calendartable { .calendartable {
td, li { td,
li {
padding: 5px; padding: 5px;
} }
li { li {
@ -250,7 +252,8 @@
} }
} }
.calendartable { .calendartable {
td, li { td,
li {
text-align: right; text-align: right;
} }
li { li {
@ -306,7 +309,8 @@
max-width: 280px; max-width: 280px;
margin: 0 auto; margin: 0 auto;
width: 100%; width: 100%;
th, td { th,
td {
padding: 2px; padding: 2px;
font-size: 0.8em; font-size: 0.8em;
text-align: center; text-align: center;

2
theme/bootstrapbase/less/moodle/chat.less
View file

@ -72,7 +72,7 @@
} }
} }
.mdl-chat-my-entry .chat-message.course-theme { .mdl-chat-my-entry .chat-message.course-theme {
background-color:#f6f6f6; background-color: #f6f6f6;
.user { .user {
font-weight: bold; font-weight: bold;
} }

313
theme/bootstrapbase/less/moodle/core.less
View file

@ -6,14 +6,14 @@
.layout-option-nofooter #page-footer, .layout-option-nofooter #page-footer,
.layout-option-nocourseheader .course-content-header, .layout-option-nocourseheader .course-content-header,
.layout-option-nocoursefooter .course-content-footer { .layout-option-nocoursefooter .course-content-footer {
display:none; display: none;
} }
.empty-region-side-pre #block-region-side-pre, // Pre region is empty. .empty-region-side-pre #block-region-side-pre, // Pre region is empty.
.empty-region-side-post #block-region-side-post, // Post region is empty. .empty-region-side-post #block-region-side-post, // Post region is empty.
.jsenabled.docked-region-side-post #block-region-side-post, // All post blocks are docked. .jsenabled.docked-region-side-post #block-region-side-post, // All post blocks are docked.
.jsenabled.docked-region-side-pre #block-region-side-pre { // All pre blocks are docked. .jsenabled.docked-region-side-pre #block-region-side-pre { // All pre blocks are docked.
display:none; display: none;
} }
/** Start Legacy styles. Deprecated since Moodle 2.9. See MDL-48160 for further information. **/ /** Start Legacy styles. Deprecated since Moodle 2.9. See MDL-48160 for further information. **/
@ -277,22 +277,30 @@ img.iconsmall {
vertical-align: middle; vertical-align: middle;
width: 12px; width: 12px;
} }
img.iconhelp, .helplink img { img.iconhelp,
.helplink img {
height: 16px; height: 16px;
padding-left: 3px; padding-left: 3px;
vertical-align: text-bottom; vertical-align: text-bottom;
width: 16px; width: 16px;
} }
h1 img.iconhelp, h1 img.icon, h1 img.iconhelp,
h2 img.iconhelp, h2 img.icon, h1 img.icon,
h3 img.iconhelp, h3 img.icon, h2 img.iconhelp,
h4 img.iconhelp, h4 img.icon, h2 img.icon,
h5 img.iconhelp, h5 img.icon, h3 img.iconhelp,
h6 img.iconhelp, h6 img.icon { h3 img.icon,
h4 img.iconhelp,
h4 img.icon,
h5 img.iconhelp,
h5 img.icon,
h6 img.iconhelp,
h6 img.icon {
vertical-align: middle; vertical-align: middle;
padding: 4px; padding: 4px;
} }
.dir-rtl img.iconhelp, .dir-rtl .helplink img { .dir-rtl img.iconhelp,
.dir-rtl .helplink img {
padding-right: 3px; padding-right: 3px;
padding-left: 0; padding-left: 0;
} }
@ -319,11 +327,13 @@ img.iconkbhelp {
height: 17px; height: 17px;
width: 49px; width: 49px;
} }
img.icon-pre, .dir-rtl img.icon-post { img.icon-pre,
.dir-rtl img.icon-post {
padding-right: 3px; padding-right: 3px;
padding-left: 0; padding-left: 0;
} }
img.icon-post, .dir-rtl img.icon-pre { img.icon-post,
.dir-rtl img.icon-pre {
padding-left: 3px; padding-left: 3px;
padding-right: 0; padding-right: 0;
} }
@ -530,7 +540,7 @@ a.skip:active {
margin: 0; margin: 0;
padding: 0; padding: 0;
margin-bottom: 5px; margin-bottom: 5px;
margin-top:15px; margin-top: 15px;
} }
.loginbox .signuppanel .subcontent { .loginbox .signuppanel .subcontent {
text-align: left; text-align: left;
@ -591,7 +601,7 @@ a.skip:active {
.dir-rtl { .dir-rtl {
.loginbox.twocolumns .loginpanel, .loginbox.twocolumns .loginpanel,
.loginbox.twocolumns .signuppanel { .loginbox.twocolumns .signuppanel {
float:right; float: right;
} }
} }
@ -682,15 +692,15 @@ table.mod_index {
position: relative; position: relative;
} }
.comment-list li.first { .comment-list li.first {
display: none display: none;
} }
.comment-paging{ .comment-paging {
text-align: center; text-align: center;
} }
.comment-paging .pageno{ .comment-paging .pageno {
padding: 2px; padding: 2px;
} }
.comment-paging .curpage{ .comment-paging .curpage {
border: 1px solid #CCC; border: 1px solid #CCC;
} }
.comment-message .picture { .comment-message .picture {
@ -720,20 +730,20 @@ table.mod_index {
right: auto; right: auto;
margin: .3em; margin: .3em;
} }
.comment-report-selectall{ .comment-report-selectall {
display: none display: none;
} }
.comment-link { .comment-link {
display: none display: none;
} }
.jsenabled .comment-link { .jsenabled .comment-link {
display: block display: block;
} }
.jsenabled .showcommentsnonjs{ .jsenabled .showcommentsnonjs {
display: none display: none;
} }
.jsenabled .comment-report-selectall{ .jsenabled .comment-report-selectall {
display: inline display: inline;
} }
/** /**
* Completion progress report * Completion progress report
@ -975,16 +985,16 @@ tr.flagged-tag a {
display: inline; display: inline;
} }
.tag_list.hideoverlimit .overlimit { .tag_list.hideoverlimit .overlimit {
display:none; display: none;
} }
.tag_list .tagmorelink { .tag_list .tagmorelink {
display:none; display: none;
} }
.tag_list.hideoverlimit .tagmorelink { .tag_list.hideoverlimit .tagmorelink {
display:inline; display: inline;
} }
.tag_list.hideoverlimit .taglesslink { .tag_list.hideoverlimit .taglesslink {
display:none; display: none;
} }
/** /**
@ -1091,7 +1101,7 @@ tr.flagged-tag a {
border-collapse: collapse; border-collapse: collapse;
} }
.userenrolment tr { .userenrolment tr {
vertical-align:top; vertical-align: top;
} }
.userenrolment td { .userenrolment td {
padding: 0; padding: 0;
@ -1135,7 +1145,7 @@ tr.flagged-tag a {
padding: 3px; padding: 3px;
margin: 3px; margin: 3px;
> a:hover { > a:hover {
border-bottom:1px solid #666; border-bottom: 1px solid #666;
} }
} }
.userenrolment .col_role .addrole img, .userenrolment .col_role .addrole img,
@ -1248,18 +1258,20 @@ tr.flagged-tag a {
} }
} }
.user-enroller-panel .uep-search-results .user { .user-enroller-panel .uep-search-results .user {
.count, .picture, .details { .count,
float:right; .picture,
.details {
float: right;
} }
.options .enrol { .options .enrol {
float:left; float: left;
} }
} }
} }
} }
#page-enrol-users .enrol-users-page-action input { #page-enrol-users .enrol-users-page-action input {
margin-left: 0 margin-left: 0;
} }
/** /**
@ -1310,8 +1322,8 @@ tr.flagged-tag a {
display: table-cell; display: table-cell;
} }
.label .mod-indent { .label .mod-indent {
float:left; float: left;
padding-top:20px padding-top: 20px;
} }
/* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */ /* Creates a series of .mod-indent-# rule declarations based on indent size and number of indent levels. */
@ -1333,10 +1345,10 @@ tr.flagged-tag a {
/* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */ /* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */
.resourcecontent .mediaplugin_mp3 object { .resourcecontent .mediaplugin_mp3 object {
height: 25px; height: 25px;
width: 600px width: 600px;
} }
.resourcecontent audio.mediaplugin_html5audio { .resourcecontent audio.mediaplugin_html5audio {
width: 600px width: 600px;
} }
/** Large resource images should avoid hidden overflow **/ /** Large resource images should avoid hidden overflow **/
.resourceimage { .resourceimage {
@ -1345,10 +1357,10 @@ tr.flagged-tag a {
/* Audio player size in 'inline' mode (can only change width, as above) */ /* Audio player size in 'inline' mode (can only change width, as above) */
.mediaplugin_mp3 object { .mediaplugin_mp3 object {
height: 15px; height: 15px;
width: 300px width: 300px;
} }
audio.mediaplugin_html5audio { audio.mediaplugin_html5audio {
width: 300px width: 300px;
} }
/* TinyMCE moodle media preview frame should not have padding */ /* TinyMCE moodle media preview frame should not have padding */
.core_media_preview.pagelayout-embedded #content { .core_media_preview.pagelayout-embedded #content {
@ -1421,7 +1433,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
} }
.dir-rtl .ygtvlph, .dir-rtl .ygtvlph,
.dir-rtl .ygtvlphh { .dir-rtl .ygtvlphh {
background-position: 0 -3200px background-position: 0 -3200px;
} }
.dir-rtl .ygtvdepthcell { .dir-rtl .ygtvdepthcell {
background-position: 0 -8000px; background-position: 0 -8000px;
@ -1445,7 +1457,8 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
text-align: right; text-align: right;
} }
/** Fix TinyMCE editor right to left **/ /** Fix TinyMCE editor right to left **/
.dir-rtl .clearlooks2.ie9 .mceAlert .mceMiddle span,.dir-rtl .clearlooks2 .mceConfirm .mceMiddle span { .dir-rtl .clearlooks2.ie9 .mceAlert .mceMiddle span,
.dir-rtl .clearlooks2 .mceConfirm .mceMiddle span {
top: 44px; top: 44px;
} }
.dir-rtl .o2k7Skin table, .dir-rtl .o2k7Skin table,
@ -1475,7 +1488,8 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
text-align: center; text-align: center;
} }
.initialbar { .initialbar {
a, strong { a,
strong {
padding-left: 3px; padding-left: 3px;
padding-right: 3px; padding-right: 3px;
} }
@ -1601,7 +1615,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
text-align: center; text-align: center;
} }
.moodle-dialogue-exception .moodle-exception-message { .moodle-dialogue-exception .moodle-exception-message {
text-align: center text-align: center;
} }
.moodle-dialogue-exception .moodle-exception-param label { .moodle-dialogue-exception .moodle-exception-param label {
font-weight: bold; font-weight: bold;
@ -1639,7 +1653,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
margin: 0.5em 1em; margin: 0.5em 1em;
} }
.moodle-dialogue-confirm .confirmation-dialogue input { .moodle-dialogue-confirm .confirmation-dialogue input {
min-width: 80px min-width: 80px;
} }
.moodle-dialogue-exception .moodle-exception-message { .moodle-dialogue-exception .moodle-exception-message {
margin: 1em; margin: 1em;
@ -2027,7 +2041,7 @@ ul.badges {
top: 0px; top: 0px;
.opacity(85); .opacity(85);
position: absolute; position: absolute;
z-index:10; z-index: 10;
} }
.singlebutton { .singlebutton {
@ -2114,7 +2128,7 @@ ul.badges {
.statusbox .activatebadge { .statusbox .activatebadge {
display: inline-block; display: inline-block;
} }
.statusbox .activatebadge input[type=submit]{ .statusbox .activatebadge input[type=submit] {
margin: 3px; margin: 3px;
} }
.activatebadge { .activatebadge {
@ -2247,7 +2261,7 @@ img#persona_signin {
.moodle-actionmenu[data-enhance] { .moodle-actionmenu[data-enhance] {
display: block; display: block;
.menu { .menu {
display:none; display: none;
} }
.toggle-display { .toggle-display {
display: inline; /** JS is enabled, we'll be using it so return display to normal **/ display: inline; /** JS is enabled, we'll be using it so return display to normal **/
@ -2282,7 +2296,7 @@ img#persona_signin {
.opacity(100); .opacity(100);
} }
.menu-action-text { .menu-action-text {
display:inline; display: inline;
} }
} }
@ -2307,19 +2321,19 @@ img#persona_signin {
.menu { .menu {
display:block; display: block;
position: absolute; position: absolute;
text-align: left; text-align: left;
background-color: @dropdownBackground; background-color: @dropdownBackground;
border: 1px solid @dropdownBorder; border: 1px solid @dropdownBorder;
z-index:1000; z-index: 1000;
.border-radius(5px); .border-radius(5px);
.box-shadow(5px 5px 20px 0 #666); .box-shadow(5px 5px 20px 0 #666);
a { a {
display: block; display: block;
color: @dropdownLinkColor; color: @dropdownLinkColor;
padding:2px 1em 2px 28px; padding: 2px 1em 2px 28px;
&:hover { &:hover {
color: @dropdownLinkColorHover; color: @dropdownLinkColorHover;
background-color: @dropdownLinkBackgroundHover; background-color: @dropdownLinkBackgroundHover;
@ -2332,7 +2346,7 @@ img#persona_signin {
} }
} }
a.hidden { a.hidden {
display:none; display: none;
} }
img { img {
vertical-align: middle; vertical-align: middle;
@ -2343,29 +2357,92 @@ img#persona_signin {
padding: 4px; padding: 4px;
} }
> li { > li {
display:block; display: block;
} }
/** bottom left of button **/ /** bottom left of button **/
&.align-tl-bl {top: 100%;left:0;margin-top: 4px;} &.align-tl-bl {
&.align-tr-bl {top: 100%;right: 100%;} top: 100%;
&.align-bl-bl {bottom: 100%;left:0;} left: 0;
&.align-br-bl {bottom: 100%;right: 100%;} margin-top: 4px;
}
&.align-tr-bl {
top: 100%;
right: 100%;
}
&.align-bl-bl {
bottom: 100%;
left: 0;
}
&.align-br-bl {
bottom: 100%;
right: 100%;
}
/** bottom right of button **/ /** bottom right of button **/
&.align-tl-br {top: 100%;left:100%;} &.align-tl-br {
&.align-tr-br {top: 100%;right: 0;margin-top: 4px;} top: 100%;
&.align-bl-br {bottom: 100%;left:100%;} left: 100%;
&.align-br-br {bottom: 100%;right: 0;} }
&.align-tr-br {
top: 100%;
right: 0;
margin-top: 4px;
}
&.align-bl-br {
bottom: 100%;
left: 100%;
}
&.align-br-br {
bottom: 100%;
right: 0;
}
/** top left of button **/ /** top left of button **/
&.align-tl-tl {top: 0;left:0;} &.align-tl-tl {
&.align-tr-tl {top: 0;right: 100%;margin-right: 4px;} top: 0;
&.align-bl-tl {bottom: 100%;left:0;margin-bottom: 4px;} left: 0;
&.align-br-tl {bottom: 100%;right: 100%;} }
&.align-tr-tl {
top: 0;
right: 100%;
margin-right: 4px;
}
&.align-bl-tl {
bottom: 100%;
left: 0;
margin-bottom: 4px;
}
&.align-br-tl {
bottom: 100%;
right: 100%;
}
/** top right of button **/ /** top right of button **/
&.align-tl-tr {top: 0;left:100%;margin-left: 4px;} &.align-tl-tr {
&.align-tr-tr {top: 0;right: 0;} top: 0;
&.align-bl-tr {bottom: 100%;left:100%;} left: 100%;
&.align-br-tr {bottom: 100%;right: 0;margin-bottom: 4px;} margin-left: 4px;
}
&.align-tr-tr {
top: 0;
right: 0;
}
&.align-bl-tr {
bottom: 100%;
left: 100%;
}
&.align-br-tr {
bottom: 100%;
right: 0;
margin-bottom: 4px;
}
} }
/** no wrap is set - prevent menu items from wrapping **/ /** no wrap is set - prevent menu items from wrapping **/
&.nowrap-items .menu > li { &.nowrap-items .menu > li {
@ -2393,25 +2470,85 @@ img#persona_signin {
} }
/** bottom left of button **/ /** bottom left of button **/
&.align-tl-bl {left: auto; right: 0;} &.align-tl-bl {
&.align-tr-bl {right: auto; left: 100%;} left: auto;
&.align-bl-bl {left: auto; right: 0;} right: 0;
&.align-br-bl {right: auto; left: 100%;} }
&.align-tr-bl {
right: auto;
left: 100%;
}
&.align-bl-bl {
left: auto;
right: 0;
}
&.align-br-bl {
right: auto;
left: 100%;
}
/** bottom right of button **/ /** bottom right of button **/
&.align-tl-br {left: auto; right: 100%;} &.align-tl-br {
&.align-tr-br {right: auto; left: 0;} left: auto;
&.align-bl-br {left: auto; right: 100%;} right: 100%;
&.align-br-br {right: auto; left: 0;} }
&.align-tr-br {
right: auto;
left: 0;
}
&.align-bl-br {
left: auto;
right: 100%;
}
&.align-br-br {
right: auto;
left: 0;
}
/** top left of button **/ /** top left of button **/
&.align-tl-tl {left: auto; right: 0;} &.align-tl-tl {
&.align-tr-tl {right: auto; left: 100%;} left: auto;
&.align-bl-tl {left: auto; right: 0;} right: 0;
&.align-br-tl {right: auto; left: 100%;} }
&.align-tr-tl {
right: auto;
left: 100%;
}
&.align-bl-tl {
left: auto;
right: 0;
}
&.align-br-tl {
right: auto;
left: 100%;
}
/** top right of button **/ /** top right of button **/
&.align-tl-tr {left: auto; right: 100%;} &.align-tl-tr {
&.align-tr-tr {right: auto; left: 0;} left: auto;
&.align-bl-tr {left: auto; right: 100%;} right: 100%;
&.align-br-tr {right: auto; left: 0;} }
&.align-tr-tr {
right: auto;
left: 0;
}
&.align-bl-tr {
left: auto;
right: 100%;
}
&.align-br-tr {
right: auto;
left: 0;
}
} }
} }
.block .moodle-actionmenu { .block .moodle-actionmenu {

454
theme/bootstrapbase/less/moodle/course.less
View file

@ -1,5 +1,6 @@
/* course.less */ /* course.less */
/* COURSE CONTENT */ /* COURSE CONTENT */
/* stylelint-disable unit-blacklist */
.section_add_menus { .section_add_menus {
text-align: right; text-align: right;
clear: both; clear: both;
@ -339,7 +340,8 @@
} }
.course-content ul li.section.hidden { .course-content ul li.section.hidden {
.sectionname > span, .sectionname > span,
.content > div, /* All the divs but the activities which are in a UL. */ .content > div,
/* All the divs but the activities which are in a UL. */
.activity .activityinstance { .activity .activityinstance {
opacity: .5; opacity: .5;
} }
@ -396,7 +398,7 @@
} }
.path-course-view .completionprogress { .path-course-view .completionprogress {
margin-left: 25px margin-left: 25px;
} }
.path-course-view .completionprogress { .path-course-view .completionprogress {
@ -519,7 +521,7 @@ span.editinstructions {
/* Course drag and drop upload styles */ /* Course drag and drop upload styles */
#dndupload-status { #dndupload-status {
position: fixed; position: fixed;
left:0; left: 0;
width: 40%; width: 40%;
margin: 0 30%; margin: 0 30%;
padding: 6px; padding: 6px;
@ -594,7 +596,7 @@ span.editinstructions {
.coursebox > .info > .coursename a { .coursebox > .info > .coursename a {
display: block; display: block;
background-image:url([[pix:moodle|i/course]]); background-image: url([[pix:moodle|i/course]]);
background-repeat: no-repeat; background-repeat: no-repeat;
padding-left: 21px; padding-left: 21px;
background-position: left 0.2em; background-position: left 0.2em;
@ -632,41 +634,41 @@ span.editinstructions {
padding: 0; padding: 0;
} }
.coursebox .content .teachers li { .coursebox .content .teachers li {
list-style-type:none; list-style-type: none;
padding:0; padding: 0;
margin:0; margin: 0;
} }
.coursebox .enrolmenticons { .coursebox .enrolmenticons {
padding:3px 0; padding: 3px 0;
float:right; float: right;
} }
.coursebox .moreinfo { .coursebox .moreinfo {
padding:3px 0; padding: 3px 0;
float:right; float: right;
} }
.coursebox .enrolmenticons img, .coursebox .enrolmenticons img,
.coursebox .moreinfo img { .coursebox .moreinfo img {
margin:0 .2em; margin: 0 .2em;
} }
.coursebox .content { .coursebox .content {
clear:both; clear: both;
} }
.coursebox .content .summary, .coursebox .content .summary,
.coursebox .content .coursecat { .coursebox .content .coursecat {
float:right; float: right;
width: 55%; width: 55%;
} }
.coursebox .content .coursecat { .coursebox .content .coursecat {
text-align:right; text-align: right;
clear:right; clear: right;
} }
.coursebox.remotecoursebox .remotecourseinfo { .coursebox.remotecoursebox .remotecourseinfo {
float:left; float: left;
width: 40%; width: 40%;
} }
.coursebox .content .courseimage img { .coursebox .content .courseimage img {
max-width:100px; max-width: 100px;
max-height:100px; max-height: 100px;
} }
.coursebox .content .coursecat, .coursebox .content .coursecat,
.coursebox .content .summary, .coursebox .content .summary,
@ -674,44 +676,44 @@ span.editinstructions {
.coursebox .content .coursefile, .coursebox .content .coursefile,
.coursebox .content .teachers, .coursebox .content .teachers,
.coursebox.remotecoursebox .remotecourseinfo { .coursebox.remotecoursebox .remotecourseinfo {
margin:3px 5px; margin: 3px 5px;
padding:0; padding: 0;
} }
.coursebox.remotehost > .info > .categoryname a { .coursebox.remotehost > .info > .categoryname a {
background-image:url([[pix:moodle|i/mnethost]]); background-image: url([[pix:moodle|i/mnethost]]);
} }
.dir-rtl .coursebox > .info > .categoryname a { .dir-rtl .coursebox > .info > .categoryname a {
padding-left:0; padding-left: 0;
padding-right:21px; padding-right: 21px;
background-position: center right; background-position: center right;
} }
.dir-rtl .coursebox > .info > .categoryname, .dir-rtl .coursebox > .info > .categoryname,
.dir-rtl .coursebox .teachers, .dir-rtl .coursebox .teachers,
.dir-rtl .coursebox .content .courseimage, .dir-rtl .coursebox .content .courseimage,
.dir-rtl .coursebox .content .coursefile { .dir-rtl .coursebox .content .coursefile {
float:right; float: right;
clear:right; clear: right;
} }
.dir-rtl .coursebox .enrolmenticons, .dir-rtl .coursebox .enrolmenticons,
.dir-rtl .coursebox .moreinfo { .dir-rtl .coursebox .moreinfo {
float:left; float: left;
} }
.dir-rtl .coursebox .summary, .dir-rtl .coursebox .summary,
.dir-rtl .coursebox .coursecat { .dir-rtl .coursebox .coursecat {
float:left; float: left;
} }
.dir-rtl .coursebox .coursecat { .dir-rtl .coursebox .coursecat {
text-align:left; text-align: left;
clear:left; clear: left;
} }
.coursebox.collapsed { .coursebox.collapsed {
margin-bottom:0; margin-bottom: 0;
} }
.coursebox.collapsed > .content { .coursebox.collapsed > .content {
display:none; display: none;
} }
.courses .coursebox.collapsed { .courses .coursebox.collapsed {
border: 1px solid @tableBorder; border: 1px solid @tableBorder;
@ -734,79 +736,79 @@ span.editinstructions {
visibility: hidden; visibility: hidden;
} }
.course_category_tree .controls div { .course_category_tree .controls div {
display:inline; display: inline;
cursor:pointer; cursor: pointer;
} }
.jsenabled .course_category_tree .controls { .jsenabled .course_category_tree .controls {
visibility: visible; visibility: visible;
} }
.course_category_tree .controls { .course_category_tree .controls {
margin-bottom:5px; margin-bottom: 5px;
text-align:right; text-align: right;
float:right; float: right;
} }
.course_category_tree .controls div { .course_category_tree .controls div {
padding-right:2em; padding-right: 2em;
font-size:75%; font-size: 75%;
} }
.course_category_tree .category > .info > .categoryname{ .course_category_tree .category > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed_empty]]); background-image: url([[pix:moodle|t/collapsed_empty]]);
background-repeat: no-repeat; background-repeat: no-repeat;
padding:2px 18px; padding: 2px 18px;
margin:3px; margin: 3px;
background-position:center left; background-position: center left;
} }
.dir-rtl .course_category_tree .category > .info > .categoryname { .dir-rtl .course_category_tree .category > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed_empty_rtl]]); background-image: url([[pix:moodle|t/collapsed_empty_rtl]]);
background-position:center right; background-position: center right;
} }
.course_category_tree .category.with_children > .info > .categoryname { .course_category_tree .category.with_children > .info > .categoryname {
background-image:url([[pix:moodle|t/expanded]]); background-image: url([[pix:moodle|t/expanded]]);
cursor: pointer; cursor: pointer;
} }
.course_category_tree .category.with_children.collapsed >.info > .categoryname { .course_category_tree .category.with_children.collapsed > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed]]); background-image: url([[pix:moodle|t/collapsed]]);
} }
.dir-rtl .course_category_tree .category.with_children.collapsed > .info > .categoryname { .dir-rtl .course_category_tree .category.with_children.collapsed > .info > .categoryname {
background-image:url([[pix:moodle|t/collapsed_rtl]]); background-image: url([[pix:moodle|t/collapsed_rtl]]);
} }
.course_category_tree .category.collapsed>.content { .course_category_tree .category.collapsed > .content {
display:none; display: none;
} }
.course_category_tree .category >.info { .course_category_tree .category > .info {
.well; .well;
min-height:0; min-height: 0;
padding:0; padding: 0;
margin:3px 0; margin: 3px 0;
margin-bottom:3px; margin-bottom: 3px;
clear: both; clear: both;
} }
.course_category_tree.frontpage-category-names .category >.info { .course_category_tree.frontpage-category-names .category > .info {
background:none; background: none;
border:none; border: none;
margin:0; margin: 0;
} }
.course_category_tree .category > .content { .course_category_tree .category > .content {
padding-left:16px; padding-left: 16px;
} }
.dir-rtl .course_category_tree .category > .content { .dir-rtl .course_category_tree .category > .content {
padding-left:0; padding-left: 0;
padding-right:16px; padding-right: 16px;
} }
.course_category_tree .subcategories > .paging, .course_category_tree .subcategories > .paging,
.courses > .paging { .courses > .paging {
margin:0; margin: 0;
padding:5px; padding: 5px;
text-align:center; text-align: center;
} }
.courses > .paging.paging-morelink, .courses > .paging.paging-morelink,
.course_category_tree .subcategories > .paging.paging-morelink { .course_category_tree .subcategories > .paging.paging-morelink {
text-align:left; text-align: left;
} }
.course_category_tree .paging.paging-morelink a { .course_category_tree .paging.paging-morelink a {
@ -814,7 +816,7 @@ span.editinstructions {
} }
.dir-rtl .courses > .paging.paging-morelink, .dir-rtl .courses > .paging.paging-morelink,
.dir-rtl .course_category_tree .paging.paging-morelink { .dir-rtl .course_category_tree .paging.paging-morelink {
text-align:right; text-align: right;
} }
#page-course-index-category .generalbox.info { #page-course-index-category .generalbox.info {
@ -849,8 +851,8 @@ span.editinstructions {
.moodle-actionmenu { .moodle-actionmenu {
.iconsmall { .iconsmall {
max-width: none !important; /** reset sets 100% !important which breaks on IE8 without this !important */ max-width: none !important; /** reset sets 100% !important which breaks on IE8 without this !important */
width:16px; width: 16px;
height:16px; height: 16px;
padding: 4px; padding: 4px;
vertical-align: text-bottom; vertical-align: text-bottom;
} }
@ -885,36 +887,36 @@ span.editinstructions {
*/ */
#course-category-listings { #course-category-listings {
background-color: @tableBackground; background-color: @tableBackground;
margin-bottom:200px; margin-bottom: 200px;
/** Two column layout */ /** Two column layout */
&.columns-2 { &.columns-2 {
> #course-listing > div { > #course-listing > div {
position:relative; position: relative;
left:-1px; left: -1px;
} }
} }
/** Three column layout */ /** Three column layout */
&.columns-3 > #course-listing > div { &.columns-3 > #course-listing > div {
height:100%; height: 100%;
} }
> div > div { > div > div {
min-height:300px; min-height: 300px;
> ul.ml > li:first-child > div { > ul.ml > li:first-child > div {
border-top:0; border-top: 0;
} }
} }
h3 { h3 {
margin:0; margin: 0;
padding:0.4rem 0.6rem 0.3rem; padding: 0.4rem 0.6rem 0.3rem;
} }
h4 { h4 {
margin:1rem 0 0; margin: 1rem 0 0;
padding:0.6rem 1rem 0.5rem; padding: 0.6rem 1rem 0.5rem;
} }
.moodle-actionmenu { .moodle-actionmenu {
white-space:nowrap; white-space: nowrap;
} }
.moodle-actionmenu[data-enhance] { .moodle-actionmenu[data-enhance] {
@ -933,42 +935,44 @@ span.editinstructions {
} }
.listing-actions { .listing-actions {
text-align:center; text-align: center;
padding:0.4rem 0.3rem 0.3rem; padding: 0.4rem 0.3rem 0.3rem;
line-height:2.2em; line-height: 2.2em;
> a, > a,
> .moodle-actionmenu { > .moodle-actionmenu {
display:inline-block; display: inline-block;
} }
> .moodle-actionmenu .menu a { > .moodle-actionmenu .menu a {
padding-left:1rem; padding-left: 1rem;
} }
.moodle-actionmenu:not([data-enhanced]) { .moodle-actionmenu:not([data-enhanced]) {
li {line-height:normal;} li {
line-height: normal;
}
> .menubar a { > .menubar a {
color:inherit; color: inherit;
display:inline-block; display: inline-block;
> img { > img {
display:none; display: none;
} }
.caret { .caret {
display: none; display: none;
} }
} }
> .menu .menu-action-text { > .menu .menu-action-text {
display:inline-block; display: inline-block;
} }
} }
} }
ul.ml { ul.ml {
list-style: none; list-style: none;
margin:1rem 0; margin: 1rem 0;
ul.ml { ul.ml {
margin:0; margin: 0;
} }
} }
li { li {
line-height:2.2em; line-height: 2.2em;
> div { > div {
&:hover { &:hover {
background-color: @tableBackgroundHover; background-color: @tableBackgroundHover;
@ -976,8 +980,8 @@ span.editinstructions {
} }
.tree-icon { .tree-icon {
margin: 2px 6px 0 0; margin: 2px 6px 0 0;
width:12px; width: 12px;
vertical-align:inherit; vertical-align: inherit;
} }
&[data-selected='1'] { &[data-selected='1'] {
> div { > div {
@ -989,24 +993,47 @@ span.editinstructions {
} }
// Tree item indenting to represent depth. // Tree item indenting to represent depth.
.tree-icon {margin-left:0;} .tree-icon {
li .tree-icon {margin-left:1em;} margin-left: 0;
li li .tree-icon {margin-left:2em;} }
li li li .tree-icon {margin-left:3em;}
li li li li .tree-icon {margin-left:4em;} li .tree-icon {
li li li li li .tree-icon {margin-left:4.5em;} margin-left: 1em;
li li li li li li .tree-icon {margin-left:5em;} }
li li li li li li li .tree-icon {margin-left:5.5em;}
li li .tree-icon {
margin-left: 2em;
}
li li li .tree-icon {
margin-left: 3em;
}
li li li li .tree-icon {
margin-left: 4em;
}
li li li li li .tree-icon {
margin-left: 4.5em;
}
li li li li li li .tree-icon {
margin-left: 5em;
}
li li li li li li li .tree-icon {
margin-left: 5.5em;
}
} }
.item-actions { .item-actions {
margin-right:1em; margin-right: 1em;
display:inline-block; display: inline-block;
display:initial; display: initial;
> a img, > a img,
.menubar img { .menubar img {
margin: 0 4px; margin: 0 4px;
height:12px; height: 12px;
padding: 0; padding: 0;
vertical-align: inherit; vertical-align: inherit;
} }
@ -1016,7 +1043,7 @@ span.editinstructions {
} }
img { img {
width: 12px; width: 12px;
max-width:none; max-width: none;
} }
} }
.menu-action-text { .menu-action-text {
@ -1027,26 +1054,26 @@ span.editinstructions {
.listitem { .listitem {
> div { > div {
> .float-left { > .float-left {
float:left; float: left;
} }
> .float-right { > .float-right {
float:right; float: right;
text-align:right; text-align: right;
} }
.item-actions { .item-actions {
.action-show { .action-show {
display:none; display: none;
} }
.action-hide { .action-hide {
display:inline; display: inline;
} }
} }
.without-actions { .without-actions {
color: #333; color: #333;
} }
.idnumber { .idnumber {
color:#a1a1a8; color: #a1a1a8;
margin-right:2em; margin-right: 2em;
} }
} }
// The category or course is hidden. // The category or course is hidden.
@ -1058,10 +1085,10 @@ span.editinstructions {
} }
.item-actions { .item-actions {
.action-show { .action-show {
display:inline; display: inline;
} }
.action-hide { .action-hide {
display:none; display: none;
} }
} }
} }
@ -1079,15 +1106,15 @@ span.editinstructions {
#course-listing { #course-listing {
.listitem { .listitem {
.categoryname { .categoryname {
display:inline-block; display: inline-block;
margin-left:1em; margin-left: 1em;
color:#a1a1a8; color: #a1a1a8;
} }
.coursename { .coursename {
display:inline-block; display: inline-block;
} }
> div { > div {
padding-left:1rem; padding-left: 1rem;
} }
} }
> .firstpage .listitem:first-child > div .item-actions .action-moveup, > .firstpage .listitem:first-child > div .item-actions .action-moveup,
@ -1095,7 +1122,7 @@ span.editinstructions {
display: none; display: none;
} }
.bulk-action-checkbox { .bulk-action-checkbox {
margin:-2px 6px 0 0; margin: -2px 6px 0 0;
} }
} }
#category-listing { #category-listing {
@ -1105,18 +1132,18 @@ span.editinstructions {
.listitem { .listitem {
> div { > div {
> .ba-checkbox { > .ba-checkbox {
width:2.2em; width: 2.2em;
text-align:center; text-align: center;
margin:-1px 0.5em 0 0; margin: -1px 0.5em 0 0;
padding-top:2px; padding-top: 2px;
} }
} }
&.highlight > div > .ba-checkbox { &.highlight > div > .ba-checkbox {
background-color: @tableBackgroundHover; background-color: @tableBackgroundHover;
} }
&[data-selected='1'] > div > .ba-checkbox { &[data-selected='1'] > div > .ba-checkbox {
margin:0 0.5em 0 0; margin: 0 0.5em 0 0;
padding:0; padding: 0;
background-color: inherit; background-color: inherit;
} }
&:first-child > div .item-actions .action-moveup, &:first-child > div .item-actions .action-moveup,
@ -1125,13 +1152,13 @@ span.editinstructions {
} }
} }
.course-count { .course-count {
color:#a1a1a8; color: #a1a1a8;
margin-right:2rem; margin-right: 2rem;
min-width:3.5em; min-width: 3.5em;
display:inline-block; display: inline-block;
.smallicon { .smallicon {
width:12px; width: 12px;
margin-left:4px; margin-left: 4px;
vertical-align: inherit; vertical-align: inherit;
} }
} }
@ -1139,58 +1166,58 @@ span.editinstructions {
margin-right: -3px; margin-right: -3px;
} }
.category-listing > ul > .listitem:first-child { .category-listing > ul > .listitem:first-child {
position:relative; position: relative;
} }
.category-bulk-actions { .category-bulk-actions {
margin: 0 0.5em 0.5em; margin: 0 0.5em 0.5em;
position:relative; position: relative;
} }
} }
.detail-pair { .detail-pair {
border-bottom:1px solid @tableBorder; border-bottom: 1px solid @tableBorder;
margin:0 1rem; margin: 0 1rem;
> * { > * {
display:inline-block; display: inline-block;
line-height:2.2rem; line-height: 2.2rem;
} }
.pair-key { .pair-key {
font-weight:bold; font-weight: bold;
vertical-align: top; vertical-align: top;
span { span {
margin-right: 1rem; margin-right: 1rem;
display:block; display: block;
} }
} }
.pair-value select { .pair-value select {
max-width:100%; max-width: 100%;
} }
} }
.bulk-actions .detail-pair { .bulk-actions .detail-pair {
> * { > * {
display:block; display: block;
width:100%; width: 100%;
} }
} }
.listing-pagination { .listing-pagination {
text-align:center; text-align: center;
.yui3-button { .yui3-button {
background-color: @btnBackground; background-color: @btnBackground;
border:0; border: 0;
margin:0.4rem 0.2rem 0.45rem; margin: 0.4rem 0.2rem 0.45rem;
font-size:10.4px; font-size: 10.4px;
&.active-page { &.active-page {
background-color: @btnBackgroundHighlight; background-color: @btnBackgroundHighlight;
} }
} }
} }
.listing-pagination-totals { .listing-pagination-totals {
text-align:center; text-align: center;
&.dimmed { &.dimmed {
.muted; .muted;
margin:0.4rem 1rem 0.45rem; margin: 0.4rem 1rem 0.45rem;
} }
} }
.select-a-category .notifymessage, .select-a-category .notifymessage,
@ -1203,9 +1230,9 @@ span.editinstructions {
display: none; display: none;
} }
.jsenabled #course-category-listings #course-listing .listitem .drag-handle { .jsenabled #course-category-listings #course-listing .listitem .drag-handle {
display:inline-block; display: inline-block;
margin: 0 6px 0 0; margin: 0 6px 0 0;
cursor:pointer; cursor: pointer;
} }
.dir-rtl #course-category-listings { .dir-rtl #course-category-listings {
@ -1218,11 +1245,11 @@ span.editinstructions {
.listitem { .listitem {
> div { > div {
> .float-left { > .float-left {
float:right; float: right;
} }
> .float-right { > .float-right {
float:left; float: left;
text-align:left; text-align: left;
} }
} }
} }
@ -1232,31 +1259,54 @@ span.editinstructions {
} }
// Tree item indenting to represent depth. // Tree item indenting to represent depth.
.tree-icon {margin-right:0;} .tree-icon {
li .tree-icon {margin-right:1em;} margin-right: 0;
li li .tree-icon {margin-right:2em;} }
li li li .tree-icon {margin-right:3em;}
li li li li .tree-icon {margin-right:4em;} li .tree-icon {
li li li li li .tree-icon {margin-right:4.5em;} margin-right: 1em;
li li li li li li .tree-icon {margin-right:5em;} }
li li li li li li li .tree-icon {margin-right:5.5em;}
li li .tree-icon {
margin-right: 2em;
}
li li li .tree-icon {
margin-right: 3em;
}
li li li li .tree-icon {
margin-right: 4em;
}
li li li li li .tree-icon {
margin-right: 4.5em;
}
li li li li li li .tree-icon {
margin-right: 5em;
}
li li li li li li li .tree-icon {
margin-right: 5.5em;
}
} }
#category-listing { #category-listing {
.listitem { .listitem {
> div { > div {
margin-right:0.5em; margin-right: 0.5em;
margin-left: 0; margin-left: 0;
> .ba-checkbox { > .ba-checkbox {
margin:-1px 0 0 0.5em; margin: -1px 0 0 0.5em;
} }
} }
&[data-selected='1'] > div > .ba-checkbox { &[data-selected='1'] > div > .ba-checkbox {
margin:0 0 0 0.5em; margin: 0 0 0 0.5em;
} }
} }
.course-count { .course-count {
margin-left:2rem; margin-left: 2rem;
.smallicon { .smallicon {
margin-left: 0px; margin-left: 0px;
@ -1272,24 +1322,24 @@ span.editinstructions {
padding-right: 24px; padding-right: 24px;
.listitem { .listitem {
.idnumber { .idnumber {
color:#a1a1a8; color: #a1a1a8;
padding-right:2em; padding-right: 2em;
} }
.categoryname { .categoryname {
display:inline-block; display: inline-block;
margin-right:1em; margin-right: 1em;
margin-left:0; margin-left: 0;
} }
.drag-handle { .drag-handle {
margin: 0 6px 0 6px; margin: 0 6px 0 6px;
} }
> div { > div {
padding-left:1rem; padding-left: 1rem;
} }
} }
.bulk-action-checkbox { .bulk-action-checkbox {
vertical-align:middle; vertical-align: middle;
margin:-2px 0 0 6px; margin: -2px 0 0 6px;
} }
} }
.detail-pair { .detail-pair {
@ -1299,7 +1349,7 @@ span.editinstructions {
} }
.pair-key { .pair-key {
span { span {
margin-right:0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
} }
@ -1311,19 +1361,19 @@ span.editinstructions {
/** Management header styling **/ /** Management header styling **/
.coursecat-management-header { .coursecat-management-header {
vertical-align:middle; vertical-align: middle;
h2 { h2 {
display:inline-block; display: inline-block;
text-align:left; text-align: left;
} }
> div { > div {
display:inline-block; display: inline-block;
float:right; float: right;
line-height:40px; line-height: 40px;
> div { > div {
margin-left:1em; margin-left: 1em;
margin: 10px 0; margin: 10px 0;
display:inline-block; display: inline-block;
} }
} }
select { select {
@ -1335,28 +1385,28 @@ span.editinstructions {
} }
.view-mode-selector { .view-mode-selector {
.moodle-actionmenu { .moodle-actionmenu {
white-space:nowrap; white-space: nowrap;
display:inline-block; display: inline-block;
} }
.moodle-actionmenu[data-enhanced].show .menu a { .moodle-actionmenu[data-enhanced].show .menu a {
padding-left:1em; padding-left: 1em;
} }
} }
} }
.dir-rtl .coursecat-management-header { .dir-rtl .coursecat-management-header {
h2 { h2 {
text-align:right; text-align: right;
} }
> div { > div {
float:left; float: left;
margin-right:1em; margin-right: 1em;
margin-left: 0; margin-left: 0;
} }
} }
.course-being-dragged-proxy { .course-being-dragged-proxy {
border: 0; border: 0;
color: @linkColor; color: @linkColor;
vertical-align:middle; vertical-align: middle;
padding: 0 0 0 4em; padding: 0 0 0 4em;
} }
.course-being-dragged { .course-being-dragged {
@ -1374,11 +1424,11 @@ span.editinstructions {
@media (min-width: 1200px) and (max-width: 1600px) { @media (min-width: 1200px) and (max-width: 1600px) {
#course-category-listings.columns-3 { #course-category-listings.columns-3 {
background-color: @tableBackground; background-color: @tableBackground;
border:0; border: 0;
#category-listing, #category-listing,
#course-listing { #course-listing {
width:50%; width: 50%;
} }
#category-listing > div, #category-listing > div,
#course-listing > div, #course-listing > div,
@ -1386,8 +1436,8 @@ span.editinstructions {
background-color: @tableBackground; background-color: @tableBackground;
} }
#course-detail { #course-detail {
width:100%; width: 100%;
margin-top:1em; margin-top: 1em;
} }
} }
@ -1397,12 +1447,12 @@ span.editinstructions {
#course-category-listings.columns-2, #course-category-listings.columns-2,
#course-category-listings.columns-3 { #course-category-listings.columns-3 {
background-color: @tableBackground; background-color: @tableBackground;
border:0; border: 0;
#category-listing, #category-listing,
#course-listing, #course-listing,
#course-detail { #course-detail {
width:100%; width: 100%;
margin:0 0 1em; margin: 0 0 1em;
} }
#category-listing > div, #category-listing > div,
#course-listing > div, #course-listing > div,

4
theme/bootstrapbase/less/moodle/dock.less
View file

@ -51,7 +51,7 @@ body.has_dock {
display: block; display: block;
width: @dockWidth; width: @dockWidth;
margin: @dockTitleMargin; margin: @dockTitleMargin;
padding:0; padding: 0;
cursor: pointer; cursor: pointer;
h2 { h2 {
.transform-test-heading; .transform-test-heading;
@ -108,7 +108,7 @@ body.has_dock {
h2 { h2 {
.nav-header; .nav-header;
font-size: 1.1em; font-size: 1.1em;
padding:0; padding: 0;
margin: 0; margin: 0;
} }
.commands { .commands {

12
theme/bootstrapbase/less/moodle/expendable.less
View file

@ -34,8 +34,9 @@ table {
table.flexible, table.flexible,
.generaltable, .generaltable,
.generaltable thead:first-child tr:first-child { .generaltable thead:first-child tr:first-child {
td , th { td,
text-align:right; th {
text-align: right;
} }
} }
table { table {
@ -46,8 +47,9 @@ table {
} }
#page-admin-course-index.dir-rtl .editcourse { #page-admin-course-index.dir-rtl .editcourse {
td , th { td,
text-align:right; th {
text-align: right;
} }
} }
@ -89,7 +91,7 @@ div[id^="progress_pbar_"] {
float: left !important; float: left !important;
font-size: 12px !important; font-size: 12px !important;
text-align: center !important; text-align: center !important;
text-shadow: 0 -1px 0 rgba(0,0,0,.25) !important; text-shadow: 0 -1px 0 rgba(0, 0, 0, .25) !important;
#gradient > .vertical(#149bdf, #0480be) !important; #gradient > .vertical(#149bdf, #0480be) !important;
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)) !important; .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)) !important;
.box-sizing(border-box) !important; .box-sizing(border-box) !important;

54
theme/bootstrapbase/less/moodle/filemanager.less
View file

@ -104,20 +104,20 @@
.file-picker .fp-repo-items { .file-picker .fp-repo-items {
float: none; float: none;
width: auto; width: auto;
margin-left:181px; margin-left: 181px;
} }
.moodle-dialogue-fullscreen .file-picker .fp-repo-items { .moodle-dialogue-fullscreen .file-picker .fp-repo-items {
margin-left: 0px; margin-left: 0px;
margin-right:0px; margin-right: 0px;
float: left; float: left;
} }
.dir-rtl .file-picker .fp-repo-items { .dir-rtl .file-picker .fp-repo-items {
margin-left: 0px; margin-left: 0px;
margin-right:181px; margin-right: 181px;
} }
.dir-rtl .moodle-dialogue-fullscreen .file-picker .fp-repo-items { .dir-rtl .moodle-dialogue-fullscreen .file-picker .fp-repo-items {
margin-left: 0px; margin-left: 0px;
margin-right:0px; margin-right: 0px;
float: right; float: right;
} }
.file-picker .fp-navbar { .file-picker .fp-navbar {
@ -269,17 +269,17 @@
height: 30px; height: 30px;
border-right: 1px solid #CCC; border-right: 1px solid #CCC;
display: block; display: block;
float:left; float: left;
} }
.fp-viewbar a.checked:hover, .fp-viewbar a.checked:hover,
.fp-viewbar a:hover { .fp-viewbar a:hover {
background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%); background-image: radial-gradient(ellipse at center, #ffffff 60%, #dfdfdf 100%);
background-color: #ebebeb; background-color: #ebebeb;
} }
.fp-viewbar a.checked, .fp-viewbar a.checked,
.fp-viewbar a:active { .fp-viewbar a:active {
background-image: radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%); background-image: radial-gradient(ellipse at center, #ffffff 40%, #dfdfdf 100%);
background-color: #dfdfdf; background-color: #dfdfdf;
} }
@ -613,7 +613,7 @@ a.ygtvspacer:hover {
.file-picker .fp-login-form .fp-login-input .input { .file-picker .fp-login-form .fp-login-input .input {
text-align: left; text-align: left;
} }
.file-picker .fp-login-form input[type="checkbox"]{ .file-picker .fp-login-form input[type="checkbox"] {
width: 15px; width: 15px;
height: 15px; height: 15px;
} }
@ -764,10 +764,10 @@ a.ygtvspacer:hover {
display: none; display: none;
} }
// File Manager // File Manager
.filemanager-loading{ .filemanager-loading {
display: none; display: none;
} }
.jsenabled .filemanager-loading{ .jsenabled .filemanager-loading {
display: block; display: block;
margin-top: 100px; margin-top: 100px;
} }
@ -804,7 +804,7 @@ a.ygtvspacer:hover {
} }
// File Manager layout // File Manager layout
.filemanager { .filemanager {
.fp-restrictions{ .fp-restrictions {
text-align: right; text-align: right;
} }
} }
@ -813,7 +813,7 @@ a.ygtvspacer:hover {
border: 1px solid #BBBBBB; border: 1px solid #BBBBBB;
border-bottom: none; border-bottom: none;
} }
.filemanager-toolbar{ .filemanager-toolbar {
padding: 4px; padding: 4px;
overflow: hidden; overflow: hidden;
} }
@ -833,8 +833,7 @@ a.ygtvspacer:hover {
.fp-toolbar .fp-tb-help, .fp-toolbar .fp-tb-help,
.fp-toolbar .fp-tb-manage, .fp-toolbar .fp-tb-manage,
.fp-toolbar .fp-tb-logout, .fp-toolbar .fp-tb-logout,
.fp-toolbar .fp-tb-refresh .fp-toolbar .fp-tb-refresh {
{
border: 1px solid #CCC; border: 1px solid #CCC;
border-bottom: 1px solid #B3B3B3; border-bottom: 1px solid #B3B3B3;
border-radius: 4px; border-radius: 4px;
@ -844,12 +843,12 @@ a.ygtvspacer:hover {
} }
.fp-toolbar a:hover { .fp-toolbar a:hover {
background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%); background-image: radial-gradient(ellipse at center, #ffffff 60%, #dfdfdf 100%);
background-color: #ebebeb; background-color: #ebebeb;
} }
.fp-toolbar a:active { .fp-toolbar a:active {
background-image: radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%); background-image: radial-gradient(ellipse at center, #ffffff 40%, #dfdfdf 100%);
background-color: #dfdfdf; background-color: #dfdfdf;
} }
@ -859,8 +858,7 @@ a.ygtvspacer:hover {
.fp-tb-help a, .fp-tb-help a,
.fp-tb-manage a, .fp-tb-manage a,
.fp-tb-logout a, .fp-tb-logout a,
.fp-tb-refresh a .fp-tb-refresh a {
{
display: block; display: block;
width: 30px; width: 30px;
height: 30px; height: 30px;
@ -889,7 +887,7 @@ a.ygtvspacer:hover {
min-height: 140px; min-height: 140px;
position: relative; position: relative;
} }
.filemanager .fp-content{ .filemanager .fp-content {
overflow: auto; overflow: auto;
max-height: 472px; max-height: 472px;
min-height: 157px; min-height: 157px;
@ -944,20 +942,20 @@ a.ygtvspacer:hover {
width: 100%; width: 100%;
} }
.filemanager .yui3-datatable-header { .filemanager .yui3-datatable-header {
background: #FFFFFF!important; background: #FFFFFF !important;
border-bottom: 1px solid #CCCCCC!important; border-bottom: 1px solid #CCCCCC !important;
border-left: 0 solid #FFFFFF!important; border-left: 0 solid #FFFFFF !important;
color: #555555!important; color: #555555 !important;
} }
.filemanager .yui3-datatable-odd .yui3-datatable-cell { .filemanager .yui3-datatable-odd .yui3-datatable-cell {
background-color: #F6F6F6!important; background-color: #F6F6F6 !important;
border-left: 0 solid #F6F6F6; border-left: 0 solid #F6F6F6;
} }
.filemanager .yui3-datatable-even .yui3-datatable-cell { .filemanager .yui3-datatable-even .yui3-datatable-cell {
background-color: #FFFFFF!important; background-color: #FFFFFF !important;
border-left: 0 solid #FFFFFF; border-left: 0 solid #FFFFFF;
} }
.filemanager .fp-filename-icon.fp-hasreferences .fp-reficons1{ .filemanager .fp-filename-icon.fp-hasreferences .fp-reficons1 {
background: url('[[pix:theme|fp/link_sm]]') no-repeat 0 0; background: url('[[pix:theme|fp/link_sm]]') no-repeat 0 0;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -1196,7 +1194,7 @@ a.ygtvspacer:hover {
// RTL Overrides // RTL Overrides
.dir-rtl { .dir-rtl {
.filemanager { .filemanager {
.fp-restrictions{ .fp-restrictions {
text-align: left; text-align: left;
} }
} }
@ -1222,7 +1220,7 @@ a.ygtvspacer:hover {
} }
div { div {
float: right; float: right;
margin-left:4px; margin-left: 4px;
} }
} }
} }

18
theme/bootstrapbase/less/moodle/forms.less
View file

@ -18,7 +18,7 @@ form {
display: block; display: block;
} }
.mform fieldset.group { .mform fieldset.group {
margin-bottom: 0 margin-bottom: 0;
} }
.mform fieldset.error { .mform fieldset.error {
border: 1px solid @errorText; border: 1px solid @errorText;
@ -155,7 +155,7 @@ input#id_externalurl {
.dir-rtl { .dir-rtl {
.form-item .form-label, .form-item .form-label,
.mform .fitem div.fitemtitle { .mform .fitem div.fitemtitle {
float:right; float: right;
text-align: left; text-align: left;
} }
} }
@ -329,7 +329,7 @@ div.backup-section + form,
width: 100%; width: 100%;
} }
#page-grade-edit-outcome-course .courseoutcomes td { #page-grade-edit-outcome-course .courseoutcomes td {
text-align:center; text-align: center;
} }
/* Install Process' text fields Forms, should always be justified to the left */ /* Install Process' text fields Forms, should always be justified to the left */
#installform #id_wwwroot, #installform #id_wwwroot,
@ -372,7 +372,7 @@ input[type="checkbox"] {
.singleselect { .singleselect {
display: inline-block; display: inline-block;
form, form,
select{ select {
margin: 0; margin: 0;
} }
} }
@ -380,7 +380,7 @@ input[type="checkbox"] {
margin-bottom: 0; margin-bottom: 0;
} }
.dir-rtl .form-item .form-label label { .dir-rtl .form-item .form-label label {
text-align:left; text-align: left;
} }
.felement.ffilepicker { .felement.ffilepicker {
margin-top: 5px; margin-top: 5px;
@ -439,7 +439,7 @@ fieldset.coursesearchbox label {
width: auto; width: auto;
} }
} }
.fitem_fcheckbox{ .fitem_fcheckbox {
.fitemtitle, .fitemtitle,
.felement { .felement {
display: inline-block; display: inline-block;
@ -489,9 +489,11 @@ fieldset.coursesearchbox label {
* 1199px + (1199px * 23%) * 1199px + (1199px * 23%)
* Where 23% is the width of span3 * Where 23% is the width of span3
* Full calculation is: * Full calculation is:
* @maxWidthForVerticalForms: 1199px * (unit(((@fluidGridColumnWidth1200 * 3) + (@fluidGridGutterWidth * (3 - 1)))) / 100) + 1199px; * @maxWidthForVerticalForms: 1199px * (unit(((@fluidGridColumnWidth1200 * 3) +
* (@fluidGridGutterWidth * (3 - 1)))) / 100) + 1199px;
*/ */
@maxWidthForVerticalForms: 1474px; @maxWidthForVerticalForms: 1474px;
@media (max-width: @maxWidthForVerticalForms) { @media (max-width: @maxWidthForVerticalForms) {
.used-region-side-pre.used-region-side-post { .used-region-side-pre.used-region-side-post {
.makeFormsVertical; .makeFormsVertical;
@ -506,7 +508,7 @@ fieldset.coursesearchbox label {
} }
select, select,
input[type=text] { input[type=text] {
position:relative; position: relative;
top: 4px; top: 4px;
} }
label { label {

8
theme/bootstrapbase/less/moodle/grade.less
View file

@ -72,7 +72,8 @@
} }
.gradingform_rubric.editor { .gradingform_rubric.editor {
.addlevel, .addcriterion { .addlevel,
.addcriterion {
input { input {
// Fallback for IE8: we use Bootstrap 2's button styles normally, but // Fallback for IE8: we use Bootstrap 2's button styles normally, but
// IE8 ignores background-image: linear-gradient rules. // IE8 ignores background-image: linear-gradient rules.
@ -183,7 +184,8 @@
// Should handle at least three chars with room to spare. // Should handle at least three chars with room to spare.
float: none; float: none;
width: 2em; width: 2em;
&.hiddenelement,&.pseudotablink { &.hiddenelement,
&.pseudotablink {
// Zero out the width if it's still in the block flow for some reason // Zero out the width if it's still in the block flow for some reason
// when hidden // when hidden
width: 0; width: 0;
@ -214,7 +216,7 @@
background: transparent url([[pix:t/add]]) no-repeat 7px 8px; background: transparent url([[pix:t/add]]) no-repeat 7px 8px;
padding-left: 26px; padding-left: 26px;
} }
margin-bottom:1em; margin-bottom: 1em;
} }
.options { .options {
clear: both; clear: both;

13
theme/bootstrapbase/less/moodle/message.less
View file

@ -163,6 +163,7 @@ table.message .searchresults td {
border-left: 1px solid @tableBorder; border-left: 1px solid @tableBorder;
padding: 0 8px; padding: 0 8px;
} }
@media screen and (max-width: 1000px) { @media screen and (max-width: 1000px) {
width: 100%; width: 100%;
} }
@ -223,12 +224,13 @@ table.message .searchresults td {
margin: 0 3%; margin: 0 3%;
} }
.message .messagearea .messagehistory .user { .message .messagearea .messagehistory .user {
width: 32% width: 32%;
} }
} }
@media screen and (min-width: 1200px) { @media screen and (min-width: 1200px) {
.message .messagearea .messagehistory .user { .message .messagearea .messagehistory .user {
width: 25% width: 25%;
} }
} }
.message .messagearea .messagehistory .heading { .message .messagearea .messagehistory .heading {
@ -321,7 +323,8 @@ table.message .searchresults td {
.message .visible { .message .visible {
display: inline; display: inline;
} }
.message #usergroupselector.fieldset, .message #viewing { .message #usergroupselector.fieldset,
.message #viewing {
width: 100%; width: 100%;
} }
.messagesearchresults { .messagesearchresults {
@ -360,12 +363,12 @@ table.message .searchresults td {
} }
/* Widen the plain text editor on the bulk message screen */ /* Widen the plain text editor on the bulk message screen */
#page-user-action_redir #edit-messagebody { #page-user-action_redir #edit-messagebody {
width:auto; width: auto;
} }
/** Messenger send message dialog */ /** Messenger send message dialog */
.core_message-messenger-sendmessage-hidden { .core_message-messenger-sendmessage-hidden {
display:none; display: none;
} }
.core_message-messenger-sendmessage { .core_message-messenger-sendmessage {
.message-actions { .message-actions {

34
theme/bootstrapbase/less/moodle/modules.less
View file

@ -45,7 +45,7 @@ select {
text-align: right; text-align: right;
} }
thead .header th, thead .header th,
tbody .discussion td{ tbody .discussion td {
&.discussionsubscription { &.discussionsubscription {
width: 16px; width: 16px;
padding-left: 0.5em; padding-left: 0.5em;
@ -53,7 +53,9 @@ select {
} }
} }
.discussion { .discussion {
.author, .replies, .lastpost { .author,
.replies,
.lastpost {
white-space: normal; white-space: normal;
} }
.discussionsubscription, .discussionsubscription,
@ -148,7 +150,8 @@ select {
border-top: 2px solid @tableBorder; border-top: 2px solid @tableBorder;
} }
.maincalendar .calendarmonth td,.maincalendar .calendarmonth th { .maincalendar .calendarmonth td,
.maincalendar .calendarmonth th {
border: 1px dotted @tableBorder; border: 1px dotted @tableBorder;
} }
@ -299,12 +302,22 @@ div#dock {
.path-mod-survey { .path-mod-survey {
.surveytable { .surveytable {
> tbody > tr:nth-of-type(odd) {background-color: @tableBackground;} > tbody > tr:nth-of-type(odd) {
> tbody > tr:nth-of-type(even) {background-color: @tableBackgroundAccent;} background-color: @tableBackground;
.rblock label {text-align: center;}
} }
.resultgraph, .reportsummary, .studentreport, .reportbuttons, .centerpara { > tbody > tr:nth-of-type(even) {
text-align:center; background-color: @tableBackgroundAccent;
}
.rblock label {
text-align: center;
}
}
.resultgraph,
.reportsummary,
.studentreport,
.reportbuttons,
.centerpara {
text-align: center;
} }
} }
// rtl overrides // rtl overrides
@ -384,7 +397,7 @@ div#dock {
.userbutton { .userbutton {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
.avatars{ .avatars {
display: inline-block; display: inline-block;
height: 36px; height: 36px;
width: 36px; width: 36px;
@ -596,7 +609,6 @@ div#dock {
} }
.box-shadow (0 5px 10px rgba(0, 0, 0, 0.2)); .box-shadow (0 5px 10px rgba(0, 0, 0, 0.2));
} }
&:hover .toggle-display {}
} }
} }
} }
@ -678,7 +690,7 @@ div#dock {
margin-bottom: -34px; margin-bottom: -34px;
border: 1px solid #fff; border: 1px solid #fff;
border-radius: 50%; border-radius: 50%;
box-shadow: -2px -2px 16px rgba(0,0,0,0.25); box-shadow: -2px -2px 16px rgba(0, 0, 0, 0.25);
} }
img { img {
width: inherit; width: inherit;

20
theme/bootstrapbase/less/moodle/question.less
View file

@ -74,6 +74,9 @@
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
padding: 0.24em 0; padding: 0.24em 0;
} }
// TODO: MDL-55142 remove browser these brwoser hacks:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
#chooseqtype .alloptions { #chooseqtype .alloptions {
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
@ -85,6 +88,8 @@
max-height: 60vh; max-height: 60vh;
width: 60%; width: 60%;
} }
/* stylelint-enable */
#chooseqtype .qtypeoption { #chooseqtype .qtypeoption {
margin-bottom: 0; margin-bottom: 0;
padding: 0.3em 0.3em 0.3em 1.6em; padding: 0.3em 0.3em 0.3em 1.6em;
@ -239,8 +244,7 @@ body.path-question-type .fitem_fgroup .accesshide {
.path-mod-quiz input[size] { .path-mod-quiz input[size] {
width: auto; width: auto;
} }
.que .outcome {
}
.que .comment { .que .comment {
.alert-success; .alert-success;
} }
@ -294,7 +298,7 @@ body.path-question-type .fitem_fgroup .accesshide {
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus { &:focus {
border-color: darken(@borderColor, 10%); border-color: darken(@borderColor, 10%);
@shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); @shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten(@borderColor, 20%);
.box-shadow(@shadow); .box-shadow(@shadow);
} }
} }
@ -386,10 +390,10 @@ body.path-question-type .fitem_fgroup .accesshide {
#page-mod-quiz-edit div.questionbank .categoryquestionscontainer { #page-mod-quiz-edit div.questionbank .categoryquestionscontainer {
background: transparent; background: transparent;
} }
#page-mod-quiz-edit #categoryquestions>thead { #page-mod-quiz-edit #categoryquestions > thead {
background: #FFF; background: #FFF;
} }
#page-mod-quiz-edit #categoryquestions>tbody>tr:nth-of-type(even) { #page-mod-quiz-edit #categoryquestions > tbody > tr:nth-of-type(even) {
background: #e4e4e4; background: #e4e4e4;
} }
@ -414,7 +418,8 @@ body.path-question-type .fitem_fgroup .accesshide {
#page-mod-quiz-edit .createnewquestion { #page-mod-quiz-edit .createnewquestion {
padding: 0.3em 0; padding: 0.3em 0;
div, input { div,
input {
margin: 0; margin: 0;
} }
} }
@ -502,7 +507,8 @@ body.path-question-type .fitem_fgroup .accesshide {
strong { strong {
display: block; display: block;
} }
hr, br { hr,
br {
display: none; display: none;
} }
strong { strong {

41
theme/bootstrapbase/less/moodle/responsive.less
View file

@ -3,6 +3,9 @@
// Should probably be moved to relevant .less files // Should probably be moved to relevant .less files
// after 4095 selector issue is solved // after 4095 selector issue is solved
// TODO: MDL-55142 remove browser hacks in this file:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
@media (min-width: 980px) { @media (min-width: 980px) {
.dir-rtl .navbar .nav.pull-right, .dir-rtl .navbar .nav.pull-right,
.dir-rtl .navbar .logininfo { .dir-rtl .navbar .logininfo {
@ -17,7 +20,7 @@
} }
@media (min-width: (@navbarCollapseDesktopWidth) ) { @media (min-width: (@navbarCollapseDesktopWidth)) {
a[id]:empty::before, a[id]:empty::before,
a[name]:empty::before { a[name]:empty::before {
@ -320,7 +323,7 @@
} }
.jsenabled .choosercontainer #chooseform .instruction, .jsenabled .choosercontainer #chooseform .instruction,
.jsenabled .choosercontainer #chooseform .typesummary { .jsenabled .choosercontainer #chooseform .typesummary {
position:static; position: static;
} }
.que .info { .que .info {
float: none; float: none;
@ -341,7 +344,7 @@
} }
// Stuart's 2,1,3 layout // Stuart's 2,1,3 layout
@media (min-width : 768px) { @media (min-width: 768px) {
.row-fluid .desktop-first-column { .row-fluid .desktop-first-column {
margin-left: 0; margin-left: 0;
} }
@ -349,7 +352,8 @@
display: inline; display: inline;
} }
} }
@media (max-width : 767px) {
@media (max-width: 767px) {
.row-fluid .desktop-first-column { .row-fluid .desktop-first-column {
clear: both; clear: both;
} }
@ -365,7 +369,7 @@
padding-top: 0; padding-top: 0;
text-align: left; text-align: left;
} }
.form-item .form-label label{ .form-item .form-label label {
display: inline-block; display: inline-block;
margin-right: .5em; margin-right: .5em;
} }
@ -398,7 +402,7 @@
} }
} }
// Shrink calender when short on space in block // Shrink calender when short on space in block
@media (min-width : 768px) and (max-width: 979px) { @media (min-width: 768px) and (max-width: 979px) {
.block_calendar_month .content, .block_calendar_month .content,
.block .minicalendar td { .block .minicalendar td {
padding-left: 0; padding-left: 0;
@ -408,17 +412,17 @@
.dir-rtl { .dir-rtl {
.dropdown-menu { .dropdown-menu {
right:0; right: 0;
left:auto; left: auto;
margin-right: 0px; margin-right: 0px;
} }
.navbar .nav > li > .dropdown-menu:before { .navbar .nav > li > .dropdown-menu:before {
right:9px; right: 9px;
left:auto; left: auto;
} }
.navbar .nav > li > .dropdown-menu:after { .navbar .nav > li > .dropdown-menu:after {
right: 10px; right: 10px;
left:auto; left: auto;
} }
.dropdown-submenu > a:after { .dropdown-submenu > a:after {
margin-right: 0; margin-right: 0;
@ -429,8 +433,8 @@
border-width: 5px 5px 5px 0px; border-width: 5px 5px 5px 0px;
} }
.dropdown-submenu > .dropdown-menu { .dropdown-submenu > .dropdown-menu {
right:100%; right: 100%;
left:auto; left: auto;
} }
} }
@ -450,8 +454,7 @@
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus, .dropdown-menu > li > a:focus,
.dropdown-submenu:hover > a, .dropdown-submenu:hover > a,
.dropdown-submenu:focus > a .dropdown-submenu:focus > a {
{
background-image: none; background-image: none;
color: @grayDark; color: @grayDark;
} }
@ -480,7 +483,9 @@
font-size: round(@fontSizeSmall); font-size: round(@fontSizeSmall);
} }
.discussion { .discussion {
.author, .replies, .lastpost { .author,
.replies,
.lastpost {
font-size: round(@fontSizeSmall); font-size: round(@fontSizeSmall);
} }
.replies .unread a { .replies .unread a {
@ -766,7 +771,7 @@
// CSS for the course management pages. // CSS for the course management pages.
#course-category-listings.columns-3 { #course-category-listings.columns-3 {
background-color: @tableBackground; background-color: @tableBackground;
border:0; border: 0;
#category-listing, #category-listing,
#course-listing { #course-listing {
@ -797,7 +802,7 @@
// CSS for the course management pages. // CSS for the course management pages.
#course-category-listings.columns-3 { #course-category-listings.columns-3 {
background-color: @tableBackground; background-color: @tableBackground;
border:0; border: 0;
#category-listing, #category-listing,
#course-listing, #course-listing,
#course-detail { #course-detail {

6
theme/bootstrapbase/less/moodle/templates.less
View file

@ -1,5 +1,7 @@
/* Styling for mustache templates */ /* Styling for mustache templates */
// TODO: MDL-55142 remove browser these brwoser hacks:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
// RTL styles for column templates. // RTL styles for column templates.
#grid { #grid {
// A mixin to set styles for the fluid row when RTL language enabled. // A mixin to set styles for the fluid row when RTL language enabled.
@ -20,13 +22,15 @@
} }
} }
} }
/* stylelint-enable */
// Style for template 3 columns auto. // Style for template 3 columns auto.
.columns-autoflow-1to1to1 { .columns-autoflow-1to1to1 {
.content-columns(3); .content-columns(3);
} }
@media(max-width: 767px) { @media (max-width: 767px) {
// Change to a single column for smaller screens. // Change to a single column for smaller screens.
.columns-autoflow-1to1to1 { .columns-autoflow-1to1to1 {
.content-columns(1, 0); .content-columns(1, 0);

7
theme/bootstrapbase/less/moodle/user.less
View file

@ -55,7 +55,7 @@
.dir-rtl { .dir-rtl {
.user-box { .user-box {
float:right; float: right;
} }
.userprofile .node_category { .userprofile .node_category {
.editprofile, .editprofile,
@ -64,7 +64,7 @@
} }
} }
.userprofile dl dd { .userprofile dl dd {
margin-left:0; margin-left: 0;
margin-right: 10px; margin-right: 10px;
} }
} }
@ -238,7 +238,8 @@
> .singlebutton { > .singlebutton {
display: inline-block; display: inline-block;
margin: 0 0 0 0.5em; margin: 0 0 0 0.5em;
div, input { div,
input {
margin: 0; margin: 0;
} }
} }