Merge branch 'MDL-69069-master' of git://github.com/bmbrands/moodle

This commit is contained in:
Andrew Nicols 2020-09-03 09:32:36 +08:00
commit ce7b2f4a20
3 changed files with 45 additions and 23 deletions

View file

@ -537,13 +537,15 @@ span.editinstructions {
margin-left: 30px;
font-size: $font-size-sm;
padding: .1em .4em;
background-color: $state-info-bg;
color: $info;
text-decoration: none;
z-index: 9999;
border: $alert-border-width solid transparent;
@include box-shadow(2px 2px 5px 1px #ccc);
border: 1px solid $state-info-border;
@include alert-variant(
theme-color-level('info', $alert-bg-level),
theme-color-level('info', $alert-border-level),
theme-color-level('info', $alert-color-level)
);
}
/* Course drag and drop upload styles */
@ -553,14 +555,15 @@ span.editinstructions {
width: 40%;
margin: 0 30%;
padding: 6px;
border: 1px solid $state-info-border;
text-align: center;
background: $state-info-bg;
color: $info;
z-index: 1; // Required in order to have this above relatively positioned course content@mixin
border: $alert-border-width solid transparent;
@include box-shadow(2px 2px 5px 1px #ccc);
@include border-radius(8px);
@include alert-variant(
theme-color-level('info', $alert-bg-level),
theme-color-level('info', $alert-border-level),
theme-color-level('info', $alert-color-level)
);
}
.dndupload-preview {

View file

@ -13543,11 +13543,16 @@ span.editinstructions {
margin-left: 30px;
font-size: 0.8203125rem;
padding: .1em .4em;
background-color: #cce6ea;
color: #008196;
text-decoration: none;
z-index: 9999;
border: 1px solid #b8dce2; }
border: 0 solid transparent;
color: #00434e;
background-color: #cce6ea;
border-color: #b8dce2; }
span.editinstructions hr {
border-top-color: #a6d3db; }
span.editinstructions .alert-link {
color: #00171b; }
/* Course drag and drop upload styles */
#dndupload-status {
@ -13556,11 +13561,16 @@ span.editinstructions {
width: 40%;
margin: 0 30%;
padding: 6px;
border: 1px solid #b8dce2;
text-align: center;
background: #cce6ea;
color: #008196;
z-index: 1; }
z-index: 1;
border: 0 solid transparent;
color: #00434e;
background-color: #cce6ea;
border-color: #b8dce2; }
#dndupload-status hr {
border-top-color: #a6d3db; }
#dndupload-status .alert-link {
color: #00171b; }
.dndupload-preview {
color: #909090;

View file

@ -13757,11 +13757,16 @@ span.editinstructions {
margin-left: 30px;
font-size: 0.8203125rem;
padding: .1em .4em;
background-color: #cce6ea;
color: #008196;
text-decoration: none;
z-index: 9999;
border: 1px solid #b8dce2; }
border: 0 solid transparent;
color: #00434e;
background-color: #cce6ea;
border-color: #b8dce2; }
span.editinstructions hr {
border-top-color: #a6d3db; }
span.editinstructions .alert-link {
color: #00171b; }
/* Course drag and drop upload styles */
#dndupload-status {
@ -13770,12 +13775,16 @@ span.editinstructions {
width: 40%;
margin: 0 30%;
padding: 6px;
border: 1px solid #b8dce2;
text-align: center;
background: #cce6ea;
color: #008196;
z-index: 1;
border-radius: 8px; }
border: 0 solid transparent;
color: #00434e;
background-color: #cce6ea;
border-color: #b8dce2; }
#dndupload-status hr {
border-top-color: #a6d3db; }
#dndupload-status .alert-link {
color: #00171b; }
.dndupload-preview {
color: #909090;