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

TinyMCE per block: Update the toolbar style to match the UI prototype #208

Merged
merged 1 commit into from
Mar 8, 2017
Merged

TinyMCE per block: Update the toolbar style to match the UI prototype #208

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 tinymce-per-block/build/app.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion tinymce-per-block/src/blocks/embed-block/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
height: 24px;
vertical-align: middle;
margin-right: 5px;
fill: #87919d;
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions tinymce-per-block/src/controls/transform-block-toolbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@
cursor: pointer;
display: flex;
align-items: center;
color: #191e23;
border: 1px solid transparent;

&.is-active,
&:hover {
background: #f0f2f4;
background: #f8f9f9;
outline: 1px solid #6d7882;
position: relative;
}

.dashicon {
margin-right: 8px;
fill: #191e23;
width: 24px;
height: 24px;
}
Expand Down
29 changes: 21 additions & 8 deletions tinymce-per-block/src/inserter/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@
border: none;
margin: 20px;
padding: 0;

a {
color: #87919d;

&:hover {
color: #12181e;
}
}

.dashicon {
cursor: pointer;
fill: #87919d;
width: 24px;
height: 24px;

&:hover {
fill: #12181e;
}

&:focus {
box-shadow: none;
outline: none;
Expand Down Expand Up @@ -81,15 +85,24 @@
font-size: 11px;
align-items: center;
cursor: pointer;
border: 1px solid transparent;

&.is-active,
&:hover {
background: #f0f2f4;
background: #f8f9f9;
border: 1px solid #6d7882;
position: relative;
}

&.is-active {
background: #eef0f0;
border: 1px solid #6d7882;
position: relative;
color: #3e444c;
}

.dashicon {
margin-right: 8px;
fill: #191e23;
margin-right: 8px;
width: 24px;
height: 24px;
}
Expand Down
30 changes: 20 additions & 10 deletions tinymce-per-block/src/renderers/block/block-list/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
}

&:hover > div {
border-left-color: mix( $gray-light, $gray-dark-300, 80% );
border-left-color: #e1e6ea;
}

&.is-selected > div {
border-color: mix( $gray-light, $gray-dark-300, 80% );
border-color: #e1e6ea;
}
}

Expand All @@ -36,11 +36,11 @@

.block-list__block-controls-group {
background: #fff;
border: 1px solid #e1e6ea;
border: 1px solid #d8dbdf;
box-shadow: 0px 3px 20px rgba( 18, 24, 30, .1 ), 0px 1px 3px rgba( 18, 24, 30, .1 );
color: #12181e;
display: inline-block;
margin-left: 20px;
margin-left: 14px;
}

.block-list__block-toolbar {
Expand All @@ -57,20 +57,30 @@
cursor: pointer;
display: block;
float: left;
color: #6d7882;

&.is-selected, &:hover {
background: #f0f2f4;
&:focus {
outline: 0;
}

&:hover {
background: #f8f9f9;
outline: 1px solid #6d7882;
position: relative;
}

&.is-selected {
background: #eef0f0;
outline: 1px solid #6d7882;
position: relative;
color: #3e444c;
}

.dashicon {
display: block;
width: 24px;
height: 24px;
}

&:focus {
outline: 0;
}
}

.block-list__block-arrangement {
Expand Down