From 1b1f18baf497aaf7a5597dfc470b0039fcba6b1f Mon Sep 17 00:00:00 2001 From: "Dominik Schilling (ocean90)" Date: Fri, 14 Nov 2014 19:27:38 +0000 Subject: [PATCH] Sync our jQuery UI styles with jQuery UI 1.11.2 CSS. Removes also our own implementations for touch-action compatibility for IE Touch. props georgestephanis, ocean90. fixes #26843. git-svn-id: https://develop.svn.wordpress.org/trunk@30343 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/common.css | 28 ++++++--------- src/wp-admin/css/revisions.css | 4 ++- src/wp-includes/css/jquery-ui-dialog.css | 43 +++++++++++++++++------- src/wp-includes/css/media-views.css | 25 ++++++-------- 4 files changed, 55 insertions(+), 45 deletions(-) diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index 3b3392aa61..3c60f84d27 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -2854,29 +2854,21 @@ img { content: '\f142'; } -/* Enable draggable on IE10 touch events until it's rolled into jQuery UI core */ -.ui-sortable, -.ui-draggable { - -ms-touch-action: none; - touch-action: none; -} - -.meta-box-sortables.ui-sortable, -.widgets-holder-wrap .ui-draggable, -.widgets-holder-wrap .ui-sortable, -.menu.ui-sortable { - -ms-touch-action: auto; - touch-action: auto; -} - -.meta-box-sortables.ui-sortable .hndle, -.menu.ui-sortable .menu-item-handle { +/*! + * jQuery UI Draggable/Sortable 1.11.2 + * http://jqueryui.com + * + * Copyright 2014 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ +.ui-draggable-handle, +.ui-sortable-handle { -ms-touch-action: none; touch-action: none; } /* Accordion */ - .accordion-section { border-bottom: 1px solid #dfdfdf; margin: 0; diff --git a/src/wp-admin/css/revisions.css b/src/wp-admin/css/revisions.css index f191494227..8fcde36625 100644 --- a/src/wp-admin/css/revisions.css +++ b/src/wp-admin/css/revisions.css @@ -450,7 +450,7 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { margin-right: -10px; } - /* jQuery UI Slider */ +/* jQuery UI Slider */ .wp-slider.ui-slider { position: relative; border: 1px solid #d7d7d7; @@ -467,6 +467,8 @@ div.revisions-controls > .wp-slider > .ui-slider-handle { position: absolute; width: 18px; z-index: 2; + -ms-touch-action: none; + touch-action: none; } .wp-slider .ui-slider-handle, diff --git a/src/wp-includes/css/jquery-ui-dialog.css b/src/wp-includes/css/jquery-ui-dialog.css index 78e9741652..5fdfee440f 100644 --- a/src/wp-includes/css/jquery-ui-dialog.css +++ b/src/wp-includes/css/jquery-ui-dialog.css @@ -1,12 +1,12 @@ /*! - * jQuery UI CSS Framework 1.10.1 + * jQuery UI CSS Framework 1.11.2 * http://jqueryui.com * - * Copyright 2013 jQuery Foundation and other contributors + * Copyright 2014 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license * - * http://docs.jquery.com/UI/Theming/API + * http://api.jqueryui.com/category/theming/ */ /* Layout helpers @@ -53,15 +53,21 @@ left: 0; position: absolute; opacity: 0; - filter:Alpha(Opacity=0); + filter:Alpha(Opacity=0); /* support: IE8 */ } +.ui-front { + z-index: 100; +} + + /* Interaction Cues ----------------------------------*/ .ui-state-disabled { cursor: default !important; } + /* Icons ----------------------------------*/ @@ -73,15 +79,26 @@ background-repeat: no-repeat; } + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + /*! - * jQuery UI Resizable 1.10.1 + * jQuery UI Resizable 1.11.2 * http://jqueryui.com * - * Copyright 2013 jQuery Foundation and other contributors + * Copyright 2014 jQuery Foundation and other contributors * Released under the MIT license. * http://jquery.org/license - * - * http://docs.jquery.com/UI/Resizable#theming */ .ui-resizable { position: relative; @@ -90,6 +107,8 @@ position: absolute; font-size: 0.1px; display: block; + -ms-touch-action: none; + touch-action: none; } .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { @@ -128,10 +147,10 @@ /* @noflip */ .ui-resizable-se { cursor: se-resize; - width: 9px; - height: 9px; - right: -5px; - bottom: -5px; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; } /* @noflip */ .ui-resizable-sw { diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css index 8b42f70726..50e9e96a43 100644 --- a/src/wp-includes/css/media-views.css +++ b/src/wp-includes/css/media-views.css @@ -104,21 +104,18 @@ display: none; } -/* Enable draggable on IE10 touch events until it's rolled into jQuery UI core */ -.ui-sortable, -.ui-draggable { +/*! + * jQuery UI Draggable/Sortable 1.11.2 + * http://jqueryui.com + * + * Copyright 2014 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ +.ui-draggable-handle, +.ui-sortable-handle { -ms-touch-action: none; - touch-action: none; -} - -.meta-box-sortables.ui-sortable { - -ms-touch-action: auto; - touch-action: auto; -} - -.meta-box-sortables.ui-sortable .hndle { - -ms-touch-action: none; - touch-action: none; + touch-action: none; } /**