Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.scrutinizer.yml1
-rw-r--r--apps/user_ldap/settings.php1
-rw-r--r--bower.json1
-rw-r--r--core/css/images/ui-icons_222222_256x240.pngbin4196 -> 0 bytes
-rw-r--r--core/css/jquery-ui-fixes.css140
-rw-r--r--core/js/core.json2
-rw-r--r--core/vendor/.gitignore37
-rw-r--r--core/vendor/jquery-ui/MIT-LICENSE.txt26
-rw-r--r--core/vendor/jquery-ui/themes/base/images/animated-overlay.gif (renamed from core/css/images/animated-overlay.gif)bin1738 -> 1738 bytes
-rw-r--r--core/vendor/jquery-ui/themes/base/images/ui-icons_222222_256x240.pngbin0 -> 4369 bytes
-rw-r--r--core/vendor/jquery-ui/themes/base/jquery-ui.css (renamed from core/css/jquery-ui-1.10.0.custom.css)276
-rw-r--r--core/vendor/jquery-ui/ui/jquery-ui.custom.js (renamed from core/js/jquery-ui-1.10.0.custom.js)2
-rw-r--r--lib/base.php5
13 files changed, 353 insertions, 138 deletions
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index f66c1b86eac..78e878a42a4 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 3b448aec757..5527cf2c6da 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 5b025791dfe..8eda02ef650 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 82ef90aabaf..00000000000
--- a/core/css/images/ui-icons_222222_256x240.png
+++ /dev/null
Binary files differ
diff --git a/core/css/jquery-ui-fixes.css b/core/css/jquery-ui-fixes.css
new file mode 100644
index 00000000000..0bfa9479893
--- /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 ea79724dcc6..e529315fdb1 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 36748f845a6..0d2ad861dee 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 00000000000..1c693e3d44d
--- /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
index d441f75ebfb..d441f75ebfb 100644
--- a/core/css/images/animated-overlay.gif
+++ b/core/vendor/jquery-ui/themes/base/images/animated-overlay.gif
Binary files differ
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 00000000000..ee039dc096a
--- /dev/null
+++ b/core/vendor/jquery-ui/themes/base/images/ui-icons_222222_256x240.png
Binary files differ
diff --git a/core/css/jquery-ui-1.10.0.custom.css b/core/vendor/jquery-ui/themes/base/jquery-ui.css
index a1e9895c776..55f91f4192d 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
index ca57f47ede4..b34e6a37cc8 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 f2ff3bb4849..24ca55584ad 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");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 13:01:55 +0300