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

fix: restore line beneath page header #7676

Merged
merged 3 commits into from
May 7, 2021
Merged

fix: restore line beneath page header #7676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0c72ae
Update Page.tsx
beyackle May 6, 2021
c65d671
Update BotProjectSettings.tsx
beyackle May 6, 2021
fbb17c1
Merge branch 'main' into beyackle/7656_missingLine
beyackle May 6, 2021
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
2 changes: 2 additions & 0 deletions Composer/packages/client/src/components/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import { jsx, css, SerializedStyles } from '@emotion/core';
import React, { useMemo } from 'react';
import { FontWeights, FontSizes } from 'office-ui-fabric-react/lib/Styling';
import { NeutralColors } from '@uifabric/fluent-theme';
import { Toolbar, IToolbarItem } from '@bfc/ui-shared';
import { useRecoilValue } from 'recoil';
import { Split, SplitMeasuredSizes } from '@geoffcox/react-splitter';
Expand Down Expand Up @@ -52,6 +53,7 @@ export const header = css`
flex-shrink: 0;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid ${NeutralColors.gray30};

label: PageHeader;
`;
Expand Down
9 changes: 0 additions & 9 deletions Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ import { BotProjectSettingsTabView } from './BotProjectsSettingsTabView';

// -------------------- Styles -------------------- //

const header = css`
padding: 5px 20px;
display: flex;
justify-content: space-between;
label: PageHeader;
border-bottom: 1px solid silver;
`;

const container = css`
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -134,7 +126,6 @@ const BotProjectSettings: React.FC<RouteComponentProps<{ projectId: string; skil
<Page
useDebugPane
data-testid="BotProjectsSettings"
headerStyle={header}
mainRegionName={formatMessage('Bot projects settings list View')}
navLinks={navLinks}
navRegionName={formatMessage('Bot Projects Settings Navigation Pane')}
Expand Down