Skip to content

Commit 0436ef4

Browse files
committed
Merge branch 't/13192' into major
2 parents 0be3261 + 6aaf906 commit 0436ef4

File tree

5 files changed

+192
-84
lines changed

5 files changed

+192
-84
lines changed

samples/css/samples.css

Lines changed: 120 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/less/custom.less

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,24 @@ main .grid-container.freed-width {
1212
.switch {
1313
background: darken( @global-link-font-color, 3% );
1414
float: right;
15+
overflow: visible;
16+
17+
// Switch balloon tooltip.
18+
.balloon-a {
19+
// Custom position relative to the switch.
20+
position: absolute;
21+
top: -40px;
22+
right: 50%;
23+
margin-right: -15px;
24+
25+
// Customize balloon colors.
26+
background: #FFEFC1;
27+
border-bottom-color: #DCDCA4;
28+
29+
&:before {
30+
border-color: #FFEFC1 transparent transparent transparent;
31+
}
32+
}
1533
}
1634

1735
#toolbar .editors-container {
@@ -103,3 +121,53 @@ div.cke .cke_combo_button {
103121
opacity: 1;
104122
}
105123
}
124+
125+
// Styles that allow .balloon-a to be absolutely positioned.
126+
header {
127+
overflow: visible;
128+
129+
div.grid-container {
130+
overflow: visible;
131+
}
132+
133+
.navigation-b {
134+
overflow: visible;
135+
136+
ul {
137+
overflow: visible;
138+
}
139+
140+
a {
141+
// Tip is relative to the anchor.
142+
position: relative;
143+
}
144+
}
145+
146+
.balloon-a {
147+
position: absolute;
148+
top: 48px;
149+
150+
left: 50%;
151+
margin-left: -35px;
152+
153+
// Switch the balloon arrow and position on narrow screen
154+
// to make it fully visible.
155+
.global-is-max-width( 1140px, {
156+
left: auto;
157+
margin-left: auto;
158+
159+
right: 50%;
160+
margin-right: -35px;
161+
162+
&:before {
163+
left: auto;
164+
right: 22px;
165+
}
166+
} );
167+
168+
// Don't display the balloon on mobile.
169+
.global-is-mobile( {
170+
display: none;
171+
} );
172+
}
173+
}

samples/toolbarconfigurator/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ <h1 class="header-a-logo grid-width-30">
5757
<h1 class="grid-width-60">Toolbar configurator</h1>
5858
<div class="grid-width-40 grid-switch-magic">
5959
<div class="switch">
60+
<span class="balloon-a balloon-a-se">Select configurator type</span>
6061
<input type="radio" name="radio" data-num="1" id="radio-basic" />
6162
<input type="radio" name="radio" data-num="2" id="radio-advanced" />
6263
<label data-for="1" for="radio-basic">Basic</label>

samples/toolbarconfigurator/js/toolbarmodifier.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
text: 'Toggle visibility of empty elements',
2929
group: 'edit',
3030
position: 'left',
31+
cssClass: 'button-a-soft',
3132
clickCallback: function( button ) {
3233
var className = 'button-a-background';
3334

@@ -39,6 +40,7 @@
3940
text: 'Add row separator',
4041
group: 'edit',
4142
position: 'left',
43+
cssClass: 'button-a-soft',
4244
clickCallback: function() {
4345
this._addSeparator();
4446
}
@@ -60,6 +62,7 @@
6062
text: 'Select config',
6163
group: 'config',
6264
position: 'left',
65+
cssClass: 'button-a-soft',
6366
clickCallback: function() {
6467
this.configContainer.findOne( 'textarea' ).$.select();
6568
}

samples/toolbarconfigurator/less/toolbarmodifier.less

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,6 @@
6868
overflow: hidden;
6969

7070
button.button-a {
71-
background-color: @modifier-toolbar-button-color;
72-
73-
&:active,
74-
&:hover {
75-
background-color: darken( @modifier-toolbar-button-color, 20% );
76-
}
77-
78-
&.button-a-background {
79-
background-color: @global-link-font-color;
80-
81-
&:active,
82-
&:hover {
83-
background-color: @global-link-font-color-hover;
84-
}
85-
}
86-
8771
&.cke_button {
8872
cursor: pointer;
8973

0 commit comments

Comments
 (0)