mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-11-15 02:13:40 +01:00 committed by Dan Poltawski
commit 2589802489
6 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/outputrenderers.php
View File

@ -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;

6
theme/boost/scss/moodle/buttons.scss
View File

@ -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,

4
theme/boost/scss/moodle/filemanager.scss
View File

@ -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;
}

6
theme/bootstrapbase/less/moodle/buttons.less
View File

@ -113,12 +113,6 @@ button {
}
}
input {
&.fp-btn-choose {
.btn-small
}
}
.user-enroller-panel {
.uep-search-results {
.user,

3
theme/bootstrapbase/less/moodle/filemanager.less
View File

@ -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;
}

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

@ -5500,9 +5500,6 @@ a.ygtvspacer:hover {
.fitem.disabled .filemanager-container {
background-color: #ebebe4;
}
.fitem.disabled .fp-btn-choose {
color: #999;
}
.fitem.disabled .filepicker-filelist .filepicker-filename {
display: none;
}
@ -15887,13 +15884,6 @@ button.yui3-button.closebutton {
button.yui3-button.closebutton:hover {
background-position: 0 0;
}
input.fp-btn-choose {
padding: 2px 10px;
font-size: 11.9px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.user-enroller-panel .uep-search-results .user .options .enrol,
.user-enroller-panel .uep-search-results .cohort .options .enrol {
padding: 0 6px;