Commit 25898024 authored by Eloy Lafuente's avatar Eloy Lafuente Committed by Dan Poltawski
Browse files

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

parents 5a9a2c61 f6dabb31
......@@ -2604,7 +2604,7 @@ $icon_progress
</div>
<div id="filepicker-wrapper-{$client_id}" class="mdl-left" style="display:none">
<div>
<input type="button" class="fp-btn-choose" id="filepicker-button-{$client_id}" value="{$straddfile}"{$buttonname}/>
<input type="button" class="btn btn-secondary fp-btn-choose" id="filepicker-button-{$client_id}" value="{$straddfile}"{$buttonname}/>
<span> $maxsize </span>
</div>
EOD;
......
......@@ -46,12 +46,6 @@ p.arrow_button {
margin: 0 0 10px 5px;
}
input {
&.fp-btn-choose {
@extend .btn-sm;
}
}
.user-enroller-panel {
.uep-search-results {
.user,
......
......@@ -607,10 +607,6 @@ a.ygtvspacer:hover {
background-color: #ebebe4;
}
.fitem.disabled .fp-btn-choose {
@extend .text-muted;
}
.fitem.disabled .filepicker-filelist .filepicker-filename {
display: none;
}
......
......@@ -113,12 +113,6 @@ button {
}
}
input {
&.fp-btn-choose {
.btn-small
}
}
.user-enroller-panel {
.uep-search-results {
.user,
......
......@@ -800,9 +800,6 @@ a.ygtvspacer:hover {
.fitem.disabled .filemanager-container {
background-color: #ebebe4;
}
.fitem.disabled .fp-btn-choose {
.muted
}
.fitem.disabled .filepicker-filelist .filepicker-filename {
display: none;
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment