Skip to content

Commit c08115c

Browse files
authored
TinyMCE per block: Update the toolbar style to match the UI prototype (#208)
1 parent c7ca370 commit c08115c

4 files changed

Lines changed: 46 additions & 22 deletions

File tree

tinymce-per-block/src/blocks/embed-block/_style.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
height: 24px;
3030
vertical-align: middle;
3131
margin-right: 5px;
32-
fill: #87919d;
3332
}
3433
}
3534
}

tinymce-per-block/src/controls/transform-block-toolbar/style.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,17 @@
5555
cursor: pointer;
5656
display: flex;
5757
align-items: center;
58+
color: #191e23;
59+
border: 1px solid transparent;
5860

59-
&.is-active,
6061
&:hover {
61-
background: #f0f2f4;
62+
background: #f8f9f9;
63+
outline: 1px solid #6d7882;
64+
position: relative;
6265
}
6366

6467
.dashicon {
6568
margin-right: 8px;
66-
fill: #191e23;
6769
width: 24px;
6870
height: 24px;
6971
}

tinymce-per-block/src/inserter/style.scss

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
border: none;
66
margin: 20px;
77
padding: 0;
8+
9+
a {
10+
color: #87919d;
11+
12+
&:hover {
13+
color: #12181e;
14+
}
15+
}
16+
817
.dashicon {
918
cursor: pointer;
10-
fill: #87919d;
1119
width: 24px;
1220
height: 24px;
1321

14-
&:hover {
15-
fill: #12181e;
16-
}
17-
1822
&:focus {
1923
box-shadow: none;
2024
outline: none;
@@ -81,15 +85,24 @@
8185
font-size: 11px;
8286
align-items: center;
8387
cursor: pointer;
88+
border: 1px solid transparent;
8489

85-
&.is-active,
8690
&:hover {
87-
background: #f0f2f4;
91+
background: #f8f9f9;
92+
border: 1px solid #6d7882;
93+
position: relative;
94+
}
95+
96+
&.is-active {
97+
background: #eef0f0;
98+
border: 1px solid #6d7882;
99+
position: relative;
100+
color: #3e444c;
88101
}
89102

90103
.dashicon {
91-
margin-right: 8px;
92104
fill: #191e23;
105+
margin-right: 8px;
93106
width: 24px;
94107
height: 24px;
95108
}

tinymce-per-block/src/renderers/block/block-list/_style.scss

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
}
1919

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

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

@@ -36,11 +36,11 @@
3636

3737
.block-list__block-controls-group {
3838
background: #fff;
39-
border: 1px solid #e1e6ea;
39+
border: 1px solid #d8dbdf;
4040
box-shadow: 0px 3px 20px rgba( 18, 24, 30, .1 ), 0px 1px 3px rgba( 18, 24, 30, .1 );
4141
color: #12181e;
4242
display: inline-block;
43-
margin-left: 20px;
43+
margin-left: 14px;
4444
}
4545

4646
.block-list__block-toolbar {
@@ -57,20 +57,30 @@
5757
cursor: pointer;
5858
display: block;
5959
float: left;
60+
color: #6d7882;
6061

61-
&.is-selected, &:hover {
62-
background: #f0f2f4;
62+
&:focus {
63+
outline: 0;
64+
}
65+
66+
&:hover {
67+
background: #f8f9f9;
68+
outline: 1px solid #6d7882;
69+
position: relative;
70+
}
71+
72+
&.is-selected {
73+
background: #eef0f0;
74+
outline: 1px solid #6d7882;
75+
position: relative;
76+
color: #3e444c;
6377
}
6478

6579
.dashicon {
6680
display: block;
6781
width: 24px;
6882
height: 24px;
6983
}
70-
71-
&:focus {
72-
outline: 0;
73-
}
7484
}
7585

7686
.block-list__block-arrangement {

0 commit comments

Comments
 (0)