github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 07:12:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Fix local-dates styling (#12085)

Browse Source 
Renames the new `relative-time` component to `relative-time-picker` to
avoid CSS class conflict with local-dates.
This commit is contained in:
David Taylor 2021-02-15 10:44:30 +00:00 committed by GitHub
parent c256b94ae0
commit d8705ee0ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/components/relative-time.js → app/assets/javascripts/discourse/app/components/relative-time-picker.js
View File

@ -39,10 +39,10 @@ export default Component.extend({
@discourseComputed @discourseComputed
intervals() { intervals() {
return [ return [
{ id: "mins", name: I18n.t("relative_time.minutes") }, { id: "mins", name: I18n.t("relative_time_picker.minutes") },
{ id: "hours", name: I18n.t("relative_time.hours") }, { id: "hours", name: I18n.t("relative_time_picker.hours") },
{ id: "days", name: I18n.t("relative_time.days") }, { id: "days", name: I18n.t("relative_time_picker.days") },
{ id: "months", name: I18n.t("relative_time.months") }, { id: "months", name: I18n.t("relative_time_picker.months") },
]; ];
}, },

2
app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
View File

@ -24,7 +24,7 @@
{{#if useDuration}} {{#if useDuration}}
<div class="controls"> <div class="controls">
<label class="control-label">Duration</label> <label class="control-label">Duration</label>
{{relative-time onChange=(action "durationChanged") durationMinutes=(readonly topicTimer.duration_minutes)}} {{relative-time-picker onChange=(action "durationChanged") durationMinutes=(readonly topicTimer.duration_minutes)}}
</div> </div>
{{/if}} {{/if}}
{{#if willCloseImmediately}} {{#if willCloseImmediately}}

2
app/assets/javascripts/discourse/app/templates/components/relative-time.hbs → app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
View File

@ -1,4 +1,4 @@
<div class="relative-time"> <div class="relative-time-picker">
{{input class="relative-time-duration" min="0.1" step="0.01" type="number" value=duration onChange=(action "onChangeDuration")}} {{input class="relative-time-duration" min="0.1" step="0.01" type="number" value=duration onChange=(action "onChangeDuration")}}
{{combo-box {{combo-box
content=intervals content=intervals

2
app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
View File

@ -29,7 +29,7 @@
{{#if option.isRelativeTimeShortcut}} {{#if option.isRelativeTimeShortcut}}
{{#if relativeTimeSelected}} {{#if relativeTimeSelected}}
<div class="control-group custom-date-time-wrap"> <div class="control-group custom-date-time-wrap">
{{relative-time onChange=(action "relativeTimeChanged")}} {{relative-time-picker onChange=(action "relativeTimeChanged")}}
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/stylesheets/common/components/_index.scss
View File

@ -17,7 +17,7 @@
@import "ignored-user-list"; @import "ignored-user-list";
@import "keyboard_shortcuts"; @import "keyboard_shortcuts";
@import "navs"; @import "navs";
@import "relative-time"; @import "relative-time-picker";
@import "share-and-invite-modal"; @import "share-and-invite-modal";
@import "svg"; @import "svg";
@import "tap-tile"; @import "tap-tile";

2
app/assets/stylesheets/common/components/relative-time.scss → app/assets/stylesheets/common/components/relative-time-picker.scss
View File

@ -1,4 +1,4 @@
.relative-time { .relative-time-picker {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

2
config/locales/client.en.yml
View File

@ -575,7 +575,7 @@ en:
title: "Why are you rejecting this user?" title: "Why are you rejecting this user?"
send_email: "Send rejection email" send_email: "Send rejection email"
relative_time: relative_time_picker:
minutes: "minute(s)" minutes: "minute(s)"
hours: "hour(s)" hours: "hour(s)"
days: "day(s)" days: "day(s)"