Skip to content

Commit

Permalink
bower jquery-ui - exported changes to a separate css file
Browse files Browse the repository at this point in the history
  • Loading branch information
MorrisJobke committed Dec 13, 2014
1 parent 29e1c3a commit edcd2f2
Show file tree
Hide file tree
Showing 13 changed files with 353 additions and 138 deletions.
1 change: 0 additions & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'


Expand Down
1 change: 0 additions & 1 deletion apps/user_ldap/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
\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');
Expand Down
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file removed core/css/images/ui-icons_222222_256x240.png
Binary file not shown.
140 changes: 140 additions & 0 deletions core/css/jquery-ui-fixes.css
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion core/js/core.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
37 changes: 37 additions & 0 deletions core/vendor/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 26 additions & 0 deletions core/vendor/jquery-ui/MIT-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit edcd2f2

Please sign in to comment.