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.

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

fix: Adjusted padding in the Form Editor and RootField fonts #1973

Merged
merged 3 commits into from
Feb 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
.ObjectItem .ObjectItemField {
flex: 1;
overflow: hidden;
padding: 0px 18px;
padding: 0px 12px;
margin: 10px 0;
}

.ObjectItem .ObjectItemField {
padding: 0px 18px;
padding: 0px 12px;
margin: 10px 0;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

/** @jsx jsx */
import { jsx } from '@emotion/core';
import React from 'react';
import formatMessage from 'format-message';
import { MicrosoftInputDialog } from '@bfc/shared';
Expand All @@ -9,6 +11,7 @@ import { LgEditorWidget } from '../../widgets/LgEditorWidget';
import { WidgetLabel } from '../../widgets/WidgetLabel';
import { BFDFieldProps } from '../../types';

import { field } from './styles';
import { GetSchema, PromptFieldChangeHandler } from './types';

interface BotAsksProps extends BFDFieldProps<MicrosoftInputDialog> {
Expand All @@ -20,7 +23,7 @@ export const BotAsks: React.FC<BotAsksProps> = props => {
const { onChange, getSchema, formData, formContext } = props;

return (
<>
<div css={field}>
<WidgetLabel label={formatMessage('Prompt')} description={getSchema('prompt').description} />
<LgEditorWidget
name="prompt"
Expand All @@ -29,6 +32,6 @@ export const BotAsks: React.FC<BotAsksProps> = props => {
formContext={formContext}
height={125}
/>
</>
</div>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const tabs: Partial<IPivotStyles> = {
flex: 1,
},
itemContainer: {
padding: '24px 18px',
padding: '12px 12px',
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import { css } from '@emotion/core';

// offset ObjectField's margin
export const regexEditorContainer = css`
margin: 0 -18px -26px -18px;
margin: 0 -12px -26px -12px;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const RootField: React.FC<RootFieldProps> = props => {
styles={{ field: { fontWeight: FontWeights.semibold }, root: { margin: '5px 0 7px -9px' } }}
fontSize={FontSizes.size20}
/>
<p className="RootFieldSubtitle">{getSubTitle()}</p>
<p className={classnames('RootFieldSubtitle', FontClassNames.smallPlus)}>{getSubTitle()}</p>
{sdkOverrides.description !== false && (description || schema.description) && (
<p className={classnames('RootFieldDescription', FontClassNames.smallPlus)}>
{getDescription()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@
}
.RootFieldTitle {
border-bottom: 1px solid #c8c6c4;
padding: 0 18px;
padding: 0 12px;
margin-bottom: 0px;
}
.RootFieldSubtitle {
height: 15px;
line-height: 15px;
font-size: 12px;
font-weight: 600;
color: #4F4F4F;
margin: -7px 0 7px;
margin: 12px 0;
}
.RootFieldDescription {
margin-top: 0;
margin-bottom: 10px;
margin-bottom: 12px;
white-space: pre-line;
}
.RootFieldMetaData {
Expand Down