Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: emoji upload button always appeared disabled

This commit is contained in:
Neil Lalonde 2015-08-21 13:13:15 -04:00
parent 4f85420088
commit 73264648f2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
View File

@ -1,6 +1,6 @@
{{text-field name="name" placeholderKey="admin.emoji.name" value=name}}
<label class="btn btn-primary" {{bind-attr disabled="addDisabled"}}>
<label {{bind-attr class=":btn :btn-primary addDisabled:disabled"}}>
{{fa-icon "plus"}}
{{i18n 'admin.emoji.add'}}
<input {{bind-attr disabled="addDisabled"}} type="file" accept=".png,.gif" style="visibility: hidden; position: absolute;" />
<input disabled={{addDisabled}} type="file" accept=".png,.gif" style="visibility: hidden; position: absolute;" />
</label>

6
app/assets/stylesheets/common/components/buttons.css.scss
View File

@ -55,7 +55,7 @@
background: dark-light-diff($primary, $secondary, 65%, -75%);
color: #fff;
}
&[disabled] {
&[disabled], &.disabled {
background: dark-light-diff($primary, $secondary, 90%, -60%);
&:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); }
cursor: not-allowed;
@ -88,7 +88,7 @@
@include linear-gradient(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -10%));
color: #fff;
}
&[disabled] {
&[disabled], &.disabled {
background: $tertiary;
}
}
@ -109,7 +109,7 @@
&:active {
@include linear-gradient(scale-color($danger, $lightness: -20%), $danger);
}
&[disabled] {
&[disabled], &.disabled {
background: $danger;
}
}