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 regression with formatting toolbar #7167

Merged
merged 1 commit into from
Jun 6, 2018
Merged

Fix regression with formatting toolbar #7167

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
6 changes: 4 additions & 2 deletions edit-post/components/header/header-toolbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
display: inline-flex;
align-items: center;

.editor-block-switcher .components-toolbar {
border: none;
@include break-large() {
.editor-block-switcher .components-toolbar {
border-left: 1px solid $light-gray-500;
}
}
}

Expand Down
5 changes: 1 addition & 4 deletions editor/components/block-list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,11 +803,8 @@
.editor-block-contextual-toolbar .editor-block-toolbar {
width: 100%;
background: $white;

// use opacity to work in various editor styles
background-clip: padding-box;
box-sizing: padding-box;
border: 1px solid $light-gray-500;
border-right: none;

// this prevents floats from messing up the position
position: absolute;
Expand Down
7 changes: 0 additions & 7 deletions editor/components/block-switcher/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
.editor-block-switcher {
position: relative;

.components-toolbar {
border-left: none;
}
}

.editor-block-switcher__toggle {
Expand All @@ -12,9 +8,6 @@
padding: 8px;
border-radius: 0;

// Add a right border to show as separator in the block toolbar.
border-right: 1px solid $light-gray-700;

&:focus:before {
top: -3px;
right: -3px;
Expand Down
3 changes: 3 additions & 0 deletions editor/components/block-toolbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

.components-toolbar {
border: none;

// Add a right border to show as separator in the block toolbar.
border-right: 1px solid $light-gray-500;
}

// this should probably have its own class
Expand Down