Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SDESK-3805][SDESK-3807] Fixing alignment issues with event dates. #1112

Merged
merged 2 commits into from
Jan 15, 2019
Merged

[SDESK-3805][SDESK-3807] Fixing alignment issues with event dates. #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eac6b58
[SDESK-3805][SDESK-3807] Fixing alignment issues with event dates.
Jan 15, 2019
946424e
[SDESK-3801] Fixing the tooltip for not for publication icon.
Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/components/Events/RecurringRulesInput/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ export class RecurringRulesInput extends React.Component {
const interval = get(schedule, 'recurring_rule.interval');

return (
<div>
<div className="recurring-rules">
<Row noPadding>
<div className="flex-grid">
{!onlyUpdateRepetitions && <Label row text={gettext('Every')} noMinWidth padding/>}
{!onlyUpdateRepetitions && <LineInput {...this.props} isSelect={true} readOnly={readOnly}
noMargin={frequency === 'WEEKLY'}
noMargin={true}
className="form__row form__row--max-width-35">
<Select
field="dates.recurring_rule.interval"
Expand Down Expand Up @@ -95,7 +95,7 @@ export class RecurringRulesInput extends React.Component {
padding
marginLeft={!onlyUpdateRepetitions} />
<LineInput {...this.props} isSelect={true} readOnly={readOnly}
noMargin={frequency === 'WEEKLY'}
noMargin={true}
className="form__row form__row--max-width-80">
<Select
field="dates.recurring_rule.endRepeatMode"
Expand Down Expand Up @@ -123,7 +123,7 @@ export class RecurringRulesInput extends React.Component {
{endRepeatMode === 'count' &&
<div className="form__row form__row--flex">
<LineInput {...this.props} readOnly={readOnly}
noMargin={frequency === 'WEEKLY'}
noMargin={true}
invalid={!!get(errors, 'count')}
message={get(errors, 'count', '')} >
<Input
Expand Down
9 changes: 9 additions & 0 deletions client/components/Events/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,13 @@

.sd-line-input__input--related-item-link {
margin-right: 0.6rem;
}

.recurring-rules {
.sd-line-input {
&--no-margin {
margin-top: 0;
margin-bottom: 0;
}
}
}
3 changes: 2 additions & 1 deletion client/components/ItemActionConfirmation/forms/updateTimeForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ export class UpdateTimeComponent extends React.Component {
<FormRow
flex={true}
noPadding={true}
halfWidth={true}
invalid={!!get(this.state, 'errors._startTime')}
>
<Label text={gettext('From')} row={true}/>
Expand All @@ -174,7 +175,7 @@ export class UpdateTimeComponent extends React.Component {
/>
</FormRow>

<FormRow flex={true}>
<FormRow flex={true} halfWidth={true}>
<Label
text={gettext('To')}
row={true}
Expand Down
5 changes: 4 additions & 1 deletion client/components/UI/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,8 @@ export const ICON_COLORS = {
DEFAULT: false,
};

export const TOOLTIPS = {postedState: gettext('Posted')};
export const TOOLTIPS = {
postedState: gettext('Posted'),
notForPublication: gettext('Not For Publication'),
};