Skip to content

Commit e025607

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 19fa958 commit e025607

File tree

13 files changed

+500
-402
lines changed

13 files changed

+500
-402
lines changed

src/kendo.colorpicker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@ var __meta__ = { // jshint ignore:line
373373
}
374374
},
375375
destroy: function() {
376+
this._hsvEvents.destroy();
377+
376378
this._hueSlider.destroy();
377379
if (this._opacitySlider) {
378380
this._opacitySlider.destroy();

styles/web/common/dataviz.less

Lines changed: 99 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -243,133 +243,129 @@ span.k-sparkline,
243243
display: none;
244244
}
245245

246-
.k-map .k-marker {
247-
width: 28px;
248-
height: 40px;
249-
margin: -40px 0 0 -14px;
250-
position: absolute;
251-
// width: 1em;
252-
// height: 1em;
253-
// transform: translate(-50%, -100%);
254-
cursor: pointer;
255-
overflow: visible;
256-
}
257246

258-
// Control positions
259-
.k-map .k-pos-top {
260-
top: 0;
261-
}
262247

263-
.k-map .k-pos-bottom {
264-
bottom: 0;
265-
}
266248

267-
.k-map .k-pos-left {
268-
left: 0;
269-
}
249+
// Map
250+
.k-map {
251+
border-width: 0;
252+
border-style: solid;
253+
box-sizing: border-box;
270254

271-
.k-map .k-pos-right {
272-
right: 0;
273-
}
274255

275-
.k-map-controls {
276-
position: absolute;
277-
}
256+
// Controls
257+
.k-map-controls {
258+
position: absolute;
259+
}
260+
.k-pos-top { top: 0; }
261+
.k-pos-bottom { bottom: 0; }
262+
.k-pos-left { left: 0; }
263+
.k-pos-right { right: 0; }
264+
265+
266+
// Navigator
267+
.k-navigator {
268+
margin: 1em;
269+
width: 50px;
270+
height: 50px;
271+
border-width: 1px;
272+
border-style: solid;
273+
border-radius: 80px;
274+
position: relative;
275+
display: inline-block;
276+
vertical-align: middle;
277+
278+
.k-pdf-export & { display: none; }
279+
}
278280

279-
.k-map-controls.k-pos-left .k-widget:first-child {
280-
margin-right: 0;
281-
}
282281

283-
.k-map-controls.k-pos-right .k-widget:first-child {
284-
margin-left: 0;
285-
}
282+
// Zoom control
283+
.k-zoom-control {
284+
margin: 1em;
285+
vertical-align: middle;
286286

287-
// Map navigator
287+
.k-button {
288+
width: auto;
289+
height: auto;
290+
}
288291

289-
.k-navigator
290-
{
291-
width: 50px;
292-
height: 50px;
293-
margin: 20px;
294-
border-radius: 80px;
295-
position: relative;
296-
display: inline-block;
297-
vertical-align: middle;
298-
}
292+
.k-pdf-export & { display: none; }
293+
}
299294

300-
.k-pdf-export .k-navigator {
301-
display: none;
302-
}
303295

304-
.k-navigator > button
305-
{
306-
border-color: transparent;
307-
background: none;
308-
}
296+
// Attribution
297+
.k-attribution {
298+
padding: 2px 4px;
299+
font-size: 10px;
300+
background-color: rgba(255, 255, 255, 0.8);
301+
z-index: 1000;
302+
}
309303

310-
div.k-navigator > .k-button
311-
{
312-
margin: 0;
313-
padding: 0;
314-
line-height: 10px;
315-
border-radius: 16px;
316-
position: absolute;
317-
font-size: 1px; // IE7
318-
line-height: 1px;
319-
}
320304

321-
div.k-navigator .k-navigator-n,
322-
div.k-navigator .k-navigator-up
323-
{
324-
top: 2px;
325-
left: 50%;
326-
margin-left: -9px;
305+
// Marker
306+
.k-marker {
307+
width: 28px;
308+
height: 40px;
309+
margin: -40px 0 0 -14px;
310+
font-size: 28px;
311+
position: absolute;
312+
// width: 1em;
313+
// height: 1em;
314+
// transform: translate(-50%, -100%);
315+
cursor: pointer;
316+
overflow: visible;
317+
}
327318
}
328319

329-
div.k-navigator .k-navigator-e,
330-
div.k-navigator .k-navigator-right
331-
{
332-
right: 2px;
333-
top: 50%;
334-
margin-top: -9px;
335-
}
336320

337-
div.k-navigator .k-navigator-s,
338-
div.k-navigator .k-navigator-down
339-
{
340-
bottom: 2px;
341-
left: 50%;
342-
margin-left: -9px;
343-
}
321+
// Navigator
322+
.k-navigator {
344323

345-
div.k-navigator .k-navigator-w,
346-
div.k-navigator .k-navigator-left
347-
{
348-
left: 2px;
349-
top: 50%;
350-
margin-top: -9px;
351-
}
352324

353-
// Attribution
325+
// Buttons
326+
> .k-button {
327+
margin: 0;
328+
padding: 0;
329+
border-color: transparent;
330+
border-radius: 16px;
331+
line-height: 10px;
332+
background: none;
333+
position: absolute;
334+
}
354335

355-
.k-map .k-attribution {
356-
background-color: rgba(255, 255, 255, 0.8);
357-
font-size: 10px;
358-
padding: 2px 4px;
359-
z-index: 1000;
360-
}
336+
.k-navigator-n,
337+
.k-navigator-up {
338+
top: 2px;
339+
left: 50%;
340+
transform: translateX(-50%);
341+
}
361342

362-
// Zoom
343+
.k-navigator-e,
344+
.k-navigator-right {
345+
right: 2px;
346+
top: 50%;
347+
transform: translateY(-50%);
348+
}
363349

364-
.k-zoom-control {
365-
margin: 14px;
366-
vertical-align: middle;
367-
}
350+
.k-navigator-s,
351+
.k-navigator-down {
352+
bottom: 2px;
353+
left: 50%;
354+
transform: translateX(-50%);
355+
}
368356

369-
.k-pdf-export .k-zoom-control {
370-
display: none;
357+
.k-navigator-w,
358+
.k-navigator-left {
359+
left: 2px;
360+
top: 50%;
361+
transform: translateY(-50%);
362+
}
363+
364+
.k-pdf-export & { display: none; }
371365
}
372366

367+
// Zoom
368+
373369
.k-button-wrap
374370
{
375371
border-radius: 4px;

styles/web/common/editor.less

Lines changed: 16 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -131,28 +131,29 @@ table.k-editor
131131
}
132132

133133
.k-button-group .k-tool {
134-
display: inline-block;
135-
vertical-align: middle;
136-
margin: 1px 0;
134+
margin: 1px -1px 1px 0;
137135
width: @editor-icon-size;
138136
height: @editor-icon-size;
137+
border-width: 1px;
138+
border-style: solid;
139139
line-height: @editor-icon-size;
140+
position: relative;
141+
display: inline-block;
142+
vertical-align: middle;
143+
144+
&:focus,
145+
&.k-state-hover {
146+
z-index: 1;
147+
}
140148
}
141149

142-
.k-button-group .k-tool-icon
143-
{
150+
.k-button-group .k-tool-icon {
144151
width: 24px;
145152
height: 24px;
146153
vertical-align: middle;
147154
.disable-high-contrast();
148155
}
149156

150-
.k-editor-toolbar .k-tool-icon.k-icon
151-
{
152-
top: auto;
153-
font-size: 16px;
154-
}
155-
156157
// default tool widths
157158
.k-fontName { width: 110px; }
158159
.k-fontSize { width: 124px; }
@@ -181,36 +182,6 @@ table.k-editor
181182
transform: scaleX(-1);
182183
}
183184

184-
.k-button-group .k-tool
185-
{
186-
border-style: solid;
187-
border-width: 1px;
188-
margin-right: -1px;
189-
}
190-
191-
.k-button-group .k-tool.k-state-hover,
192-
.k-button-group .k-tool:focus
193-
{
194-
position: relative;
195-
z-index: 1;
196-
}
197-
198-
.k-rtl .k-button-group .k-tool
199-
{
200-
border-style: solid;
201-
border-width: 1px;
202-
}
203-
204-
.k-button-group .k-tool.k-group-end
205-
{
206-
border-right-width: 1px;
207-
}
208-
209-
.k-rtl .k-button-group .k-tool.k-group-end
210-
{
211-
border-left-width: 1px;
212-
}
213-
214185
.k-editor-toolbar {
215186

216187
.k-button-group .k-state-disabled,
@@ -369,6 +340,10 @@ a.k-tool {
369340
.k-ct-popup {
370341
width: (8.2 * (@editor-createTable-cellSize + 4));
371342
padding: .65em .5em .5em;
343+
344+
.k-button {
345+
width: 100%;
346+
}
372347
}
373348

374349
.k-ct-popup .k-status {

styles/web/type-bootstrap.less

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -986,11 +986,6 @@ thead.k-grid-header tr:first-child {
986986
border-color: @widget-border-color;
987987
}
988988

989-
.k-tool
990-
{
991-
border-color: transparent;
992-
}
993-
994989
.k-i-loading {
995990
background-image: url('@{image-folder}/loading.gif');
996991
}
@@ -3167,11 +3162,36 @@ td.k-state-focused.k-state-selected,
31673162
background-image: none;
31683163
}
31693164

3165+
31703166
// Map
3167+
.k-map {
3168+
border-color: @widget-border-color;
3169+
color: @widget-text-color;
3170+
background-color: @widget-background-color;
31713171

3172-
.k-map .k-marker {
3173-
font-size: 28px;
3174-
color: @accent;
3172+
3173+
// Controls
3174+
.k-navigator {
3175+
border-color: @button-border-color;
3176+
color: @button-text-color;
3177+
background-color: @button-background-color;
3178+
background-position: 50% 50%;
3179+
.composite-background(@button-gradient);
3180+
.box-shadow(0 1px 2px 0 @shadow-color);
3181+
}
3182+
.k-zoom-control {
3183+
.box-shadow(0 1px 2px 0 @shadow-color);
3184+
}
3185+
3186+
3187+
// Attribution
3188+
.k-attribution {}
3189+
3190+
3191+
// Marker
3192+
.k-marker {
3193+
color: @accent;
3194+
}
31753195
}
31763196

31773197
@import "themes/spreadsheet.less";

0 commit comments

Comments
 (0)