Skip to content

Commit

Permalink
Merge branch 'MDL-55372-master' of git://github.com/danpoltawski/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Aug 30, 2016
2 parents 7db1961 + 6bb410c commit dacfc6f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .csslintrc

This file was deleted.

2 changes: 2 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"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",
Expand All @@ -63,6 +64,7 @@
"no-invalid-double-slash-comments": true,
"no-unknown-animations": true,
"property-case": "lower",
"property-no-unknown": true,
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
Expand Down
1 change: 0 additions & 1 deletion theme/bootstrapbase/less/moodle/responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
width: 100%;
height: auto;
max-height: 220px;
y-scroll: auto;
float: none;
border: 0px;
}
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit dacfc6f

Please sign in to comment.