L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-71454-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2021-05-03 15:34:22 +08:00
parent 6d3107641d 0102485180
commit a8c8d2edf6
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/boost/scss/moodle/course.scss
+13 -1
View File
@@ -201,7 +201,19 @@ body:not(.editing) .sitetopic ul.section {
.section .activity.modtype_label.label {
font-weight: normal;
padding: .2em;
// Remove min-height for labels so top and bottom paddings can be displayed more consistently.
.contentwithoutlink {
min-height: 0;
}
// When activity information is shown remove the bottom margin for the last p/i elements.
&.hasinfo {
p:last-child,
i:last-child {
margin-bottom: 0;
}
}
}
.section li.activity {
theme/boost/scss/moodle/undo.scss
+1 -1
View File
@@ -13,7 +13,6 @@ li.activity.label,
color: inherit;
border: inherit;
text-shadow: none;
padding: 8px;
white-space: normal;
display: block;
font-size: inherit;
@@ -24,6 +23,7 @@ li.activity.label,
.file-picker td.label {
display: table-cell;
text-align: right;
padding: 8px;
}
// Some of this dialog is sized in ems so a different font size
theme/boost/style/moodle.css
+8 -4
View File
@@ -13392,8 +13392,12 @@ body:not(.editing) .sitetopic ul.section {
display: inline-block; }
.section .activity.modtype_label.label {
font-weight: normal;
padding: .2em; }
font-weight: normal; }
.section .activity.modtype_label.label .contentwithoutlink {
min-height: 0; }
.section .activity.modtype_label.label.hasinfo p:last-child,
.section .activity.modtype_label.label.hasinfo i:last-child {
margin-bottom: 0; }
.section li.activity {
padding: 0.2em;
@@ -18590,7 +18594,6 @@ li.activity.label,
color: inherit;
border: inherit;
text-shadow: none;
padding: 8px;
white-space: normal;
display: block;
font-size: inherit;
@@ -18599,7 +18602,8 @@ li.activity.label,
.file-picker td.label {
display: table-cell;
text-align: right; }
text-align: right;
padding: 8px; }
.choosercontainer #chooseform .option label {
font-size: 12px; }
theme/classic/style/moodle.css
+8 -4
View File
@@ -13614,8 +13614,12 @@ body:not(.editing) .sitetopic ul.section {
display: inline-block; }
.section .activity.modtype_label.label {
font-weight: normal;
padding: .2em; }
font-weight: normal; }
.section .activity.modtype_label.label .contentwithoutlink {
min-height: 0; }
.section .activity.modtype_label.label.hasinfo p:last-child,
.section .activity.modtype_label.label.hasinfo i:last-child {
margin-bottom: 0; }
.section li.activity {
padding: 0.2em;
@@ -18833,7 +18837,6 @@ li.activity.label,
color: inherit;
border: inherit;
text-shadow: none;
padding: 8px;
white-space: normal;
display: block;
font-size: inherit;
@@ -18842,7 +18845,8 @@ li.activity.label,
.file-picker td.label {
display: table-cell;
text-align: right; }
text-align: right;
padding: 8px; }
.choosercontainer #chooseform .option label {
font-size: 12px; }