From edcd2f27069ae125a4b6680a384b44ebe69b12de Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 6 Nov 2014 11:04:18 +0100 Subject: [PATCH] bower jquery-ui - exported changes to a separate css file --- .scrutinizer.yml | 1 - apps/user_ldap/settings.php | 1 - bower.json | 1 + core/css/images/ui-icons_222222_256x240.png | Bin 4196 -> 0 bytes core/css/jquery-ui-fixes.css | 140 +++++++++ core/js/core.json | 2 +- core/vendor/.gitignore | 37 +++ core/vendor/jquery-ui/MIT-LICENSE.txt | 26 ++ .../themes/base}/images/animated-overlay.gif | Bin .../base/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../jquery-ui/themes/base/jquery-ui.css} | 276 +++++++++--------- .../jquery-ui/ui/jquery-ui.custom.js} | 2 +- lib/base.php | 5 +- 13 files changed, 353 insertions(+), 138 deletions(-) delete mode 100644 core/css/images/ui-icons_222222_256x240.png create mode 100644 core/css/jquery-ui-fixes.css create mode 100644 core/vendor/jquery-ui/MIT-LICENSE.txt rename core/{css => vendor/jquery-ui/themes/base}/images/animated-overlay.gif (100%) create mode 100644 core/vendor/jquery-ui/themes/base/images/ui-icons_222222_256x240.png rename core/{css/jquery-ui-1.10.0.custom.css => vendor/jquery-ui/themes/base/jquery-ui.css} (86%) rename core/{js/jquery-ui-1.10.0.custom.js => vendor/jquery-ui/ui/jquery-ui.custom.js} (99%) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index f66c1b86ea..78e878a42a 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -12,7 +12,6 @@ filter: - 'core/js/tests/specs/*.js' - 'core/js/jquery-showpassword.js' - 'core/js/jquery-tipsy.js' - - 'core/js/jquery-ui-1.10.0.custom.js' - 'core/js/placeholders.js' diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index 3b448aec75..5527cf2c6d 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -31,7 +31,6 @@ OCP\Util::addScript('user_ldap', 'settings'); \OC_Util::addVendorScript('user_ldap', 'ui-multiselect/src/jquery.multiselect'); OCP\Util::addStyle('user_ldap', 'settings'); \OC_Util::addVendorStyle('user_ldap', 'ui-multiselect/jquery.multiselect'); -OCP\Util::addStyle('core', 'jquery-ui-1.10.0.custom'); // fill template $tmpl = new OCP\Template('user_ldap', 'settings'); diff --git a/bower.json b/bower.json index 5b025791df..8eda02ef65 100644 --- a/bower.json +++ b/bower.json @@ -17,6 +17,7 @@ "handlebars": "~1.3.0", "jcrop": "~0.9.12", "jquery": "~1.10.0", + "jquery-ui": "1.10.0", "jsTimezoneDetect": "~1.0.5", "moment": "~2.8.3", "select2": "~3.4.8", diff --git a/core/css/images/ui-icons_222222_256x240.png b/core/css/images/ui-icons_222222_256x240.png deleted file mode 100644 index 82ef90aabaf90cde6a42f2baad47e63512e57d5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4196 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 M>bhzrD!9=90aPG#7XSbN diff --git a/core/css/jquery-ui-fixes.css b/core/css/jquery-ui-fixes.css new file mode 100644 index 0000000000..0bfa947989 --- /dev/null +++ b/core/css/jquery-ui-fixes.css @@ -0,0 +1,140 @@ +/* Component containers +----------------------------------*/ +.ui-widget { + font-family: "Lucida Grande", Arial, Verdana, sans-serif; + font-size: 1em; +} +.ui-widget button { + font-family: "Lucida Grande", Arial, Verdana, sans-serif; +} +.ui-widget-content { + border: 1px solid #dddddd; + background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; + color: #333333; +} +.ui-widget-content a { + color: #333333; +} +.ui-widget-header { + border: 1px solid #1d2d44; + background: #1d2d44 url(images/ui-bg_flat_35_1d2d44_40x100.png) 50% 50% repeat-x; + color: #ffffff; +} +.ui-widget-header a { + color: #ffffff; +} + +/* Interaction states +----------------------------------*/ +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { + border: 1px solid #ddd; + background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x; + font-weight: bold; + color: #555; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #555; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus { + border: 1px solid #ddd; + background: #ffffff url(images/ui-bg_flat_100_ffffff_40x100.png) 50% 50% repeat-x; + font-weight: bold; + color: #333; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited { + color: #333; +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + border: 1px solid #1d2d44; + background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x; + font-weight: bold; + color: #1d2d44; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #1d2d44; +} + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #ddd; + background: #f8f8f8 url(images/ui-bg_highlight-hard_100_f8f8f8_1x100.png) 50% top repeat-x; + color: #555; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #555; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #cd0a0a; + background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; + color: #ffffff; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #ffffff; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #ffffff; +} + +/* Icons +----------------------------------*/ +.ui-state-default .ui-icon { + background-image: url(images/ui-icons_1d2d44_256x240.png); +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url(images/ui-icons_1d2d44_256x240.png); +} +.ui-state-active .ui-icon { + background-image: url(images/ui-icons_1d2d44_256x240.png); +} +.ui-state-highlight .ui-icon { + background-image: url(images/ui-icons_ffffff_256x240.png); +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url(images/ui-icons_ffd27a_256x240.png); +} + +/* Misc visuals +----------------------------------*/ +/* Overlays */ +.ui-widget-overlay { + background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; + opacity: .5; + filter: Alpha(Opacity=50); +} +.ui-widget-shadow { + margin: -5px 0 0 -5px; + padding: 5px; + background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; + opacity: .2; + filter: Alpha(Opacity=20); + border-radius: 5px; +} diff --git a/core/js/core.json b/core/js/core.json index ea79724dcc..e529315fdb 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -2,11 +2,11 @@ "vendor": [ "jquery/jquery.min.js", "jquery/jquery-migrate.min.js", + "jquery-ui/ui/jquery-ui.custom.js", "underscore/underscore.js", "moment/min/moment-with-locales.js" ], "libraries": [ - "jquery-ui-1.10.0.custom.js", "jquery-showpassword.js", "jquery-tipsy.js" ], diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore index 36748f845a..0d2ad861de 100644 --- a/core/vendor/.gitignore +++ b/core/vendor/.gitignore @@ -38,6 +38,43 @@ jquery/** !jquery/jquery* !jquery/MIT-LICENSE.txt +# jquery-ui +jquery-ui/themes/base/minified +jquery-ui/themes/base/images/** +!jquery-ui/themes/base/images/animated-overlay.gif +!jquery-ui/themes/base/images/ui-icons_222222_256x240.png +jquery-ui/themes/base/jquery.ui.* +jquery-ui/themes/black-tie +jquery-ui/themes/blitzer +jquery-ui/themes/cupertino +jquery-ui/themes/dark-hive +jquery-ui/themes/dot-luv +jquery-ui/themes/eggplant +jquery-ui/themes/excite-bike +jquery-ui/themes/flick +jquery-ui/themes/hot-sneaks +jquery-ui/themes/humanity +jquery-ui/themes/le-frog +jquery-ui/themes/mint-choc +jquery-ui/themes/overcast +jquery-ui/themes/pepper-grinder +jquery-ui/themes/redmond +jquery-ui/themes/smoothness +jquery-ui/themes/south-street +jquery-ui/themes/start +jquery-ui/themes/sunny +jquery-ui/themes/swanky-purse +jquery-ui/themes/trontastic +jquery-ui/themes/ui-darkness +jquery-ui/themes/ui-lightness +jquery-ui/themes/vader +jquery-ui/ui/** +!jquery-ui/ui/jquery-ui.custom.js +jquery-ui/*.json +jquery-ui/AUTHORS.txt +jquery-ui/MANIFEST +jquery-ui/README.md + # jcrop jcrop/index.html jcrop/demos diff --git a/core/vendor/jquery-ui/MIT-LICENSE.txt b/core/vendor/jquery-ui/MIT-LICENSE.txt new file mode 100644 index 0000000000..1c693e3d44 --- /dev/null +++ b/core/vendor/jquery-ui/MIT-LICENSE.txt @@ -0,0 +1,26 @@ +Copyright 2013 jQuery Foundation and other contributors, +http://jqueryui.com/ + +This software consists of voluntary contributions made by many +individuals (AUTHORS.txt, http://jqueryui.com/about) For exact +contribution history, see the revision history and logs, available +at http://jquery-ui.googlecode.com/svn/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/core/css/images/animated-overlay.gif b/core/vendor/jquery-ui/themes/base/images/animated-overlay.gif similarity index 100% rename from core/css/images/animated-overlay.gif rename to core/vendor/jquery-ui/themes/base/images/animated-overlay.gif diff --git a/core/vendor/jquery-ui/themes/base/images/ui-icons_222222_256x240.png b/core/vendor/jquery-ui/themes/base/images/ui-icons_222222_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..ee039dc096a38a3753f92519546eee94bcfbeffa GIT binary patch literal 4369 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 literal 0 HcmV?d00001 diff --git a/core/css/jquery-ui-1.10.0.custom.css b/core/vendor/jquery-ui/themes/base/jquery-ui.css similarity index 86% rename from core/css/jquery-ui-1.10.0.custom.css rename to core/vendor/jquery-ui/themes/base/jquery-ui.css index a1e9895c77..55f91f4192 100644 --- a/core/css/jquery-ui-1.10.0.custom.css +++ b/core/vendor/jquery-ui/themes/base/jquery-ui.css @@ -1,8 +1,7 @@ -/*! jQuery UI - v1.10.0 - 2013-01-22 +/*! jQuery UI - v1.10.0 - 2013-01-17 * http://jqueryui.com -* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Lucida%20Grande%22%2C%20Arial%2C%20Verdana%2C%20sans-serif&fwDefault=bold&fsDefault=1em&cornerRadius=4px&bgColorHeader=1d2d44&bgTextureHeader=01_flat.png&bgImgOpacityHeader=35&borderColorHeader=1d2d44&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f8f8f8&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=ddd&fcDefault=555&iconColorDefault=1d2d44&bgColorHover=ffffff&bgTextureHover=01_flat.png&bgImgOpacityHover=100&borderColorHover=ddd&fcHover=333&iconColorHover=1d2d44&bgColorActive=f8f8f8&bgTextureActive=02_glass.png&bgImgOpacityActive=100&borderColorActive=1d2d44&fcActive=1d2d44&iconColorActive=1d2d44&bgColorHighlight=f8f8f8&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=100&borderColorHighlight=ddd&fcHighlight=555&iconColorHighlight=ffffff&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px -* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */ +* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css +* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */ /* Layout helpers ----------------------------------*/ @@ -85,79 +84,7 @@ width: 100%; height: 100%; } -.ui-resizable { - position: relative; -} -.ui-resizable-handle { - position: absolute; - font-size: 0.1px; - display: block; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { - display: none; -} -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; -} -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; -} -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; -} -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; -} -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; -} -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; -} -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} + .ui-accordion .ui-accordion-header { display: block; cursor: pointer; @@ -186,12 +113,14 @@ border-top: 0; overflow: auto; } + .ui-autocomplete { position: absolute; top: 0; left: 0; cursor: default; } + .ui-button { display: inline-block; position: relative; @@ -296,6 +225,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } + .ui-datepicker { width: 17em; padding: .2em .2em 0; @@ -464,6 +394,7 @@ button.ui-button::-moz-focus-inner { border-right-width: 0; border-left-width: 1px; } + .ui-dialog { position: absolute; top: 0; @@ -523,6 +454,7 @@ button.ui-button::-moz-focus-inner { .ui-draggable .ui-dialog-titlebar { cursor: move; } + .ui-menu { list-style: none; padding: 2px; @@ -590,6 +522,7 @@ button.ui-button::-moz-focus-inner { position: static; float: right; } + .ui-progressbar { height: 2em; text-align: left; @@ -608,6 +541,82 @@ button.ui-button::-moz-focus-inner { .ui-progressbar-indeterminate .ui-progressbar-value { background-image: none; } + +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} + +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} + .ui-slider { position: relative; text-align: left; @@ -671,6 +680,7 @@ button.ui-button::-moz-focus-inner { .ui-slider-vertical .ui-slider-range-max { top: 0; } + .ui-spinner { position: relative; display: inline-block; @@ -726,6 +736,7 @@ button.ui-button::-moz-focus-inner { /* need to fix icons sprite */ background-position: -65px -16px; } + .ui-tabs { position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ padding: .2em; @@ -768,6 +779,7 @@ button.ui-button::-moz-focus-inner { padding: 1em 1.4em; background: none; } + .ui-tooltip { padding: 8px; position: absolute; @@ -783,8 +795,8 @@ body .ui-tooltip { /* Component containers ----------------------------------*/ .ui-widget { - font-family: "Lucida Grande", Arial, Verdana, sans-serif; - font-size: 1em; + font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-size: 1.1em/*{fsDefault}*/; } .ui-widget .ui-widget { font-size: 1em; @@ -793,25 +805,25 @@ body .ui-tooltip { .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: "Lucida Grande", Arial, Verdana, sans-serif; + font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; } .ui-widget-content { - border: 1px solid #dddddd; - background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; - color: #333333; + border: 1px solid #aaaaaa/*{borderColorContent}*/; + background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; + color: #222222/*{fcContent}*/; } .ui-widget-content a { - color: #333333; + color: #222222/*{fcContent}*/; } .ui-widget-header { - border: 1px solid #1d2d44; - background: #1d2d44 url(images/ui-bg_flat_35_1d2d44_40x100.png) 50% 50% repeat-x; - color: #ffffff; + border: 1px solid #aaaaaa/*{borderColorHeader}*/; + background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; + color: #222222/*{fcHeader}*/; font-weight: bold; } .ui-widget-header a { - color: #ffffff; + color: #222222/*{fcHeader}*/; } /* Interaction states @@ -819,15 +831,15 @@ body .ui-tooltip { .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #ddd; - background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x; - font-weight: bold; - color: #555; + border: 1px solid #d3d3d3/*{borderColorDefault}*/; + background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #555555/*{fcDefault}*/; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - color: #555; + color: #555555/*{fcDefault}*/; text-decoration: none; } .ui-state-hover, @@ -836,30 +848,30 @@ body .ui-tooltip { .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #ddd; - background: #ffffff url(images/ui-bg_flat_100_ffffff_40x100.png) 50% 50% repeat-x; - font-weight: bold; - color: #333; + border: 1px solid #999999/*{borderColorHover}*/; + background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #212121/*{fcHover}*/; } .ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { - color: #333; + color: #212121/*{fcHover}*/; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid #1d2d44; - background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x; - font-weight: bold; - color: #1d2d44; + border: 1px solid #aaaaaa/*{borderColorActive}*/; + background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; + font-weight: normal/*{fwDefault}*/; + color: #212121/*{fcActive}*/; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #1d2d44; + color: #212121/*{fcActive}*/; text-decoration: none; } @@ -868,31 +880,31 @@ body .ui-tooltip { .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { - border: 1px solid #ddd; - background: #f8f8f8 url(images/ui-bg_highlight-hard_100_f8f8f8_1x100.png) 50% top repeat-x; - color: #555; + border: 1px solid #fcefa1/*{borderColorHighlight}*/; + background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; + color: #363636/*{fcHighlight}*/; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a { - color: #555; + color: #363636/*{fcHighlight}*/; } .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a; - background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; - color: #ffffff; + border: 1px solid #cd0a0a/*{borderColorError}*/; + background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; + color: #cd0a0a/*{fcError}*/; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { - color: #ffffff; + color: #cd0a0a/*{fcError}*/; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { - color: #ffffff; + color: #cd0a0a/*{fcError}*/; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, @@ -928,27 +940,27 @@ body .ui-tooltip { } .ui-icon, .ui-widget-content .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png); + background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } .ui-widget-header .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png); + background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; } .ui-state-default .ui-icon { - background-image: url(images/ui-icons_1d2d44_256x240.png); + background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon { - background-image: url(images/ui-icons_1d2d44_256x240.png); + background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; } .ui-state-active .ui-icon { - background-image: url(images/ui-icons_1d2d44_256x240.png); + background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; } .ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_ffffff_256x240.png); + background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_ffd27a_256x240.png); + background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; } /* positioning */ @@ -1137,38 +1149,38 @@ body .ui-tooltip { .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 4px; + border-top-left-radius: 4px/*{cornerRadius}*/; } .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 4px; + border-top-right-radius: 4px/*{cornerRadius}*/; } .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px/*{cornerRadius}*/; } .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px/*{cornerRadius}*/; } /* Overlays */ .ui-widget-overlay { - background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; - opacity: .5; - filter: Alpha(Opacity=50); + background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; + opacity: .3/*{opacityOverlay}*/; + filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; } .ui-widget-shadow { - margin: -5px 0 0 -5px; - padding: 5px; - background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; - opacity: .2; - filter: Alpha(Opacity=20); - border-radius: 5px; + margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; + padding: 8px/*{thicknessShadow}*/; + background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; + opacity: .3/*{opacityShadow}*/; + filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; + border-radius: 8px/*{cornerRadiusShadow}*/; } diff --git a/core/js/jquery-ui-1.10.0.custom.js b/core/vendor/jquery-ui/ui/jquery-ui.custom.js similarity index 99% rename from core/js/jquery-ui-1.10.0.custom.js rename to core/vendor/jquery-ui/ui/jquery-ui.custom.js index ca57f47ede..b34e6a37cc 100644 --- a/core/js/jquery-ui-1.10.0.custom.js +++ b/core/vendor/jquery-ui/ui/jquery-ui.custom.js @@ -1,4 +1,4 @@ -/*! jQuery UI - v1.10.0 - 2013-01-22 +/*! jQuery UI - v1.10.0 - 2013-01-18 * http://jqueryui.com * Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js * Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */ diff --git a/lib/base.php b/lib/base.php index f2ff3bb484..24ca55584a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -339,7 +339,7 @@ class OC { // TODO: read from core/js/core.json OC_Util::addVendorScript('jquery/jquery.min'); OC_Util::addVendorScript('jquery/jquery-migrate.min'); - OC_Util::addScript("jquery-ui-1.10.0.custom"); + OC_Util::addVendorScript('jquery-ui/ui/jquery-ui.custom'); OC_Util::addScript("jquery-showpassword"); OC_Util::addScript("placeholders"); OC_Util::addScript("jquery-tipsy"); @@ -376,7 +376,8 @@ class OC { OC_Util::addStyle("apps"); OC_Util::addStyle("fixes"); OC_Util::addStyle("multiselect"); - OC_Util::addStyle("jquery-ui-1.10.0.custom"); + OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui'); + OC_Util::addStyle('jquery-ui-fixes'); OC_Util::addStyle("jquery-tipsy"); OC_Util::addStyle("jquery.ocdialog"); }