Skip to content

Commit

Permalink
Remove unwanted HTML from translations, fix InputSelect css bug (#1129)
Browse files Browse the repository at this point in the history
  • Loading branch information
julianguyen authored Oct 10, 2018
1 parent 9f565f6 commit 22dfaf5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
17 changes: 14 additions & 3 deletions client/app/components/Input/Input.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
@import "../../styles/_global.scss";

@mixin paddingForSelectIcon($padding) {
padding-right: $padding * 2 + $size-12;
@media screen and (max-width: $medium) {
padding-right: $padding + $size-12;
}
}

.small {
.default,
.tagAutocomplete {
Expand All @@ -10,7 +17,8 @@
@include setPadding($size-0, $size-18, $size-0, $size-18);
}
select {
@include setPadding($size-18, $size-18, $size-18, $size-18);
@include setPadding($size-18, $size-0, $size-18, $size-18);
@include paddingForSelectIcon($size-18);
}
}
}
Expand All @@ -27,7 +35,8 @@
}
select {
@include setFontSize($size-20);
@include setPadding($size-26, $size-26, $size-26, $size-26);
@include setPadding($size-26, $size-0, $size-26, $size-26);
@include paddingForSelectIcon($size-26);
}
}
.label,
Expand Down Expand Up @@ -102,12 +111,14 @@
right: $size-0;
color: $white;
height: $size-20;
width: $size-12;
top: calc(50% - 10px);
pointer-events: none;
}
select {
@include setFontSize($size-18);
@include setPadding($size-24, $size-24, $size-24, $size-24);
@include setPadding($size-24, $size-0, $size-24, $size-24);
@include paddingForSelectIcon($size-24);
color: $white;
font-weight: $font-weight-400;
width: 100%;
Expand Down
6 changes: 3 additions & 3 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ de:
app_description: 'ist eine Community rund um das Thema psychische Gesundheit'
email: '[email protected]'
ellipsis: " [...]"
created: '<strong>Erstellt:</strong> %{created_at}'
created: 'Erstellt %{created_at}'
draft: "Draft"
edited: '<strong>Erstellt:</strong> %{created_at} <em>(geändert)</em>'
edited_updated_at: '<strong>Erstellt:</strong> %{created_at} <em>(geändert %{updated_at})</em>'
edited: 'Erstellt %{created_at} (geändert)'
edited_updated_at: 'Erstellt %{created_at} (geändert %{updated_at})'
salutation: "Hallo %{name},"
click_here: "Klick hier"
less: " [Less]"
Expand Down
6 changes: 3 additions & 3 deletions config/locales/vi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ vi:
app_description: 'Đồng sức khỏe tâm thần'
email: '[email protected]'
ellipsis: " [...]"
created: '<strong>Tạo:</strong> %{created_at}'
created: 'Tạo %{created_at}'
draft: "Nháp"
edited: '<strong>Tạo:</strong> %{created_at} <em>(chỉnh sửa)</em>'
edited_updated_at: '<strong>Created:</strong> %{created_at} <em>(edited %{updated_at})</em>'
edited: 'Tạo %{created_at} (chỉnh sửa)'
edited_updated_at: 'Created %{created_at} (edited %{updated_at})'
salutation: "Xin chào %{name},"
click_here: "nhấn vào đây"
less: " [Ít hơn]"
Expand Down

0 comments on commit 22dfaf5

Please sign in to comment.