mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-57945-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
David Monllao 2017-07-24 13:24:31 +02:00
commit 87d1c6134f
11 changed files with 2731 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.stylelintrc
View File

@ -1,18 +1,22 @@
{
"plugins": [
"stylelint-csstree-validator"
],
"rules": {
"csstree/validator": true,
"at-rule-empty-line-before": [ "always",
{"except": [ "blockless-group"], ignore: ["after-comment", "all-nested"]}
{"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
],
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-no-unknown": null, # Enabled for non-scss in grunt.
"at-rule-semicolon-newline-after": "always",
"at-rule-semicolon-space-before": "never",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-newline-before": "always",
"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-newline-after": "always",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": ["lower", { "severity": "warning" }],
@ -21,7 +25,6 @@
"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",
@ -32,6 +35,7 @@
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-no-important": true,
"font-family-no-duplicate-names": true,
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
@ -41,7 +45,7 @@
"function-name-case": "lower",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-url-data-uris": never,
"function-url-scheme-blacklist": ["data"],
"function-whitespace-after": "always",
"indentation": 4,
"keyframe-declaration-no-important": true,
@ -50,14 +54,12 @@
"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-parentheses-space-inside": "never",
"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": null, # Enabled for non-scss in grunt.
"no-empty-source": true,
"no-eol-whitespace": true,
"no-extra-semicolons": [true, { "severity": "warning" }],
@ -78,11 +80,10 @@
"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,
"string-no-newline": true,
"time-no-imperceptible": true,
"time-min-milliseconds": 100,
"unit-blacklist": ["pt"],
"unit-case": "lower",
"unit-no-unknown": true,

2
Gruntfile.js
View File

@ -194,7 +194,6 @@ module.exports = function(grunt) {
rules: {
// These rules have to be disabled in .stylelintrc for scss compat.
"at-rule-no-unknown": true,
"no-browser-hacks": [true, {"severity": "warning"}]
}
}
},
@ -211,7 +210,6 @@ module.exports = function(grunt) {
rules: {
// These rules have to be disabled in .stylelintrc for scss compat.
"at-rule-no-unknown": true,
"no-browser-hacks": [true, {"severity": "warning"}]
}
}
}

24
mod/assign/styles.css
View File

@ -546,9 +546,9 @@
.path-mod-assign [data-region="review-panel"].collapsed [data-region="review-panel-content"] {
visibility: hidden;
-webkit-transition: visibility 0 0.5s;
-moz-transition: visibility 0 0.5s;
transition: visibility 0 0.5s;
-webkit-transition: visibility 0s 0.5s;
-moz-transition: visibility 0s 0.5s;
transition: visibility 0s 0.5s;
}
.path-mod-assign [data-region="review-panel"].collapsed [data-region="review-panel-toggle"] .expand-icon {
@ -598,9 +598,9 @@
left: calc(100% - 30px);
right: calc(30px - 100%);
visibility: hidden;
-webkit-transition: right 0.5s, left 0.5s, visibility 0 0.5s;
-moz-transition: right 0.5s, left 0.5s, visibility 0 0.5s;
transition: right 0.5s, left 0.5s, visibility 0 0.5s;
-webkit-transition: right 0.5s, left 0.5s, visibility 0s 0.5s;
-moz-transition: right 0.5s, left 0.5s, visibility 0s 0.5s;
transition: right 0.5s, left 0.5s, visibility 0s 0.5s;
}
.path-mod-assign [data-region="grade-panel"].fullwidth {
@ -1103,9 +1103,9 @@
visibility: visible;
opacity: 1;
height: auto;
-webkit-transition: visibility 0 0.25s, opacity 0 0.25s;
-moz-transition: visibility 0 0.25s, opacity 0 0.25s;
transition: visibility 0 0.25s, opacity 0 0.25s;
-webkit-transition: visibility 0s 0.25s, opacity 0s 0.25s;
-moz-transition: visibility 0s 0.25s, opacity 0s 0.25s;
transition: visibility 0s 0.25s, opacity 0s 0.25s;
}
.path-mod-assign [data-region="review-panel"] [data-region="review-panel-toggle"] .expand-icon .rtl-icon {
@ -1125,9 +1125,9 @@
.path-mod-assign [data-region="review-panel"].collapsed [data-region="review-panel-toggle"] {
width: 100%;
border-radius: 0 0 0 0;
-webkit-transition: all 0 0.25s;
-moz-transition: all 0 0.25s;
transition: all 0 0.25s;
-webkit-transition: all 0s 0.25s;
-moz-transition: all 0s 0.25s;
transition: all 0s 0.25s;
}
.path-mod-assign [data-region="review-panel"].collapsed [data-region="review-panel-toggle"] img {

2926
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@ -15,8 +15,9 @@
"grunt-stylelint": "0.6.0",
"semver": "5.3.0",
"shifter": "0.5.0",
"stylelint": "7.4.1",
"stylelint": "8.0.0",
"stylelint-checkstyle-formatter": "0.1.0",
"stylelint-csstree-validator": "1.1.1",
"xmldom": "0.1.22",
"xpath": "0.0.23"
},

2
theme/bootstrapbase/less/moodle/bootstrapoverride.less vendored
View File

@ -65,7 +65,7 @@ h4 small {
}
// TODO: MDL-55142 remove browser these brwoser hacks:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
.fluid-span-full (@columns, @columnWidth, @gutterWidth) {
width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1));
*width: (@columnWidth * @columns) + (@gutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);

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

@ -1384,7 +1384,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
border-bottom: 1px solid #bbb;
background: #ccc;
#gradient > .vertical(#fff, #ccc);
filter: 0;
filter: none;
}
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 {
padding: 0;

2
theme/bootstrapbase/less/moodle/question.less
View File

@ -76,7 +76,7 @@
}
// TODO: MDL-55142 remove browser these brwoser hacks:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
#chooseqtype .alloptions {
overflow-x: hidden;
overflow-y: auto;

2
theme/bootstrapbase/less/moodle/responsive.less
View File

@ -4,7 +4,7 @@
// 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 */
/* stylelint-disable declaration-block-no-duplicate-properties */
@media (min-width: (@navbarCollapseDesktopWidth)) {

2
theme/bootstrapbase/less/moodle/templates.less
View File

@ -1,7 +1,7 @@
/* Styling for mustache templates */
// TODO: MDL-55142 remove browser these brwoser hacks:
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
// RTL styles for column templates.
#grid {
// A mixin to set styles for the fluid row when RTL language enabled.

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

@ -3724,7 +3724,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
background-image: linear-gradient(to bottom, #fff, #ccc);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffcccccc', GradientType=0);
filter: 0;
filter: none;
}
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 {
padding: 0;
@ -9062,7 +9062,7 @@ a.ygtvspacer:hover {
border-bottom: 1px solid #bbb;
padding: 0.24em 0;
}
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
#chooseqtype .alloptions {
overflow-x: hidden;
overflow-y: auto;
@ -15610,7 +15610,7 @@ h4 small {
content: "";
}
}
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
/* stylelint-enable */
/**
* Implement missing variables, or faulty ones, in Bootstrap rules.
@ -19429,7 +19429,7 @@ span[data-flexitour="container"][x-placement="right-start"] div[data-role="arrow
border-right-color: #fff;
}
/* Styling for mustache templates */
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
/* stylelint-enable */
.columns-autoflow-1to1to1 {
-webkit-column-count: 3;
@ -20538,7 +20538,7 @@ span[data-flexitour="container"][x-placement="right-start"] div[data-role="arrow
}
}
/* responsive.less */
/* stylelint-disable declaration-block-no-duplicate-properties, no-browser-hacks */
/* stylelint-disable declaration-block-no-duplicate-properties */
@media (min-width: 980px) {
a[id]:empty::before,
a[name]:empty::before {