rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3551 from westlywright/fp.translations.bugs 

Translation Typos
This commit is contained in:
Westly Wright 2019-11-07 09:14:02 -07:00 committed by GitHub
parent 1a5f84cb1f e6cadb6755
commit 51cf3eba87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/styles/components/_forms.scss
View File

@ -94,6 +94,13 @@ select {
width: 100%; width: 100%;
color: $input-color; color: $input-color;
// firefox quirk, options were not inheriting there parents color styles
option,
optgroup {
color: $input-color;
background: $input-bg;
}
&[size] { &[size] {
display: inline-block; display: inline-block;
width: auto; width: auto;

2
lib/shared/addon/components/form-project-targets/component.js
View File

@ -39,7 +39,7 @@ export default Component.extend({
const clusterDisplayName = get(p, 'cluster.displayName'); const clusterDisplayName = get(p, 'cluster.displayName');
const out = { const out = {
name: get(p, 'name'), name: get(p, 'displayName'),
value: get(p, 'id'), value: get(p, 'id'),
cluster: clusterDisplayName cluster: clusterDisplayName
}; };

3
lib/shared/addon/components/searchable-select/component.js
View File

@ -297,10 +297,11 @@ export default Component.extend({
if (key) { if (key) {
let group = out.filterBy('group', key)[0]; let group = out.filterBy('group', key)[0];
let groupLabel = this.intl.exists(key) ? this.intl.t(key) : key;
if (!group) { if (!group) {
group = { group = {
group: key, group: groupLabel,
options: [] options: []
}; };
out.push(group); out.push(group);

2
lib/shared/addon/components/searchable-select/template.hbs
View File

@ -71,7 +71,7 @@
{{#each groupedContent as |group|}} {{#each groupedContent as |group|}}
<div class="searchable-group"> <div class="searchable-group">
<div class="group-label">{{t group.group}}</div> <div class="group-label">{{group.group}}</div>
{{#each group.options as |item idx|}} {{#each group.options as |item idx|}}
<div <div
class="searchable-option" class="searchable-option"