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

Fix: Move the "View Posts..." anchor out of the role=toolbar section in the header #15693

Merged
merged 1 commit into from
May 20, 2019
Merged

Fix: Move the "View Posts..." anchor out of the role=toolbar section in the header #15693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/edit-post/src/components/header/fullscreen-mode-close/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
display: none;

@include break-medium() {
display: block;
display: flex;
border-top: 0;
border-bottom: 0;
border-left: 0;
margin: -9px 10px -9px -10px;
margin: -9px 10px -8px -10px;
padding: 9px 10px;
}
}
6 changes: 0 additions & 6 deletions packages/edit-post/src/components/header/header-toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ import {
EditorHistoryUndo,
} from '@wordpress/editor';

/**
* Internal dependencies
*/
import FullscreenModeClose from '../fullscreen-mode-close';

function HeaderToolbar( { hasFixedToolbar, isLargeViewport, showInserter, isTextModeEnabled } ) {
const toolbarAriaLabel = hasFixedToolbar ?
/* translators: accessibility text for the editor toolbar when Top Toolbar is on */
Expand All @@ -35,7 +30,6 @@ function HeaderToolbar( { hasFixedToolbar, isLargeViewport, showInserter, isText
className="edit-post-header-toolbar"
aria-label={ toolbarAriaLabel }
>
<FullscreenModeClose />
<div>
<Inserter disabled={ ! showInserter } position="bottom right" />
<DotTip tipId="core/editor.inserter">
Expand Down
10 changes: 7 additions & 3 deletions packages/edit-post/src/components/header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import { DotTip } from '@wordpress/nux';
/**
* Internal dependencies
*/
import MoreMenu from './more-menu';
import FullscreenModeClose from './fullscreen-mode-close';
import HeaderToolbar from './header-toolbar';
import MoreMenu from './more-menu';
import PinnedPlugins from './pinned-plugins';
import shortcuts from '../../keyboard-shortcuts';
import PostPublishButtonOrToggle from './post-publish-button-or-toggle';
import shortcuts from '../../keyboard-shortcuts';

function Header( {
closeGeneralSidebar,
Expand All @@ -38,7 +39,10 @@ function Header( {
className="edit-post-header"
tabIndex="-1"
>
<HeaderToolbar />
<div className="edit-post-header__toolbar">
<FullscreenModeClose />
<HeaderToolbar />
</div>
<div className="edit-post-header__settings">
{ ! isPublishSidebarOpened && (
// This button isn't completely hidden by the publish sidebar.
Expand Down
4 changes: 4 additions & 0 deletions packages/edit-post/src/components/header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@

@include editor-left(".edit-post-header");

.edit-post-header__toolbar {
display: flex;
}

.edit-post-header__settings {
display: inline-flex;
align-items: center;
Expand Down